jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #132237 from Artturin/perlmagikupdate

Browse Source 
perlPackages.ImageMagick: 7.0.10 -> 7.0.11
This commit is contained in:
Stig 2021-08-03 00:16:14 +02:00 committed by GitHub
commit c464dc811b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/graphics/gscan2pdf/default.nix
View File

@ -38,7 +38,7 @@ perlPackages.buildPerlPackage rec {
ImagePNGLibpng
ImageSane
SetIntSpan
PerlMagick
ImageMagick
ConfigGeneral
ListMoreUtils
HTMLParser

2
pkgs/applications/graphics/shutter/default.nix
View File

@ -8,7 +8,7 @@ let
Gtk2Unique FileBaseDir FileWhich FileCopyRecursive XMLSimple NetDBus XMLTwig
XMLParser HTTPMessage ProcSimple SortNaturally LocaleGettext
ProcProcessTable URI ImageExifTool Gtk2AppIndicator LWP JSON
PerlMagick WWWMechanize HTTPDate HTMLForm HTMLParser HTMLTagset JSONMaybeXS
ImageMagick WWWMechanize HTTPDate HTMLForm HTMLParser HTMLTagset JSONMaybeXS
commonsense HTTPCookies NetOAuth PathClass GooCanvas X11Protocol Cairo
EncodeLocale TryTiny TypesSerialiser LWPMediaTypes
];

2
pkgs/applications/graphics/timelapse-deflicker/default.nix
View File

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
buildInputs = with perlPackages; [
makeWrapper perl
PerlMagick TermProgressBar ImageExifTool
ImageMagick TermProgressBar ImageExifTool
FileType ClassMethodMaker
];

4
pkgs/applications/misc/ikiwiki/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, perlPackages, gettext, makeWrapper, PerlMagick, which, highlight
{ lib, stdenv, fetchurl, perlPackages, gettext, makeWrapper, ImageMagick, which, highlight
, gitSupport ? false, git ? null
, docutilsSupport ? false, python ? null, docutils ? null
, monotoneSupport ? false, monotone ? null
@ -32,7 +32,7 @@ stdenv.mkDerivation {
buildInputs = [ which highlight ]
++ (with perlPackages; [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate
TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext
RpcXML XMLSimple PerlMagick YAML YAMLLibYAML HTMLTree AuthenPassphrase
RpcXML XMLSimple ImageMagick YAML YAMLLibYAML HTMLTree AuthenPassphrase
NetOpenIDConsumer LWPxParanoidAgent CryptSSLeay ])
++ lib.optionals docutilsSupport [python docutils]
++ lib.optionals gitSupport [git]

2
pkgs/applications/science/biology/cd-hit/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "032nva6iiwmw59gjipm1mv0xlcckhxsf45mc2qbnv19lbis0q22i";
};
propagatedBuildInputs = [ perl perlPackages.TextNSP perlPackages.PerlMagick ];
propagatedBuildInputs = [ perl perlPackages.TextNSP perlPackages.ImageMagick ];
nativeBuildInputs = [ zlib makeWrapper ];
buildInputs = lib.optional stdenv.cc.isClang openmp;

2
pkgs/tools/typesetting/docbook2odf/default.nix
View File

@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
wrapProgram "$out/bin/docbook2odf" \
--prefix PATH : "${lib.makeBinPath [ zip libxslt ]}" \
--prefix PERL5PATH : "${perlPackages.makePerlPath [ perlPackages.PerlMagick ]}"
--prefix PERL5PATH : "${perlPackages.makePerlPath [ perlPackages.ImageMagick ]}"
'';
meta = with lib; {

2
pkgs/top-level/all-packages.nix
View File

@ -25044,7 +25044,7 @@ in
ikiwiki = callPackage ../applications/misc/ikiwiki {
python = python3;
inherit (perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig;}; }) PerlMagick;
inherit (perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig;}; }) ImageMagick;
};
iksemel = callPackage ../development/libraries/iksemel { };

20
pkgs/top-level/perl-packages.nix
View File

@ -9246,7 +9246,7 @@ let
};
buildInputs = [ pkgs.gtk3 ];
propagatedBuildInputs = [ Readonly Gtk3 ];
checkInputs = [ TestDifferences PerlMagick TryTiny TestMockObject CarpAlways pkgs.librsvg ];
checkInputs = [ TestDifferences ImageMagick TryTiny TestMockObject CarpAlways pkgs.librsvg ];
checkPhase = ''
${pkgs.xvfb-run}/bin/xvfb-run -s '-screen 0 800x600x24' \
make test
@ -11099,7 +11099,7 @@ let
sha256 = "0dr69rgl4si9i9ww1r4dc7apgb7y6f7ih808w4g0924cvz823s0x";
};
outputs = [ "out" "tex" ];
propagatedBuildInputs = [ ArchiveZip DBFile FileWhich IOString ImageSize JSONXS LWP ParseRecDescent PerlMagick PodParser TextUnidecode XMLLibXSLT ];
propagatedBuildInputs = [ ArchiveZip DBFile FileWhich IOString ImageSize JSONXS LWP ParseRecDescent ImageMagick PodParser TextUnidecode XMLLibXSLT ];
preCheck = ''
rm t/931_epub.t # epub test fails
'';
@ -16967,22 +16967,18 @@ let
};
};
PerlMagick = buildPerlPackage rec {
pname = "PerlMagick";
version = "7.0.10";
PerlMagick = ImageMagick; # added 2021-08-02
ImageMagick = buildPerlPackage rec {
pname = "Image-Magick";
version = "7.0.11-1";
src = fetchurl {
url = "mirror://cpan/authors/id/J/JC/JCRISTY/PerlMagick-${version}.tar.gz";
sha256 = "1x05hdb3b6qs36x958b4w46qanvkqm6rpc44rlq4rd2w3gbp4lhx";
url = "mirror://cpan/authors/id/J/JC/JCRISTY/Image-Magick-${version}.tar.gz";
sha256 = "sha256-c0vuFmVq9bypQABBnZElGIQrpkYKwtD/B+PloBAycuI=";
};
buildInputs = [ pkgs.imagemagick ];
preConfigure =
''
sed -i -e 's|my \$INC_magick = .*|my $INC_magick = "-I${pkgs.imagemagick.dev}/include/ImageMagick";|' Makefile.PL
# Enable HDRI support to match the native ImageMagick 7 defaults
# See: https://github.com/ImageMagick/ImageMagick/issues/3402#issuecomment-801195538
substituteInPlace Makefile.PL \
--replace 'MAGICKCORE_HDRI_ENABLE=0' 'MAGICKCORE_HDRI_ENABLE=1'
'';
};