Merge pull request #263183 from NixOS/revert-260245-imagemagick-7.1.1-20

Revert "imagemagick: 7.1.1-19 -> 7.1.1-20"
This commit is contained in:
Stig 2023-10-24 19:16:03 +02:00 committed by GitHub
commit 90eb857e20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions

View File

@ -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

View File

@ -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
};
};