Unverified Commit b9599db6 authored by Robert Schütz's avatar Robert Schütz Committed by GitHub
Browse files

Merge pull request #212205 from dotlambda/imagemagick-7.1.0-58 

imagemagick: 7.1.0-57 -> 7.1.0-60
parents 43cb8785 2cc36838

pkgs/applications/graphics/ImageMagick/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -46,13 +46,13 @@ in 


stdenv.mkDerivation rec {

  pname = "imagemagick";

  version = "7.1.0-57";

  version = "7.1.0-60";



  src = fetchFromGitHub {

    owner = "ImageMagick";

    repo = "ImageMagick";

    rev = version;

    hash = "sha256-1fFsrsrY8AAMr6miG8OPZIYaVZhtVi5kEaI/96dzip8=";

    hash = "sha256-dQfmW9rt66eWOaKbZ9j8jc1k8v+F8B9TpTx12L+0VE4=";

  };



  outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big

pkgs/development/python-modules/wand/default.nix

+4 −3
Original line number Diff line number Diff line
@@ -8,12 +8,12 @@ 


buildPythonPackage rec {

  pname = "wand";

  version = "0.6.10";

  version = "0.6.11";



  src = fetchPypi {

    pname = "Wand";

    inherit version;

    sha256 = "sha256-Nz9KfyhmyGjDHOkQ4fmzapLRMmQKIAaOwXzqMoT+3Fc=";

    sha256 = "sha256-tmFwDan48ekx5Scm5PxkOlZblRT1iD1Bt3Pjw3yfqZU=";

  };



  postPatch = ''
@@ -38,9 +38,10 @@ buildPythonPackage rec { 
  passthru.imagemagick = imagemagickBig;



  meta = with lib; {

    changelog = "https://docs.wand-py.org/en/${version}/changes.html";

    description = "Ctypes-based simple MagickWand API binding for Python";

    homepage = "http://wand-py.org/";

    license = [ licenses.mit ];

    maintainers = with maintainers; [ infinisil ];

    maintainers = with maintainers; [ infinisil dotlambda ];

  };

}

pkgs/top-level/perl-packages.nix

+2 −2
Original line number Diff line number Diff line
@@ -19469,10 +19469,10 @@ let 
  PerlMagick = ImageMagick; # added 2021-08-02

  ImageMagick = buildPerlPackage rec {

    pname = "Image-Magick";

    version = "7.0.11-1";

    version = "7.1.0-0";

    src = fetchurl {

      url = "mirror://cpan/authors/id/J/JC/JCRISTY/Image-Magick-${version}.tar.gz";

      hash = "sha256-c0vuFmVq9bypQABBnZElGIQrpkYKwtD/B+PloBAycuI=";

      hash = "sha256-+QyXXL4hRFd3xA0ZwXt/eQI9MGTvj6vPNIz4JlS8Fus=";

    };

    buildInputs = [ pkgs.imagemagick ];

    preConfigure =