nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-03 13:30:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #257431 from NixOS/backport-255817-to-release-23.05

Browse Source 
[Backport release-23.05] imagemagick: 7.1.1-15 -> 7.1.1-18
This commit is contained in:
Kerstin
2023-09-27 13:57:28 +02:00
committed by GitHub
parent f683b64569 d0d85e83de
commit fcdf3987d3
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/graphics/ImageMagick/default.nix
View File

@@ -30,6 +30,7 @@
, Foundation
, testers
, imagemagick
, perlPackages
, python3
}:
@@ -47,13 +48,13 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "imagemagick";
version = "7.1.1-15";
version = "7.1.1-18";
src = fetchFromGitHub {
owner = "ImageMagick";
repo = "ImageMagick";
rev = finalAttrs.version;
hash = "sha256-/fI/RrwcgvKX5loIrDAur60VF5O4FgyPYN7BbcPP/bU=";
hash = "sha256-DnmX4dxpOqDGHOFSnq7ms2fLGdB1nKdZbpd0Q9t+X6A=";
};
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
@@ -125,12 +126,14 @@ stdenv.mkDerivation (finalAttrs: {
passthru.tests = {
version = testers.testVersion { package = finalAttrs.finalPackage; };
inherit (perlPackages) ImageMagick;
inherit (python3.pkgs) img2pdf;
pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
};
meta = with lib; {
homepage = "http://www.imagemagick.org/";
changelog = "https://github.com/ImageMagick/Website/blob/main/ChangeLog.md";
description = "A software suite to create, edit, compose, or convert bitmap images";
pkgConfigModules = [ "ImageMagick" "MagickWand" ];
platforms = platforms.linux ++ platforms.darwin;

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

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