summary refs log tree commit diff
diff options
context:
space:
mode:
authorKenny MacDermid <kenny@macdermid.ca>2022-09-09 22:31:04 -0300
committerKenny MacDermid <kenny@macdermid.ca>2022-09-11 12:11:44 -0300
commit25accd2a11f71d336d3b2ea636e191e16fcca75a (patch)
tree8cc91af6e2ee93d0bce09525e896be5860195102
parentab265225e8c1abb533f9d650c3f68a090001ebd0 (diff)
downloadnixpkgs-25accd2a11f71d336d3b2ea636e191e16fcca75a.tar
nixpkgs-25accd2a11f71d336d3b2ea636e191e16fcca75a.tar.gz
nixpkgs-25accd2a11f71d336d3b2ea636e191e16fcca75a.tar.bz2
nixpkgs-25accd2a11f71d336d3b2ea636e191e16fcca75a.tar.lz
nixpkgs-25accd2a11f71d336d3b2ea636e191e16fcca75a.tar.xz
nixpkgs-25accd2a11f71d336d3b2ea636e191e16fcca75a.tar.zst
nixpkgs-25accd2a11f71d336d3b2ea636e191e16fcca75a.zip
meld: 3.21.2 -> 3.22.0
-rw-r--r--pkgs/applications/version-management/meld/default.nix10
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix
index 88af6b0ceae..121a0cdf773 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 ];