Merge pull request #190598 from KenMacD/update-meld

meld: 3.21.2 -> 3.22.0
This commit is contained in:
Jonas Heinrich 2022-09-16 13:35:41 +02:00 committed by GitHub
commit 3ceb43327e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -18,13 +18,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "meld";
version = "3.21.2";
version = "3.22.0";
format = "other";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "IV+odABTZ5TFllddE6nIfijxjdNyW43/mG2y4pM6cU4=";
sha256 = "sha256-P8EHyY7251NY/9Kw0UyF3bSP4UoR6TmpQyL6qo6QxA0=";
};
nativeBuildInputs = [
@ -56,6 +56,10 @@ python3.pkgs.buildPythonApplication rec {
# https://github.com/NixOS/nixpkgs/issues/56943
strictDeps = false;
postPatch = ''
patchShebangs meson_shebang_normalisation.py
'';
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
@ -65,7 +69,7 @@ python3.pkgs.buildPythonApplication rec {
meta = with lib; {
description = "Visual diff and merge tool";
homepage = "http://meldmerge.org/";
homepage = "https://meld.app/";
license = licenses.gpl2Plus;
platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ jtojnar mimame ];