pyrox.dev
xfce.xfce4-weather-plugin: 0.11.3 -> 0.12.0
https://gitlab.xfce.org/panel-plugins/xfce4-weather-plugin/-/compare/xfce4-weather-plugin-0.11.3...xfce4-weather-plugin-0.12.0
+22
-29
pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix
+22
-29
pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix
···
4
4
fetchurl,
5
5
fetchpatch,
6
6
gettext,
7
+
meson,
8
+
ninja,
7
9
pkg-config,
8
-
xfce4-dev-tools,
9
10
glib,
10
11
gtk3,
11
12
json_c,
···
19
20
gitUpdater,
20
21
}:
21
22
22
-
let
23
-
category = "panel-plugins";
24
-
in
25
-
26
-
stdenv.mkDerivation rec {
23
+
stdenv.mkDerivation (finalAttrs: {
27
24
pname = "xfce4-weather-plugin";
28
-
version = "0.11.3";
25
+
version = "0.12.0";
29
26
30
27
src = fetchurl {
31
-
url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
32
-
sha256 = "sha256-AC0f5jkG0vOgEvPLWMzv8d+8xGZ1njbHbTsD3QHA3Fc=";
28
+
url = "mirror://xfce/src/panel-plugins/xfce4-weather-plugin/${lib.versions.majorMinor finalAttrs.version}/xfce4-weather-plugin-${finalAttrs.version}.tar.xz";
29
+
hash = "sha256-XdkLAywG70tkuBgCMVTvlGOixpSgKQ5X80EilsdUX/Y=";
33
30
};
34
31
35
32
patches = [
36
-
# Port to libsoup-3.0
37
-
# https://gitlab.xfce.org/panel-plugins/xfce4-weather-plugin/-/merge_requests/28
33
+
# meson-build: Add missing HAVE_UPOWER_GLIB definition
34
+
# https://gitlab.xfce.org/panel-plugins/xfce4-weather-plugin/-/merge_requests/37
38
35
(fetchpatch {
39
-
url = "https://gitlab.xfce.org/panel-plugins/xfce4-weather-plugin/-/commit/c0653a903c6f2cecdf41ac9eaeba4f4617656ffe.patch";
40
-
hash = "sha256-wAowm4ppBSKvYwOowZbbs5pnTh9EQ9XX05lA81wtsRM=";
41
-
})
42
-
(fetchpatch {
43
-
url = "https://gitlab.xfce.org/panel-plugins/xfce4-weather-plugin/-/commit/279c975dc1f95bd1ce9152eee1d19122e7deb9a8.patch";
44
-
hash = "sha256-gVfyXkE0bjBfvcQU9fDp+Gm59bD3VbAam04Jak8i31k=";
36
+
url = "https://gitlab.xfce.org/panel-plugins/xfce4-weather-plugin/-/commit/1d8e5e5dbbc4d53e4b810f9b01a460197cd47b64.patch";
37
+
hash = "sha256-g9AIp1iBcA3AxD1tpnv32PvxxulXYjFvQh3EqD1gmHg=";
45
38
})
46
39
];
47
40
41
+
strictDeps = true;
42
+
48
43
nativeBuildInputs = [
49
44
gettext
45
+
glib # glib-compile-resources
46
+
meson
47
+
ninja
50
48
pkg-config
51
-
xfce4-dev-tools
52
49
];
53
50
54
51
buildInputs = [
···
64
61
xfconf
65
62
];
66
63
67
-
configureFlags = [ "--enable-maintainer-mode" ];
68
-
69
-
enableParallelBuilding = true;
70
-
71
64
passthru.updateScript = gitUpdater {
72
-
url = "https://gitlab.xfce.org/panel-plugins/${pname}";
73
-
rev-prefix = "${pname}-";
65
+
url = "https://gitlab.xfce.org/panel-plugins/xfce4-weather-plugin";
66
+
rev-prefix = "xfce4-weather-plugin-";
74
67
};
75
68
76
-
meta = with lib; {
69
+
meta = {
77
70
homepage = "https://docs.xfce.org/panel-plugins/xfce4-weather-plugin";
78
71
description = "Weather plugin for the Xfce desktop environment";
79
-
license = licenses.gpl2Plus;
80
-
platforms = platforms.unix;
81
-
teams = [ teams.xfce ];
72
+
license = lib.licenses.gpl2Plus;
73
+
platforms = lib.platforms.unix;
74
+
teams = [ lib.teams.xfce ];
82
75
};
83
-
}
76
+
})