pyrox.dev
meld: 3.21.1 → 3.21.2
https://gitlab.gnome.org/GNOME/meld/-/compare/3.21.1...3.21.2
+2
-20
pkgs/applications/version-management/meld/default.nix
+2
-20
pkgs/applications/version-management/meld/default.nix
···
1
1
{ lib
2
2
, fetchurl
3
-
, fetchpatch
4
3
, gettext
5
4
, itstool
6
5
, python3
···
19
18
20
19
python3.pkgs.buildPythonApplication rec {
21
20
pname = "meld";
22
-
version = "3.21.1";
21
+
version = "3.21.2";
23
22
24
23
format = "other";
25
24
26
25
src = fetchurl {
27
26
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
28
-
sha256 = "cP6Y65Ms4h1nFw47D2pzF+gT6GLemJM+pROYLpoDMgI=";
27
+
sha256 = "IV+odABTZ5TFllddE6nIfijxjdNyW43/mG2y4pM6cU4=";
29
28
};
30
-
31
-
patches = [
32
-
# Pull upstream fix for meson-0.60:
33
-
# https://gitlab.gnome.org/GNOME/meld/-/merge_requests/78
34
-
(fetchpatch {
35
-
name = "meson-0.60.patch";
36
-
url = "https://gitlab.gnome.org/GNOME/meld/-/commit/cc7746c141d976a4779cf868774fae1fe7627a6d.patch";
37
-
sha256 = "sha256-4uJZyF00Z6svzrOebByZV1hutCZRkIQYC4rUxQr5fdQ=";
38
-
})
39
-
40
-
# Fix view not rendering with adwaita-icon-theme 42 due to removed icons.
41
-
# https://gitlab.gnome.org/GNOME/meld/-/merge_requests/83
42
-
(fetchpatch {
43
-
url = "https://gitlab.gnome.org/GNOME/meld/-/commit/f850cdf3eaf0f08abea003d5fae118a5e92a3d61.patch";
44
-
sha256 = "PaK8Rpv79UwMUligm9pIY16JW/dm7eVXntAwTV4hnbE=";
45
-
})
46
-
];
47
29
48
30
nativeBuildInputs = [
49
31
meson