diff options
Diffstat (limited to 'pkgs/development/python-modules/numpy')
-rw-r--r-- | pkgs/development/python-modules/numpy/default.nix | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 87428f4563d9..5710c9cc7a4e 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -1,13 +1,27 @@ -{ stdenv, lib, fetchPypi, python, buildPythonPackage, isPyPy, gfortran, pytest, blas }: +{ stdenv, lib, fetchPypi, python, buildPythonPackage, isPyPy, gfortran, pytest, blas, writeTextFile }: -buildPythonPackage rec { +let + blasImplementation = lib.nameFromURL blas.name "-"; + cfg = writeTextFile { + name = "site.cfg"; + text = (lib.generators.toINI {} { + "${blasImplementation}" = { + include_dirs = "${blas}/include"; + library_dirs = "${blas}/lib"; + } // lib.optionalAttrs (blasImplementation == "mkl") { + mkl_libs = "mkl_rt"; + lapack_libs = ""; + }; + }); + }; +in buildPythonPackage rec { pname = "numpy"; - version = "1.15.2"; + version = "1.15.3"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "27a0d018f608a3fe34ac5e2b876f4c23c47e38295c47dd0775cc294cd2614bc1"; + sha256 = "1c0c80e74759fa4942298044274f2c11b08c86230b25b8b819e55e644f5ff2b6"; }; disabled = isPyPy; @@ -39,12 +53,7 @@ buildPythonPackage rec { ''; preBuild = '' - echo "Creating site.cfg file..." - cat << EOF > site.cfg - [openblas] - include_dirs = ${blas}/include - library_dirs = ${blas}/lib - EOF + ln -s ${cfg} site.cfg ''; enableParallelBuilding = true; @@ -59,8 +68,11 @@ buildPythonPackage rec { passthru = { blas = blas; + inherit blasImplementation cfg; }; + doCheck = blasImplementation != "mkl"; + # Disable two tests # - test_f2py: f2py isn't yet on path. # - test_large_file_support: takes a long time and can cause the machine to run out of disk space |