summary refs log tree commit diff
diff options
context:
space:
mode:
authorKerstin <kerstin@erictapen.name>2023-10-24 11:40:34 +0200
committerGitHub <noreply@github.com>2023-10-24 11:40:34 +0200
commit5655c7f0be9e63d2511345c74452c099f86eddb6 (patch)
treea88ef14c97cd07f42f87e6095d43614149334df6
parent2e1e150d5ed43f447a4e7e6594fec7ed849bd29e (diff)
parent4df459513c415ec976427f9567e604fb21308d4d (diff)
downloadnixpkgs-5655c7f0be9e63d2511345c74452c099f86eddb6.tar
nixpkgs-5655c7f0be9e63d2511345c74452c099f86eddb6.tar.gz
nixpkgs-5655c7f0be9e63d2511345c74452c099f86eddb6.tar.bz2
nixpkgs-5655c7f0be9e63d2511345c74452c099f86eddb6.tar.lz
nixpkgs-5655c7f0be9e63d2511345c74452c099f86eddb6.tar.xz
nixpkgs-5655c7f0be9e63d2511345c74452c099f86eddb6.tar.zst
nixpkgs-5655c7f0be9e63d2511345c74452c099f86eddb6.zip
Merge pull request #260245 from dotlambda/imagemagick-7.1.1-20
imagemagick: 7.1.1-19 -> 7.1.1-20
-rw-r--r--pkgs/applications/graphics/ImageMagick/default.nix4
-rw-r--r--pkgs/top-level/perl-packages.nix5
2 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index c6d3a83e0c2..139bb111092 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -48,13 +48,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "imagemagick";
-  version = "7.1.1-19";
+  version = "7.1.1-20";
 
   src = fetchFromGitHub {
     owner = "ImageMagick";
     repo = "ImageMagick";
     rev = finalAttrs.version;
-    hash = "sha256-SxvaodAjSlOvmGPnD0AcXHrE5dTX2eX1sDM/441rP64=";
+    hash = "sha256-ZVyHvx1UvKjTaErxenuNb8FKwkD4Q3chGtwVmfGoMeM=";
   };
 
   outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 7c121240193..8a6ee047606 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -19986,10 +19986,10 @@ with self; {
   PerlMagick = ImageMagick; # added 2021-08-02
   ImageMagick = buildPerlPackage rec {
     pname = "Image-Magick";
-    version = "7.1.1-18";
+    version = "7.1.1-20";
     src = fetchurl {
       url = "mirror://cpan/authors/id/J/JC/JCRISTY/Image-Magick-${version}.tar.gz";
-      hash = "sha256-42mvGP4FkY/YfPOh/jRiUFWdDk+S2oB0Jfqv30AAlxw=";
+      hash = "sha256-oMAwXQBxuV2FgPHBhUi+toNFPVnRLNjZqdP2q+ki6jg=";
     };
     buildInputs = [ pkgs.imagemagick ];
     preConfigure =
@@ -19999,6 +19999,7 @@ with self; {
     meta = {
       description = "Objected-oriented Perl interface to ImageMagick. Use it to read, manipulate, or write an image or image sequence from within a Perl script";
       license = with lib.licenses; [ imagemagick ];
+      broken = true; # tests fail
     };
   };