From 25accd2a11f71d336d3b2ea636e191e16fcca75a Mon Sep 17 00:00:00 2001 From: Kenny MacDermid Date: Fri, 9 Sep 2022 22:31:04 -0300 Subject: [PATCH] meld: 3.21.2 -> 3.22.0 --- pkgs/applications/version-management/meld/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 88af6b0ceae5..121a0cdf7731 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -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 ];