about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/python-modules/scipy/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/scipy/default.nix')
-rw-r--r--nixpkgs/pkgs/development/python-modules/scipy/default.nix23
1 files changed, 8 insertions, 15 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/scipy/default.nix b/nixpkgs/pkgs/development/python-modules/scipy/default.nix
index 0bc8499a373b..19fa8e507281 100644
--- a/nixpkgs/pkgs/development/python-modules/scipy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/scipy/default.nix
@@ -1,24 +1,17 @@
-{lib, fetchPypi, python, buildPythonPackage, gfortran, nose, pytest, numpy, pybind11}:
-
-let
-  pybind = pybind11.overridePythonAttrs(oldAttrs: {
-    cmakeFlags = oldAttrs.cmakeFlags ++ [
-      "-DPYBIND11_TEST=off"
-    ];
-    doCheck = false; # Circular test dependency
-  });
-in buildPythonPackage rec {
+{lib, fetchPypi, python, buildPythonPackage, gfortran, nose, pytest, pytest-xdist, numpy, pybind11 }:
+
+buildPythonPackage rec {
   pname = "scipy";
-  version = "1.6.1";
+  version = "1.6.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "048vd4c843xaq45yk3kn491gvqnvhp2i9rxhg671ddlh923fpz64";
+    sha256 = "a75b014d3294fce26852a9d04ea27b5671d86736beb34acdfc05859246260707";
   };
 
-  checkInputs = [ nose pytest ];
+  checkInputs = [ nose pytest pytest-xdist ];
   nativeBuildInputs = [ gfortran ];
-  buildInputs = [ numpy.blas pybind ];
+  buildInputs = [ numpy.blas pybind11 ];
   propagatedBuildInputs = [ numpy ];
 
   # Remove tests because of broken wrapper
@@ -40,7 +33,7 @@ in buildPythonPackage rec {
   checkPhase = ''
     runHook preCheck
     pushd dist
-    ${python.interpreter} -c 'import scipy; scipy.test("fast", verbose=10)'
+    ${python.interpreter} -c "import scipy; scipy.test('fast', verbose=10, parallel=$NIX_BUILD_CORES)"
     popd
     runHook postCheck
   '';