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

Merge pull request #19507 from grahamc/mb

Browse Source 
imagemagick: 6.9.5-10 -> 6.9.6-2 for CVEs (and other fixing from the subsequent breakage.)
This commit is contained in:
Graham Christensen 2016-10-13 20:37:36 -04:00 committed by GitHub
commit 09e4b78b48
4 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,8 +11,8 @@ let
else throw "ImageMagick is not supported on this platform."; else throw "ImageMagick is not supported on this platform.";
cfg = { cfg = {
version = "6.9.5-10"; version = "6.9.6-2";
sha256 = "0cxjzqzca80vf6sfx4z9zq4wq2w0vy9ajp9kf88jb4na8mwsn198"; sha256 = "139h9lycxw3lszn052m34xm0rqyanin4nb529vxjcrkkzqilh91r";
patches = []; patches = [];
} }
# Freeze version on mingw so we don't need to port the patch too often. # Freeze version on mingw so we don't need to port the patch too often.

6
pkgs/applications/graphics/PythonMagick/default.nix
View File

@ -2,7 +2,7 @@
let let
version = "0.9.12"; version = "0.9.14";
in in
@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
name = "pythonmagick-${version}"; name = "pythonmagick-${version}";
src = fetchurl { src = fetchurl {
url = "http://www.imagemagick.org/download/python/releases/PythonMagick-${version}.tar.xz"; url = "mirror://imagemagick/python/releases/PythonMagick-${version}.tar.xz";
sha256 = "1l1kr3d7l40fkxgs6mrlxj65alv2jizm9hhgg9i9g90a8qj8642b"; sha256 = "1flkdfi3c19wy2qcfzax1cqvmmri10rvmhc2y85gmagqvv01zz22";
}; };
buildInputs = [python boost pkgconfig imagemagick]; buildInputs = [python boost pkgconfig imagemagick];

1
pkgs/applications/graphics/gimp/plugins/default.nix
View File

@ -57,6 +57,7 @@ rec {
sed -e 's,^\(GIMP_PLUGIN_DIR=\).*,\1'"$out/${gimp.name}-plugins", \ sed -e 's,^\(GIMP_PLUGIN_DIR=\).*,\1'"$out/${gimp.name}-plugins", \
-e 's,^\(GIMP_DATA_DIR=\).*,\1'"$out/share/${gimp.name}", -i configure -e 's,^\(GIMP_DATA_DIR=\).*,\1'"$out/share/${gimp.name}", -i configure
''; '';
hardeningDisable = [ "format" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "The GIMP Animation Package"; description = "The GIMP Animation Package";
homepage = http://www.gimp.org; homepage = http://www.gimp.org;

17
pkgs/top-level/php-packages.nix
View File

@ -23,20 +23,11 @@ let
sha256 = "0r5pfbjbmdj46h20jm3iqmy969qd27ajyf0phjhgykv6j0cqjlgd"; sha256 = "0r5pfbjbmdj46h20jm3iqmy969qd27ajyf0phjhgykv6j0cqjlgd";
}; };
imagick = if isPhp7 then imagick34 else imagick31; imagick = buildPecl {
name = "imagick-3.4.3RC1";
imagick31 = assert !isPhp7; buildPecl { sha256 = "0siyxpszjz6s095s2g2854bhprjq49rf22v6syjiwvndg1pc9fsh";
name = "imagick-3.1.2";
sha256 = "14vclf2pqcgf3w8nzqbdw0b9v30q898344c84jdbw2sa62n6k1sj";
configureFlags = "--with-imagick=${pkgs.imagemagick.dev}"; configureFlags = "--with-imagick=${pkgs.imagemagick.dev}";
buildInputs = [ pkgs.pkgconfig ]; nativeBuildInputs = [ pkgs.pkgconfig ];
};
imagick34 = buildPecl {
name = "imagick-3.4.0RC4";
sha256 = "0fdkzdv3r8sm6y1x11kp3rxsimq6zf15xvi0mhn57svmnan4zh0i";
configureFlags = "--with-imagick=${pkgs.imagemagick.dev}";
buildInputs = [ pkgs.pkgconfig ];
}; };
# No support for PHP 7 yet # No support for PHP 7 yet