From 6e4895150c7c6158723e144da4c7553529d47264 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 17 Sep 2023 23:33:32 -0700 Subject: [PATCH 1/4] imagemagick: add perlPackages.ImageMagick to passthru.tests (cherry picked from commit 840a10e87e211e1ba4290fc1d57862763525ae17) --- pkgs/applications/graphics/ImageMagick/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index fa90b95bd733..dd252a2b5848 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -30,6 +30,7 @@ , Foundation , testers , imagemagick +, perlPackages , python3 }: @@ -125,6 +126,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests = { version = testers.testVersion { package = finalAttrs.finalPackage; }; + inherit (perlPackages) ImageMagick; inherit (python3.pkgs) img2pdf; pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; From d4e87833ae995e46a3d77c15277519cea72e1d17 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 23 Sep 2023 10:29:00 +0000 Subject: [PATCH 2/4] imagemagick: add changelog to meta (cherry picked from commit 58c5f021cc670b7f1765b796761d4ab3de1ef75c) --- pkgs/applications/graphics/ImageMagick/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index dd252a2b5848..6cc426778b9b 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -133,6 +133,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "http://www.imagemagick.org/"; + changelog = "https://github.com/ImageMagick/Website/blob/main/ChangeLog.md"; description = "A software suite to create, edit, compose, or convert bitmap images"; pkgConfigModules = [ "ImageMagick" "MagickWand" ]; platforms = platforms.linux ++ platforms.darwin; From a9963085a0cc76c5fef92b6af044b3ecf4948420 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 17 Sep 2023 23:22:33 -0700 Subject: [PATCH 3/4] imagemagick: 7.1.1-15 -> 7.1.1-18 Diff: https://github.com/ImageMagick/ImageMagick/compare/7.1.1-15...7.1.1-18 (cherry picked from commit e912f12890fa716c9d74d92e935bcbe198bc1bd9) --- pkgs/applications/graphics/ImageMagick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 6cc426778b9b..7ce2f4c5a27e 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-15"; + version = "7.1.1-18"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = finalAttrs.version; - hash = "sha256-/fI/RrwcgvKX5loIrDAur60VF5O4FgyPYN7BbcPP/bU="; + hash = "sha256-DnmX4dxpOqDGHOFSnq7ms2fLGdB1nKdZbpd0Q9t+X6A="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big From d0d85e83debd1e57615e85ed3d223b8b9e4c5348 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 24 Sep 2023 09:20:23 -0700 Subject: [PATCH 4/4] perlPackages.ImageMagick: 7.1.0-0 -> 7.1.1-18 (cherry picked from commit 30750a3fa42d6e76490d4a8db6a95fd119c3cf99) --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4555f6db69ec..66c865eddb72 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -19603,10 +19603,10 @@ with self; { PerlMagick = ImageMagick; # added 2021-08-02 ImageMagick = buildPerlPackage rec { pname = "Image-Magick"; - version = "7.1.0-0"; + version = "7.1.1-18"; src = fetchurl { url = "mirror://cpan/authors/id/J/JC/JCRISTY/Image-Magick-${version}.tar.gz"; - hash = "sha256-+QyXXL4hRFd3xA0ZwXt/eQI9MGTvj6vPNIz4JlS8Fus="; + hash = "sha256-42mvGP4FkY/YfPOh/jRiUFWdDk+S2oB0Jfqv30AAlxw="; }; buildInputs = [ pkgs.imagemagick ]; preConfigure =