lol

Merge pull request #263198 from dotlambda/imagemagick-7.1.1-21

imagemagick: 7.1.1-19 -> 7.1.1-21

authored by

Stig and committed by
GitHub
3be4a51a fbdaf181

+6 -4
+4 -2
pkgs/applications/graphics/ImageMagick/default.nix
··· 30 30 , Foundation 31 31 , testers 32 32 , imagemagick 33 + , nixos-icons 33 34 , perlPackages 34 35 , python3 35 36 }: ··· 48 49 49 50 stdenv.mkDerivation (finalAttrs: { 50 51 pname = "imagemagick"; 51 - version = "7.1.1-19"; 52 + version = "7.1.1-21"; 52 53 53 54 src = fetchFromGitHub { 54 55 owner = "ImageMagick"; 55 56 repo = "ImageMagick"; 56 57 rev = finalAttrs.version; 57 - hash = "sha256-SxvaodAjSlOvmGPnD0AcXHrE5dTX2eX1sDM/441rP64="; 58 + hash = "sha256-DqVonNh6bFNK91Pd6MwIO1yMrshfGAWNWPpHHQUA2sQ="; 58 59 }; 59 60 60 61 outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big ··· 126 127 127 128 passthru.tests = { 128 129 version = testers.testVersion { package = finalAttrs.finalPackage; }; 130 + inherit nixos-icons; 129 131 inherit (perlPackages) ImageMagick; 130 132 inherit (python3.pkgs) img2pdf; 131 133 pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+2 -2
pkgs/top-level/perl-packages.nix
··· 20271 20271 PerlMagick = ImageMagick; # added 2021-08-02 20272 20272 ImageMagick = buildPerlPackage rec { 20273 20273 pname = "Image-Magick"; 20274 - version = "7.1.1-18"; 20274 + version = "7.1.1-20"; 20275 20275 src = fetchurl { 20276 20276 url = "mirror://cpan/authors/id/J/JC/JCRISTY/Image-Magick-${version}.tar.gz"; 20277 - hash = "sha256-42mvGP4FkY/YfPOh/jRiUFWdDk+S2oB0Jfqv30AAlxw="; 20277 + hash = "sha256-oMAwXQBxuV2FgPHBhUi+toNFPVnRLNjZqdP2q+ki6jg="; 20278 20278 }; 20279 20279 buildInputs = [ pkgs.imagemagick ]; 20280 20280 preConfigure =