git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #132237 from Artturin/perlmagikupdate

perlPackages.ImageMagick: 7.0.10 -> 7.0.11

commitc464dc811babfe316ed4ab7bbc12351122e69dd7 authorStig <stig@stig.io> dateTue 3 Aug 2021, 00:16 (5 years ago) parent50e3b15f173c77
8 files changed+16−20
compare with master
unifiedsplit
pkgs/applications/graphics/gscan2pdf/default.nix+1−1 pkgs/applications/graphics/shutter/default.nix+1−1 pkgs/applications/graphics/timelapse-deflicker/default.nix+1−1 pkgs/applications/misc/ikiwiki/default.nix+2−2 pkgs/applications/science/biology/cd-hit/default.nix+1−1 pkgs/tools/typesetting/docbook2odf/default.nix+1−1 pkgs/top-level/all-packages.nix+1−1 pkgs/top-level/perl-packages.nix+8−12
pkgs/applications/graphics/gscan2pdf/default.nix+1−1
@@ -38,7 +38,7 @@ perlPackages.buildPerlPackage rec {
3838 ImagePNGLibpng
3939 ImageSane
4040 SetIntSpan
41− PerlMagick
41+ ImageMagick
4242 ConfigGeneral
4343 ListMoreUtils
4444 HTMLParser
pkgs/applications/graphics/shutter/default.nix+1−1
@@ -8,7 +8,7 @@ let
88 Gtk2Unique FileBaseDir FileWhich FileCopyRecursive XMLSimple NetDBus XMLTwig
99 XMLParser HTTPMessage ProcSimple SortNaturally LocaleGettext
1010 ProcProcessTable URI ImageExifTool Gtk2AppIndicator LWP JSON
11− PerlMagick WWWMechanize HTTPDate HTMLForm HTMLParser HTMLTagset JSONMaybeXS
11+ ImageMagick WWWMechanize HTTPDate HTMLForm HTMLParser HTMLTagset JSONMaybeXS
1212 commonsense HTTPCookies NetOAuth PathClass GooCanvas X11Protocol Cairo
1313 EncodeLocale TryTiny TypesSerialiser LWPMediaTypes
1414 ];
pkgs/applications/graphics/timelapse-deflicker/default.nix+1−1
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818
1919 buildInputs = with perlPackages; [
2020 makeWrapper perl
21− PerlMagick TermProgressBar ImageExifTool
21+ ImageMagick TermProgressBar ImageExifTool
2222 FileType ClassMethodMaker
2323 ];
2424
pkgs/applications/misc/ikiwiki/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, perlPackages, gettext, makeWrapper, PerlMagick, which, highlight
1+{ lib, stdenv, fetchurl, perlPackages, gettext, makeWrapper, ImageMagick, which, highlight
22, gitSupport ? false, git ? null
33, docutilsSupport ? false, python ? null, docutils ? null
44, monotoneSupport ? false, monotone ? null
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
3232 buildInputs = [ which highlight ]
3333 ++ (with perlPackages; [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate
3434 TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext
35− RpcXML XMLSimple PerlMagick YAML YAMLLibYAML HTMLTree AuthenPassphrase
35+ RpcXML XMLSimple ImageMagick YAML YAMLLibYAML HTMLTree AuthenPassphrase
3636 NetOpenIDConsumer LWPxParanoidAgent CryptSSLeay ])
3737 ++ lib.optionals docutilsSupport [python docutils]
3838 ++ lib.optionals gitSupport [git]
pkgs/applications/science/biology/cd-hit/default.nix+1−1
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "032nva6iiwmw59gjipm1mv0xlcckhxsf45mc2qbnv19lbis0q22i";
1212 };
1313
14− propagatedBuildInputs = [ perl perlPackages.TextNSP perlPackages.PerlMagick ];
14+ propagatedBuildInputs = [ perl perlPackages.TextNSP perlPackages.ImageMagick ];
1515
1616 nativeBuildInputs = [ zlib makeWrapper ];
1717 buildInputs = lib.optional stdenv.cc.isClang openmp;
pkgs/tools/typesetting/docbook2odf/default.nix+1−1
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
2828
2929 wrapProgram "$out/bin/docbook2odf" \
3030 --prefix PATH : "${lib.makeBinPath [ zip libxslt ]}" \
31− --prefix PERL5PATH : "${perlPackages.makePerlPath [ perlPackages.PerlMagick ]}"
31+ --prefix PERL5PATH : "${perlPackages.makePerlPath [ perlPackages.ImageMagick ]}"
3232 '';
3333
3434 meta = with lib; {
pkgs/top-level/all-packages.nix+1−1
@@ -25044,7 +25044,7 @@ in
2504425044
2504525045 ikiwiki = callPackage ../applications/misc/ikiwiki {
2504625046 python = python3;
25047− inherit (perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig;}; }) PerlMagick;
25047+ inherit (perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig;}; }) ImageMagick;
2504825048 };
2504925049
2505025050 iksemel = callPackage ../development/libraries/iksemel { };
pkgs/top-level/perl-packages.nix+8−12
@@ -9246,7 +9246,7 @@ let
92469246 };
92479247 buildInputs = [ pkgs.gtk3 ];
92489248 propagatedBuildInputs = [ Readonly Gtk3 ];
9249− checkInputs = [ TestDifferences PerlMagick TryTiny TestMockObject CarpAlways pkgs.librsvg ];
9249+ checkInputs = [ TestDifferences ImageMagick TryTiny TestMockObject CarpAlways pkgs.librsvg ];
92509250 checkPhase = ''
92519251 ${pkgs.xvfb-run}/bin/xvfb-run -s '-screen 0 800x600x24' \
92529252 make test
@@ -11099,7 +11099,7 @@ let
1109911099 sha256 = "0dr69rgl4si9i9ww1r4dc7apgb7y6f7ih808w4g0924cvz823s0x";
1110011100 };
1110111101 outputs = [ "out" "tex" ];
11102− propagatedBuildInputs = [ ArchiveZip DBFile FileWhich IOString ImageSize JSONXS LWP ParseRecDescent PerlMagick PodParser TextUnidecode XMLLibXSLT ];
11102+ propagatedBuildInputs = [ ArchiveZip DBFile FileWhich IOString ImageSize JSONXS LWP ParseRecDescent ImageMagick PodParser TextUnidecode XMLLibXSLT ];
1110311103 preCheck = ''
1110411104 rm t/931_epub.t # epub test fails
1110511105 '';
@@ -16967,22 +16967,18 @@ let
1696716967 };
1696816968 };
1696916969
16970− PerlMagick = buildPerlPackage rec {
16971− pname = "PerlMagick";
16972− version = "7.0.10";
16970+ PerlMagick = ImageMagick; # added 2021-08-02
16971+ ImageMagick = buildPerlPackage rec {
16972+ pname = "Image-Magick";
16973+ version = "7.0.11-1";
1697316974 src = fetchurl {
16974− url = "mirror://cpan/authors/id/J/JC/JCRISTY/PerlMagick-${version}.tar.gz";
16975− sha256 = "1x05hdb3b6qs36x958b4w46qanvkqm6rpc44rlq4rd2w3gbp4lhx";
16975+ url = "mirror://cpan/authors/id/J/JC/JCRISTY/Image-Magick-${version}.tar.gz";
16976+ sha256 = "sha256-c0vuFmVq9bypQABBnZElGIQrpkYKwtD/B+PloBAycuI=";
1697616977 };
1697716978 buildInputs = [ pkgs.imagemagick ];
1697816979 preConfigure =
1697916980 ''
1698016981 sed -i -e 's|my \$INC_magick = .*|my $INC_magick = "-I${pkgs.imagemagick.dev}/include/ImageMagick";|' Makefile.PL
16981−
16982− # Enable HDRI support to match the native ImageMagick 7 defaults
16983− # See: https://github.com/ImageMagick/ImageMagick/issues/3402#issuecomment-801195538
16984− substituteInPlace Makefile.PL \
16985− --replace 'MAGICKCORE_HDRI_ENABLE=0' 'MAGICKCORE_HDRI_ENABLE=1'
1698616982 '';
1698716983 };
1698816984