Unverified Commit 00194633 authored by Kerstin's avatar Kerstin Committed by GitHub
Browse files

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

imagemagick: 7.1.1-15 -> 7.1.1-18
parents a30e43fd 30750a3f

pkgs/applications/graphics/ImageMagick/default.nix

+5 −2
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
, Foundation

, testers

, imagemagick

, perlPackages

, python3

}:
@@ -47,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
@@ -125,12 +126,14 @@ stdenv.mkDerivation (finalAttrs: { 


  passthru.tests = {

    version = testers.testVersion { package = finalAttrs.finalPackage; };

    inherit (perlPackages) ImageMagick;

    inherit (python3.pkgs) img2pdf;

    pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;

  };



  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;

pkgs/top-level/perl-packages.nix

+2 −2
Original line number Diff line number Diff line
@@ -19869,10 +19869,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 =