diff options
| author | Stig <stig@stig.io> | 2023-10-25 12:42:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-25 12:42:37 +0200 |
| commit | 3be4a51a23edfa3a3c4ceabe25328520dd1d9fd4 (patch) | |
| tree | cc9ae464c71f26d8f177fb3e8a239f9f11488c7e | |
| parent | fbdaf18107681735d12b47510572be28fbdde052 (diff) | |
| parent | 9bf63352f864f40d102ac96918badfc2689caed9 (diff) | |
| download | nixlib-3be4a51a23edfa3a3c4ceabe25328520dd1d9fd4.tar nixlib-3be4a51a23edfa3a3c4ceabe25328520dd1d9fd4.tar.gz nixlib-3be4a51a23edfa3a3c4ceabe25328520dd1d9fd4.tar.bz2 nixlib-3be4a51a23edfa3a3c4ceabe25328520dd1d9fd4.tar.lz nixlib-3be4a51a23edfa3a3c4ceabe25328520dd1d9fd4.tar.xz nixlib-3be4a51a23edfa3a3c4ceabe25328520dd1d9fd4.tar.zst nixlib-3be4a51a23edfa3a3c4ceabe25328520dd1d9fd4.zip | |
Merge pull request #263198 from dotlambda/imagemagick-7.1.1-21
imagemagick: 7.1.1-19 -> 7.1.1-21
| -rw-r--r-- | pkgs/applications/graphics/ImageMagick/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/perl-packages.nix | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index c6d3a83e0c28..d248b845ddf0 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -30,6 +30,7 @@ , Foundation , testers , imagemagick +, nixos-icons , perlPackages , python3 }: @@ -48,13 +49,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "imagemagick"; - version = "7.1.1-19"; + version = "7.1.1-21"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = finalAttrs.version; - hash = "sha256-SxvaodAjSlOvmGPnD0AcXHrE5dTX2eX1sDM/441rP64="; + hash = "sha256-DqVonNh6bFNK91Pd6MwIO1yMrshfGAWNWPpHHQUA2sQ="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big @@ -126,6 +127,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests = { version = testers.testVersion { package = finalAttrs.finalPackage; }; + inherit nixos-icons; inherit (perlPackages) ImageMagick; inherit (python3.pkgs) img2pdf; pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 14f168c6b25e..d35504c58931 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -20271,10 +20271,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 = |