mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 06:53:01 +00:00
Merge pull request #263198 from dotlambda/imagemagick-7.1.1-21
imagemagick: 7.1.1-19 -> 7.1.1-21
This commit is contained in:
commit
3be4a51a23
@ -30,6 +30,7 @@
|
||||
, Foundation
|
||||
, testers
|
||||
, imagemagick
|
||||
, nixos-icons
|
||||
, perlPackages
|
||||
, python3
|
||||
}:
|
||||
@ -48,13 +49,13 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "imagemagick";
|
||||
version = "7.1.1-19";
|
||||
version = "7.1.1-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ImageMagick";
|
||||
repo = "ImageMagick";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-SxvaodAjSlOvmGPnD0AcXHrE5dTX2eX1sDM/441rP64=";
|
||||
hash = "sha256-DqVonNh6bFNK91Pd6MwIO1yMrshfGAWNWPpHHQUA2sQ=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
|
||||
@ -126,6 +127,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
passthru.tests = {
|
||||
version = testers.testVersion { package = finalAttrs.finalPackage; };
|
||||
inherit nixos-icons;
|
||||
inherit (perlPackages) ImageMagick;
|
||||
inherit (python3.pkgs) img2pdf;
|
||||
pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
|
||||
|
@ -20271,10 +20271,10 @@ with self; {
|
||||
PerlMagick = ImageMagick; # added 2021-08-02
|
||||
ImageMagick = buildPerlPackage rec {
|
||||
pname = "Image-Magick";
|
||||
version = "7.1.1-18";
|
||||
version = "7.1.1-20";
|
||||
src = fetchurl {
|
||||
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 ];
|
||||
preConfigure =
|
||||
|
Loading…
Reference in New Issue
Block a user