about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorMasum Reza <50095635+JohnRTitor@users.noreply.github.com>2024-06-24 10:04:19 +0530
committerGitHub <noreply@github.com>2024-06-24 10:04:19 +0530
commitf813e4879c210e14911edea80ee6d2eda42e0865 (patch)
tree2efe83f4856935ca7063acfb90dd9ae1856d3100 /pkgs
parent4856e01dd60517dcdb19b2e42010bbe6fca71651 (diff)
parentaa38b880289b7ae835ba5dd6a8c0247db313499b (diff)
Merge pull request #322085 from rhendric/rhendric/imagemagick
imagemagick: 7.1.1-33 -> 7.1.1-34
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/graphics/ImageMagick/default.nix13
1 files changed, 2 insertions, 11 deletions
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index 4b941b4d043be..671affec32d53 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -51,24 +51,15 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "imagemagick";
-  version = "7.1.1-33";
+  version = "7.1.1-34";
 
   src = fetchFromGitHub {
     owner = "ImageMagick";
     repo = "ImageMagick";
     rev = finalAttrs.version;
-    hash = "sha256-URGcJDgvRdpYZoECyVeSd0ut1Nkl0Sx2pDhYpi8Yf6o=";
+    hash = "sha256-rECU/dp8HQKFs1PW6QeTZIMxCIzzh1w7CckapnxdzxU=";
   };
 
-  patches = [
-    # Fixes 7.1.1-32 -> 7.1.1-33 regression that, notably, affects
-    # perlPackages.ImageMagick tests. Should be in the next release.
-    (fetchpatch {
-      url = "https://github.com/ImageMagick/ImageMagick/commit/bdc6c09cec64fd8e1570ee3edf5647acde336272.patch";
-      hash = "sha256-cfmti9DXFhvn0UasmW0vwrNp+Lfepyrnp6ijk+1sJo8=";
-    })
-  ];
-
   outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
   outputMan = "out"; # it's tiny