From ed2c6a0e21ca69577c63c352c8ffbfb1fe1836e7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 21 May 2019 11:13:50 -0700 Subject: [PATCH 1/2] imagemagick7: 7.0.8-34 -> 7.0.8-46 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/imagemagick/versions --- pkgs/applications/graphics/ImageMagick/7.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 746bddd5416..d0d7ce4f258 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -13,8 +13,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "7.0.8-34"; - sha256 = "0szkzwy0jzmwx4kqli21jq8pk3s53v37q0nsaqzascs3mpkbza2s"; + version = "7.0.8-46"; + sha256 = "1si3rv3b9jgjkwyny5ja76s8c0z9vyic28fm63j1jrqdd2jyq3pk"; patches = []; }; in From 4c1bf57f370e5a53c34b36fc3d691c456336fc6b Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 24 May 2019 23:43:01 +0200 Subject: [PATCH 2/2] imagemagick: Remove obsolete patch According to https://www.imagemagick.org/discourse-server/viewtopic.php?f=4&t=29588 this has been mitigated in versions 6.9.4-7 and 7.0.1-9, which we're well past already. --- pkgs/applications/graphics/ImageMagick/7.0.nix | 2 +- pkgs/applications/graphics/ImageMagick/default.nix | 2 +- pkgs/applications/graphics/ImageMagick/imagetragick.patch | 8 -------- 3 files changed, 2 insertions(+), 10 deletions(-) delete mode 100644 pkgs/applications/graphics/ImageMagick/imagetragick.patch diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index d0d7ce4f258..f61215f83e2 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { inherit (cfg) sha256; }; - patches = [ ./imagetragick.patch ] ++ cfg.patches; + patches = cfg.patches; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big outputMan = "out"; # it's tiny diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index b3a1b64cae9..ecc6a5b00de 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { inherit (cfg) sha256; }; - patches = [ ./imagetragick.patch ] ++ cfg.patches; + patches = cfg.patches; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big outputMan = "out"; # it's tiny diff --git a/pkgs/applications/graphics/ImageMagick/imagetragick.patch b/pkgs/applications/graphics/ImageMagick/imagetragick.patch deleted file mode 100644 index 1b2de5e7350..00000000000 --- a/pkgs/applications/graphics/ImageMagick/imagetragick.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/config/policy.xml -+++ b/config/policy.xml -67a68,72 -> -> -> -> ->