summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Scott <code@humanleg.org.uk>2022-12-08 23:36:11 +0000
committerGitHub <noreply@github.com>2022-12-08 23:36:11 +0000
commitd273ec3b470d5da5cf81eee1942aa09c12e9829f (patch)
treea2be669807d96a90a543efd4c78ac4c8f3dc2b8d
parentMerge pull request #205192 from NixOS/backport-205175-to-release-22.11 (diff)
parentimagemagick6: 6.9.12-26 -> 6.9.12-68 (diff)
downloadnixpkgs-d273ec3b470d5da5cf81eee1942aa09c12e9829f.tar.gz
Merge pull request #205078 from NixOS/backport-205045-to-release-22.11
[Backport release-22.11] imagemagick6: 6.9.12-26 -> 6.9.12-68
-rw-r--r--pkgs/applications/graphics/ImageMagick/6.x.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/graphics/ImageMagick/6.x.nix b/pkgs/applications/graphics/ImageMagick/6.x.nix
index d0b76706dc92..e09de1b25023 100644
--- a/pkgs/applications/graphics/ImageMagick/6.x.nix
+++ b/pkgs/applications/graphics/ImageMagick/6.x.nix
@@ -35,13 +35,13 @@ in
stdenv.mkDerivation rec {
pname = "imagemagick";
- version = "6.9.12-26";
+ version = "6.9.12-68";
src = fetchFromGitHub {
owner = "ImageMagick";
repo = "ImageMagick6";
rev = version;
- sha256 = "sha256-oNorY/93jk1v5BS1T3wqctXuzV4o8JlyZtHnsNYmO4U=";
+ sha256 = "sha256-slQcA0cblxtG/1DiJx5swUh7Kfwgz5HG70eqJFLaQJI=";
};
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
++ lib.optional libXtSupport libXt
++ lib.optional libwebpSupport libwebp;
- doCheck = false; # fails 6 out of 76 tests
+ doCheck = false; # fails 2 out of 76 tests
postInstall = ''
(cd "$dev/include" && ln -s ImageMagick* ImageMagick)