From 99971b2fe7bf296fb8d86026bd4924d351c958e5 Mon Sep 17 00:00:00 2001 From: Stig Date: Tue, 24 Oct 2023 18:44:50 +0200 Subject: [PATCH] Revert "imagemagick: 7.1.1-19 -> 7.1.1-20" --- pkgs/applications/graphics/ImageMagick/default.nix | 4 ++-- pkgs/top-level/perl-packages.nix | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 139bb1110922..c6d3a83e0c28 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-20"; + version = "7.1.1-19"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = finalAttrs.version; - hash = "sha256-ZVyHvx1UvKjTaErxenuNb8FKwkD4Q3chGtwVmfGoMeM="; + hash = "sha256-SxvaodAjSlOvmGPnD0AcXHrE5dTX2eX1sDM/441rP64="; }; 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 8a6ee0476061..7c121240193b 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-20"; + version = "7.1.1-18"; src = fetchurl { url = "mirror://cpan/authors/id/J/JC/JCRISTY/Image-Magick-${version}.tar.gz"; - hash = "sha256-oMAwXQBxuV2FgPHBhUi+toNFPVnRLNjZqdP2q+ki6jg="; + hash = "sha256-42mvGP4FkY/YfPOh/jRiUFWdDk+S2oB0Jfqv30AAlxw="; }; buildInputs = [ pkgs.imagemagick ]; preConfigure = @@ -19999,7 +19999,6 @@ 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 }; };