public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

imagemagick: Remove obsolete patch

Browse Source 
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.
This commit is contained in:
Silvan Mosberger 2019-05-24 23:43:01 +02:00
parent ed2c6a0e21
commit 4c1bf57f37
No known key found for this signature in database
GPG Key ID: 9424360B4B85C9E7
3 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/graphics/ImageMagick/7.0.nix
View File

@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
inherit (cfg) sha256; inherit (cfg) sha256;
}; };
patches = [ ./imagetragick.patch ] ++ cfg.patches; patches = cfg.patches;
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
outputMan = "out"; # it's tiny outputMan = "out"; # it's tiny

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

@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
inherit (cfg) sha256; inherit (cfg) sha256;
}; };
patches = [ ./imagetragick.patch ] ++ cfg.patches; patches = cfg.patches;
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
outputMan = "out"; # it's tiny outputMan = "out"; # it's tiny

8
pkgs/applications/graphics/ImageMagick/imagetragick.patch
View File

@ -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" />