diff options
| author | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2016-10-31 15:16:29 +0000 |
|---|---|---|
| committer | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2016-10-31 15:16:29 +0000 |
| commit | 59b5bbeae91109007e36a269a94cccc865dc5175 (patch) | |
| tree | 1ee3d18aedace6d66034ea72fea571d20d8d0fee /pkgs/development/python-modules/numpy.nix | |
| parent | Do not use old stdenv version in faust wrap functions. (-8 alias, -15 unpatch... (diff) | |
| parent | Merge pull request #19675 from edwtjo/dictd-touchup (diff) | |
| download | nixpkgs-origin/security-updates.tar.gz | |
Merge branch master into security-updatesorigin/security-updatesgitlab.intr/security-updates
This merge mostly take the changes made to the master branch.
Some conflict happen in top-level/default.nix due to a reformating of the
code of which is computing the fix-point. This merge fixes these issues by
adding the pkgsIndex argument, needed to re-evaluate the fix-point with
another set of packages, and also re-add the second fix-point made to
support the dependencies.
Diffstat (limited to 'pkgs/development/python-modules/numpy.nix')
| -rw-r--r-- | pkgs/development/python-modules/numpy.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/development/python-modules/numpy.nix b/pkgs/development/python-modules/numpy.nix index 141c8b14fa6d..14504d925438 100644 --- a/pkgs/development/python-modules/numpy.nix +++ b/pkgs/development/python-modules/numpy.nix @@ -1,4 +1,4 @@ -{lib, python, buildPythonPackage, isPyPy, gfortran, nose, blas}: +{lib, python, buildPythonPackage, isPy27, isPyPy, gfortran, nose, blas}: args: @@ -12,6 +12,12 @@ in buildPythonPackage (args // rec { buildInputs = args.buildInputs or [ gfortran nose ]; propagatedBuildInputs = args.propagatedBuildInputs or [ passthru.blas ]; + patches = lib.optionals (python.hasDistutilsCxxPatch or false) [ + # See cpython 2.7 patches. + # numpy.distutils is used by cython during it's check phase + ./numpy-distutils-C++.patch + ]; + preConfigure = '' sed -i 's/-faltivec//' numpy/distutils/system_info.py ''; |