Merge remote-tracking branch 'origin/master' into staging-next

1 files changed, 42 insertions, 40 deletions

diff --git a/pkgs/development/python-modules/python-mapnik/default.nix b/pkgs/development/python-modules/python-mapnik/default.nix
index 044199f6c2a6..a68a618ccd46 100644
--- a/pkgs/development/python-modules/python-mapnik/default.nix
+++ b/pkgs/development/python-modules/python-mapnik/default.nix
@@ -1,29 +1,30 @@
-{ lib
-, buildPythonPackage
-, fetchFromGitHub
-, fetchpatch
-, substituteAll
-, isPyPy
-, python
-, pillow
-, pycairo
-, pkg-config
-, boost
-, cairo
-, harfbuzz
-, icu
-, libjpeg
-, libpng
-, libtiff
-, libwebp
-, mapnik
-, proj
-, zlib
-, libxml2
-, sqlite
-, nose
-, pytestCheckHook
-, stdenv
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  fetchpatch,
+  substituteAll,
+  isPyPy,
+  python,
+  pillow,
+  pycairo,
+  pkg-config,
+  boost,
+  cairo,
+  harfbuzz,
+  icu,
+  libjpeg,
+  libpng,
+  libtiff,
+  libwebp,
+  mapnik,
+  proj,
+  zlib,
+  libxml2,
+  sqlite,
+  nose,
+  pytestCheckHook,
+  stdenv,
 }:
 
 buildPythonPackage rec {
@@ -72,12 +73,13 @@ buildPythonPackage rec {
     sqlite
   ];
 
-  propagatedBuildInputs = [ pillow pycairo ];
-
-  configureFlags = [
-    "XMLPARSER=libxml2"
+  propagatedBuildInputs = [
+    pillow
+    pycairo
   ];
 
+  configureFlags = [ "XMLPARSER=libxml2" ];
+
   disabled = isPyPy;
 
   preBuild = ''
@@ -93,13 +95,15 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  preCheck = ''
-    # import from $out
-    rm -r mapnik
-  '' + lib.optionalString stdenv.isDarwin ''
-    # Replace the hardcoded /tmp references with $TMPDIR
-    sed -i "s,/tmp,$TMPDIR,g" test/python_tests/*.py
-  '';
+  preCheck =
+    ''
+      # import from $out
+      rm -r mapnik
+    ''
+    + lib.optionalString stdenv.isDarwin ''
+      # Replace the hardcoded /tmp references with $TMPDIR
+      sed -i "s,/tmp,$TMPDIR,g" test/python_tests/*.py
+    '';
 
   # https://github.com/mapnik/python-mapnik/issues/255
   disabledTests = [
@@ -111,9 +115,7 @@ buildPythonPackage rec {
     "test_pdf_printing"
     "test_visual_zoom_all_rendering2"
     "test_wgs84_inverse_forward"
-  ] ++ lib.optionals stdenv.isDarwin [
-    "test_passing_pycairo_context_svg"
-  ];
+  ] ++ lib.optionals stdenv.isDarwin [ "test_passing_pycairo_context_svg" ];
 
   pythonImportsCheck = [ "mapnik" ];