Merge pull request #255817 from dotlambda/imagemagick-7.1.1-16

imagemagick: 7.1.1-15 -> 7.1.1-18

authored by Kerstin and committed by GitHub 00194633 a30e43fd

+7 -4
+5 -2
pkgs/applications/graphics/ImageMagick/default.nix
··· 30 30 , Foundation 31 31 , testers 32 32 , imagemagick 33 + , perlPackages 33 34 , python3 34 35 }: 35 36 ··· 47 48 48 49 stdenv.mkDerivation (finalAttrs: { 49 50 pname = "imagemagick"; 50 - version = "7.1.1-15"; 51 + version = "7.1.1-18"; 51 52 52 53 src = fetchFromGitHub { 53 54 owner = "ImageMagick"; 54 55 repo = "ImageMagick"; 55 56 rev = finalAttrs.version; 56 - hash = "sha256-/fI/RrwcgvKX5loIrDAur60VF5O4FgyPYN7BbcPP/bU="; 57 + hash = "sha256-DnmX4dxpOqDGHOFSnq7ms2fLGdB1nKdZbpd0Q9t+X6A="; 57 58 }; 58 59 59 60 outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big ··· 125 126 126 127 passthru.tests = { 127 128 version = testers.testVersion { package = finalAttrs.finalPackage; }; 129 + inherit (perlPackages) ImageMagick; 128 130 inherit (python3.pkgs) img2pdf; 129 131 pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 130 132 }; 131 133 132 134 meta = with lib; { 133 135 homepage = "http://www.imagemagick.org/"; 136 + changelog = "https://github.com/ImageMagick/Website/blob/main/ChangeLog.md"; 134 137 description = "A software suite to create, edit, compose, or convert bitmap images"; 135 138 pkgConfigModules = [ "ImageMagick" "MagickWand" ]; 136 139 platforms = platforms.linux ++ platforms.darwin;
+2 -2
pkgs/top-level/perl-packages.nix
··· 19869 19869 PerlMagick = ImageMagick; # added 2021-08-02 19870 19870 ImageMagick = buildPerlPackage rec { 19871 19871 pname = "Image-Magick"; 19872 - version = "7.1.0-0"; 19872 + version = "7.1.1-18"; 19873 19873 src = fetchurl { 19874 19874 url = "mirror://cpan/authors/id/J/JC/JCRISTY/Image-Magick-${version}.tar.gz"; 19875 - hash = "sha256-+QyXXL4hRFd3xA0ZwXt/eQI9MGTvj6vPNIz4JlS8Fus="; 19875 + hash = "sha256-42mvGP4FkY/YfPOh/jRiUFWdDk+S2oB0Jfqv30AAlxw="; 19876 19876 }; 19877 19877 buildInputs = [ pkgs.imagemagick ]; 19878 19878 preConfigure =