diff options
| author | Silvan Mosberger <infinisil@icloud.com> | 2019-05-24 23:43:01 +0200 |
|---|---|---|
| committer | Silvan Mosberger <infinisil@icloud.com> | 2019-05-24 23:43:01 +0200 |
| commit | 4c1bf57f370e5a53c34b36fc3d691c456336fc6b (patch) | |
| tree | 17e8ed0e945574b23c6a883e22b33de2d7170c60 /pkgs/applications/graphics/ImageMagick | |
| parent | ed2c6a0e21ca69577c63c352c8ffbfb1fe1836e7 (diff) | |
| download | nixlib-4c1bf57f370e5a53c34b36fc3d691c456336fc6b.tar nixlib-4c1bf57f370e5a53c34b36fc3d691c456336fc6b.tar.gz nixlib-4c1bf57f370e5a53c34b36fc3d691c456336fc6b.tar.bz2 nixlib-4c1bf57f370e5a53c34b36fc3d691c456336fc6b.tar.lz nixlib-4c1bf57f370e5a53c34b36fc3d691c456336fc6b.tar.xz nixlib-4c1bf57f370e5a53c34b36fc3d691c456336fc6b.tar.zst nixlib-4c1bf57f370e5a53c34b36fc3d691c456336fc6b.zip | |
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.
Diffstat (limited to 'pkgs/applications/graphics/ImageMagick')
| -rw-r--r-- | pkgs/applications/graphics/ImageMagick/7.0.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/graphics/ImageMagick/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/graphics/ImageMagick/imagetragick.patch | 8 |
3 files changed, 2 insertions, 10 deletions
diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index d0d7ce4f2585..f61215f83e22 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 b3a1b64cae96..ecc6a5b00dec 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 1b2de5e73506..000000000000 --- a/pkgs/applications/graphics/ImageMagick/imagetragick.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/config/policy.xml -+++ b/config/policy.xml -67a68,72 -> <policy domain="coder" rights="none" pattern="EPHEMERAL" /> -> <policy domain="coder" rights="none" pattern="URL" /> -> <policy domain="coder" rights="none" pattern="HTTPS" /> -> <policy domain="coder" rights="none" pattern="MVG" /> -> <policy domain="coder" rights="none" pattern="MSL" /> |