diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-06-30 13:44:37 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-06-30 13:44:37 +0000 |
commit | 16f676d6bbd4f930b0017ccb20cebe5a29e17545 (patch) | |
tree | 0d554b4f16bdef502035b743457fc29ffcc5e7f7 /nixpkgs/pkgs/development/python-modules/scipy/default.nix | |
parent | e7caacc4c122b7641bb66a4c2595289347a4996c (diff) | |
parent | 3a8d7958a610cd3fec3a6f424480f91a1b259185 (diff) | |
download | nixlib-16f676d6bbd4f930b0017ccb20cebe5a29e17545.tar nixlib-16f676d6bbd4f930b0017ccb20cebe5a29e17545.tar.gz nixlib-16f676d6bbd4f930b0017ccb20cebe5a29e17545.tar.bz2 nixlib-16f676d6bbd4f930b0017ccb20cebe5a29e17545.tar.lz nixlib-16f676d6bbd4f930b0017ccb20cebe5a29e17545.tar.xz nixlib-16f676d6bbd4f930b0017ccb20cebe5a29e17545.tar.zst nixlib-16f676d6bbd4f930b0017ccb20cebe5a29e17545.zip |
Merge commit '3a8d7958a610cd3fec3a6f424480f91a1b259185'
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/scipy/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/python-modules/scipy/default.nix | 23 |
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 ''; |