NixOS · Mar 5, 2019 · Mar 5, 2019 · Mar 5, 2019
diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix
@@ -16,12 +16,16 @@ buildPythonPackage rec {
     sha256 = "7016dc02d15b8797b59a461ccc8d218f37c335b97fa6b376638c0edd4ffc9de2";
   };
 
-  buildInputs = [ pytestrunner h5py ];
-  checkInputs = [ pytest ];
+  nativeBuildInputs = [ pytestrunner ];
+  checkInputs = [ pytest h5py ];
   propagatedBuildInputs = [ numpy ];
 
+  checkPhase = ''
+    py.test
+  '';
+
   meta = with lib; {
-    description = "Manipulate jagged, chunky, and/or bitmasked arrays as easily as Numpy.";
+    description = "Manipulate jagged, chunky, and/or bitmasked arrays as easily as Numpy";
     homepage = https://github.com/scikit-hep/awkward-array;
     license = licenses.bsd3;
     maintainers = [ maintainers.costrouc ];

diff --git a/pkgs/development/python-modules/supervise_api/default.nix b/pkgs/development/python-modules/supervise_api/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, substituteAll
 , supervise
 , isPy3k
 , whichcraft
@@ -16,11 +17,18 @@ buildPythonPackage rec {
     sha256 = "1230f42294910e83421b7d3b08a968d27d510a4a709e966507ed70db5da1b9de";
   };
 
-  propagatedBuildInputs = [
-    supervise
-  ] ++ lib.optionals ( !isPy3k ) [
-    whichcraft
+  patches = [
+    (substituteAll {
+      src = ./supervise-path.patch;
+      inherit supervise;
+    })
   ];
+
+  # In the git repo, supervise_api lives inside a python subdir
+  patchFlags = [ "-p2" ];
+
+  propagatedBuildInputs = lib.optional (!isPy3k) whichcraft;
+
   checkInputs = [ utillinux ];
 
   meta = {

diff --git a/pkgs/development/python-modules/supervise_api/supervise-path.patch b/pkgs/development/python-modules/supervise_api/supervise-path.patch
@@ -0,0 +1,15 @@
+diff --git a/python/supervise_api/supervise.py b/python/supervise_api/supervise.py
+index 497d3ea..be57e35 100644
+--- a/python/supervise_api/supervise.py
++++ b/python/supervise_api/supervise.py
+@@ -41,9 +41,7 @@ try:
+ except:
+     from whichcraft import which
+
+-supervise_utility_location = which("supervise")
+-if not supervise_utility_location:
+-    raise FileNotFoundError(errno.ENOENT, "Executable not found in PATH", "supervise")
++supervise_utility_location = '@supervise@/bin/supervise'
+
+
+ def ignore_sigchld():
diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix
@@ -10,6 +10,8 @@
 , pytest
 , pkgconfig
 , lz4
+, mock
+, requests
 , backports_lzma
 }:
 
@@ -22,8 +24,8 @@ buildPythonPackage rec {
     sha256 = "1fafe476c26252e4dbd399456323778e76d23dc2f43cf6581a707d1647978610";
   };
 
-  buildInputs = [ pytestrunner ];
-  checkInputs = [ pytest pkgconfig lz4 ]
+  nativeBuildInputs = [ pytestrunner ];
+  checkInputs = [ pytest pkgconfig lz4 mock requests ]
     ++ lib.optionals (pythonOlder "3.3") [ backports_lzma ];
   propagatedBuildInputs = [ numpy cachetools uproot-methods awkward ];