diff options
author | Masum Reza <50095635+JohnRTitor@users.noreply.github.com> | 2024-06-23 11:40:43 +0530 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-06-23 11:40:43 +0530 |
commit | fa208e2ded82263437818693a62a028b8f4bd3e0 (patch) | |
tree | 2c2779bfd4be932413b69c8ce95f8a27634ed8dd /pkgs/applications/graphics | |
parent | b555d32ceac2a605d7f57489bd084aef050fdde3 (diff) | |
parent | 429e84cd05af588024eeca6ac51aa8944949c10b (diff) |
Merge pull request #321849 from rhendric/rhendric/imagemagick
imagemagick: 7.1.1-32 -> 7.1.1-33
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r-- | pkgs/applications/graphics/ImageMagick/default.nix | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 491ef7c1f538c..4b941b4d043be 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -34,6 +34,7 @@ , nixos-icons , perlPackages , python3 +, fetchpatch }: assert libXtSupport -> libX11Support; @@ -50,15 +51,24 @@ in stdenv.mkDerivation (finalAttrs: { pname = "imagemagick"; - version = "7.1.1-32"; + version = "7.1.1-33"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = finalAttrs.version; - hash = "sha256-9pDxnUNMmrwnP4rrR41OSZOJZjQnlVvedpLvMZJJnJo="; + hash = "sha256-URGcJDgvRdpYZoECyVeSd0ut1Nkl0Sx2pDhYpi8Yf6o="; }; + 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 |