diff options
| author | Ram Kromberg <ramkromberg@mail.com> | 2016-07-18 07:12:17 +0300 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-07-18 06:12:17 +0200 |
| commit | 9ff51cc3c424b814c38961cc7c69351de4051b48 (patch) | |
| tree | fec9d7f0983c28424428b7c867294435a5e2c70c /pkgs/applications/graphics/ImageMagick | |
| parent | 08fe3950745412b79af0452133eea111c8cd2621 (diff) | |
| download | nixlib-9ff51cc3c424b814c38961cc7c69351de4051b48.tar nixlib-9ff51cc3c424b814c38961cc7c69351de4051b48.tar.gz nixlib-9ff51cc3c424b814c38961cc7c69351de4051b48.tar.bz2 nixlib-9ff51cc3c424b814c38961cc7c69351de4051b48.tar.lz nixlib-9ff51cc3c424b814c38961cc7c69351de4051b48.tar.xz nixlib-9ff51cc3c424b814c38961cc7c69351de4051b48.tar.zst nixlib-9ff51cc3c424b814c38961cc7c69351de4051b48.zip | |
imagemagick: 6.9.3-9 -> 6.9.5-2 (#16958)
Diffstat (limited to 'pkgs/applications/graphics/ImageMagick')
| -rw-r--r-- | pkgs/applications/graphics/ImageMagick/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/graphics/ImageMagick/imagetragick.patch | 19 |
2 files changed, 8 insertions, 15 deletions
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index e73cc9024c61..fd218f99a307 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -11,7 +11,7 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "6.9.3-9"; + version = "6.9.5-2"; sha256 = "0q19jgn1iv7zqrw8ibxp4z57iihrc9kyb09k2wnspcacs6vrvinf"; patches = []; } @@ -23,7 +23,7 @@ let name = "mingw-build.patch"; url = "https://raw.githubusercontent.com/Alexpux/MINGW-packages/" + "01ca03b2a4ef/mingw-w64-imagemagick/002-build-fixes.patch"; - sha256 = "1pypszlcx2sf7wfi4p37w1y58ck2r8cd5b2wrrwr9rh87p7fy1c0"; + sha256 = "09h3rpr1jnzd7ipy5d16r2gi0bwg4hk5khwzv4cyhv1xzs8pk7pj"; })]; }; in diff --git a/pkgs/applications/graphics/ImageMagick/imagetragick.patch b/pkgs/applications/graphics/ImageMagick/imagetragick.patch index bdb152dd23a8..1b2de5e73506 100644 --- a/pkgs/applications/graphics/ImageMagick/imagetragick.patch +++ b/pkgs/applications/graphics/ImageMagick/imagetragick.patch @@ -1,15 +1,8 @@ -diff --git a/config/policy.xml b/config/policy.xml -index ca3b022..b058c05 100644 --- a/config/policy.xml +++ b/config/policy.xml -@@ -58,4 +58,10 @@ - <!-- <policy domain="resource" name="time" value="3600"/> --> - <!-- <policy domain="system" name="precision" value="6"/> --> - <policy domain="cache" name="shared-secret" value="passphrase"/> -+ -+ <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" /> - </policymap> +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" /> |