Merge branch 'master' of github.com:NixOS/nixpkgs into staging-next

pkgs/development/python-modules/tifffile/default.nix

@@ -1,7 +1,14 @@
-{ lib, fetchPypi, buildPythonPackage, isPy27, isPy3k
-, numpy, enum34, futures, pathlib
-, pytest
+{ lib
+, fetchPypi
+, buildPythonPackage
+, isPy27
+, isPy3k
+, numpy
 , imagecodecs-lite
+, enum34
+, futures
+, pathlib
+, pytest
 }:
 
 buildPythonPackage rec {
@@ -18,14 +25,24 @@ buildPythonPackage rec {
   # Missing dependencies: imagecodecs, czifile, cmapfile, oiffile, lfdfiles
   # and test data missing from PyPI tarball
   doCheck = false;
-  checkInputs = [ pytest ];
+
+  checkInputs = [
+    pytest
+  ];
+
   checkPhase = ''
     pytest
   '';
 
-  propagatedBuildInputs = [ numpy ]
-    ++ lib.optionals isPy27 [ futures enum34 pathlib ]
-    ++ lib.optionals isPy3k [ imagecodecs-lite ];
+  propagatedBuildInputs = [
+    numpy
+  ] ++ lib.optionals isPy3k [
+    imagecodecs-lite
+  ] ++ lib.optionals isPy27 [
+    futures
+    enum34
+    pathlib
+  ];
 
   meta = with lib; {
     description = "Read and write image data from and to TIFF files.";