summaryrefslogtreecommitdiff
path: root/pkgs/applications/graphics/PythonMagick/default.nix
diff options
context:
space:
mode:
authorNicolas B. Pierron <nicolas.b.pierron@gmail.com>2016-10-31 15:16:29 +0000
committerNicolas B. Pierron <nicolas.b.pierron@gmail.com>2016-10-31 15:16:29 +0000
commit59b5bbeae91109007e36a269a94cccc865dc5175 (patch)
tree1ee3d18aedace6d66034ea72fea571d20d8d0fee /pkgs/applications/graphics/PythonMagick/default.nix
parentDo not use old stdenv version in faust wrap functions. (-8 alias, -15 unpatch... (diff)
parentMerge pull request #19675 from edwtjo/dictd-touchup (diff)
downloadnixpkgs-59b5bbeae91109007e36a269a94cccc865dc5175.tar.gz
Merge branch master into security-updatesorigin/security-updatesgitlab.intr/security-updates
This merge mostly take the changes made to the master branch. Some conflict happen in top-level/default.nix due to a reformating of the code of which is computing the fix-point. This merge fixes these issues by adding the pkgsIndex argument, needed to re-evaluate the fix-point with another set of packages, and also re-add the second fix-point made to support the dependencies.
Diffstat (limited to 'pkgs/applications/graphics/PythonMagick/default.nix')
-rw-r--r--pkgs/applications/graphics/PythonMagick/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/graphics/PythonMagick/default.nix b/pkgs/applications/graphics/PythonMagick/default.nix
index 5ab7d4d8a694..a8d0d490f8bb 100644
--- a/pkgs/applications/graphics/PythonMagick/default.nix
+++ b/pkgs/applications/graphics/PythonMagick/default.nix
@@ -2,7 +2,7 @@
let
- version = "0.9.12";
+ version = "0.9.14";
in
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
name = "pythonmagick-${version}";
src = fetchurl {
- url = "http://www.imagemagick.org/download/python/releases/PythonMagick-${version}.tar.xz";
- sha256 = "1l1kr3d7l40fkxgs6mrlxj65alv2jizm9hhgg9i9g90a8qj8642b";
+ url = "mirror://imagemagick/python/releases/PythonMagick-${version}.tar.xz";
+ sha256 = "1flkdfi3c19wy2qcfzax1cqvmmri10rvmhc2y85gmagqvv01zz22";
};
buildInputs = [python boost pkgconfig imagemagick];