cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #263198 from dotlambda/imagemagick-7.1.1-21

Browse source 
imagemagick: 7.1.1-19 -> 7.1.1-21
This commit is contained in:
Stig 2023-10-25 12:42:37 +02:00 committed by GitHub
commit 3be4a51a23
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/applications/graphics/ImageMagick/default.nix
View file

@ -30,6 +30,7 @@
, Foundation , Foundation
, testers , testers
, imagemagick , imagemagick
, nixos-icons
, perlPackages , perlPackages
, python3 , python3
}: }:
@ -48,13 +49,13 @@ in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "imagemagick"; pname = "imagemagick";
version = "7.1.1-19"; version = "7.1.1-21";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ImageMagick"; owner = "ImageMagick";
repo = "ImageMagick"; repo = "ImageMagick";
rev = finalAttrs.version; rev = finalAttrs.version;
hash = "sha256-SxvaodAjSlOvmGPnD0AcXHrE5dTX2eX1sDM/441rP64="; hash = "sha256-DqVonNh6bFNK91Pd6MwIO1yMrshfGAWNWPpHHQUA2sQ=";
}; };
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
@ -126,6 +127,7 @@ stdenv.mkDerivation (finalAttrs: {
passthru.tests = { passthru.tests = {
version = testers.testVersion { package = finalAttrs.finalPackage; }; version = testers.testVersion { package = finalAttrs.finalPackage; };
inherit nixos-icons;
inherit (perlPackages) ImageMagick; inherit (perlPackages) ImageMagick;
inherit (python3.pkgs) img2pdf; inherit (python3.pkgs) img2pdf;
pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;

4
pkgs/top-level/perl-packages.nix
View file

@ -20271,10 +20271,10 @@ with self; {
PerlMagick = ImageMagick; # added 2021-08-02 PerlMagick = ImageMagick; # added 2021-08-02
ImageMagick = buildPerlPackage rec { ImageMagick = buildPerlPackage rec {
pname = "Image-Magick"; pname = "Image-Magick";
version = "7.1.1-18"; version = "7.1.1-20";
src = fetchurl { src = fetchurl {
url = "mirror://cpan/authors/id/J/JC/JCRISTY/Image-Magick-${version}.tar.gz"; url = "mirror://cpan/authors/id/J/JC/JCRISTY/Image-Magick-${version}.tar.gz";
hash = "sha256-42mvGP4FkY/YfPOh/jRiUFWdDk+S2oB0Jfqv30AAlxw="; hash = "sha256-oMAwXQBxuV2FgPHBhUi+toNFPVnRLNjZqdP2q+ki6jg=";
}; };
buildInputs = [ pkgs.imagemagick ]; buildInputs = [ pkgs.imagemagick ];
preConfigure = preConfigure =