summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorChristoph Hrdinka <c.github@hrdinka.at>2016-09-27 15:19:21 +0200
committerChristoph Hrdinka <c.github@hrdinka.at>2016-09-27 15:19:21 +0200
commitdeb32ec23fa34b354f683256f4a8f082f9987515 (patch)
tree7fe3804ae82a9d354233dab49b901da0a4d52c16 /pkgs
parent24d2ddfb1dd3419448909f89a9e011b7837b0542 (diff)
downloadnixlib-deb32ec23fa34b354f683256f4a8f082f9987515.tar
nixlib-deb32ec23fa34b354f683256f4a8f082f9987515.tar.gz
nixlib-deb32ec23fa34b354f683256f4a8f082f9987515.tar.bz2
nixlib-deb32ec23fa34b354f683256f4a8f082f9987515.tar.lz
nixlib-deb32ec23fa34b354f683256f4a8f082f9987515.tar.xz
nixlib-deb32ec23fa34b354f683256f4a8f082f9987515.tar.zst
nixlib-deb32ec23fa34b354f683256f4a8f082f9987515.zip
python-mapnik: fae6388 -> git-2016-08-30
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/top-level/python-packages.nix14
1 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 420053adfe5a..8740062cbe03 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7642,17 +7642,19 @@ in modules // {
   };
 
   python-mapnik = buildPythonPackage {
-    name = "python-mapnik-fae6388";
+    name = "python-mapnik-git-2016-08-30";
 
-    src = pkgs.fetchgit {
-      url = https://github.com/mapnik/python-mapnik.git;
-      rev = "fae63881ed0945829e73f711d52740240b740936";
-      sha256 = "04k78l0xxb9cy8dbvmgldg8fgzz701gks14199h8zs2xvyi4gqd2";
+    src = pkgs.fetchFromGitHub {
+      owner = "mapnik";
+      repo = "python-mapnik";
+      rev = "541fd962d4fc99d50ec472af6ddccfdbf98cff37";
+      sha256 = "1d93qjnzggdpbhnmxlmk5jh0zd2jnpfl4n4aip5ypd39ilqibhf3";
     };
 
     disabled = isPyPy;
     doCheck = false; # doesn't find needed test data files
-    buildInputs = with pkgs; [ boost harfbuzz icu mapnik ];
+    buildInputs = with pkgs;
+      [ boost harfbuzz icu libjpeg libpng libtiff libwebp mapnik proj zlib ];
     propagatedBuildInputs = with self; [ pillow pycairo ];
 
     meta = with stdenv.lib; {