nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 07:23:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

meld: 3.21.1 → 3.21.2

Browse Source 
https://gitlab.gnome.org/GNOME/meld/-/compare/3.21.1...3.21.2
This commit is contained in:
Jan Tojnar 2022-06-23 02:09:21 +00:00
parent 6141b8932a
commit 68c94a2786
1 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/applications/version-management/meld/default.nix
View File

@ -1,6 +1,5 @@
{ lib { lib
, fetchurl , fetchurl
, fetchpatch
, gettext , gettext
, itstool , itstool
, python3 , python3
@ -19,32 +18,15 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "meld"; pname = "meld";
version = "3.21.1"; version = "3.21.2";
format = "other"; format = "other";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "cP6Y65Ms4h1nFw47D2pzF+gT6GLemJM+pROYLpoDMgI="; sha256 = "IV+odABTZ5TFllddE6nIfijxjdNyW43/mG2y4pM6cU4=";
}; };
patches = [
# Pull upstream fix for meson-0.60:
# https://gitlab.gnome.org/GNOME/meld/-/merge_requests/78
(fetchpatch {
name = "meson-0.60.patch";
url = "https://gitlab.gnome.org/GNOME/meld/-/commit/cc7746c141d976a4779cf868774fae1fe7627a6d.patch";
sha256 = "sha256-4uJZyF00Z6svzrOebByZV1hutCZRkIQYC4rUxQr5fdQ=";
})
# Fix view not rendering with adwaita-icon-theme 42 due to removed icons.
# https://gitlab.gnome.org/GNOME/meld/-/merge_requests/83
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/meld/-/commit/f850cdf3eaf0f08abea003d5fae118a5e92a3d61.patch";
sha256 = "PaK8Rpv79UwMUligm9pIY16JW/dm7eVXntAwTV4hnbE=";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
meson meson
ninja ninja