public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

python3Packages.numpy: fix compatibility with newer pytest

This commit is contained in:
Frederik Rietdijk 2020-11-30 18:00:49 +01:00
parent 98a0342b78
commit db417d32e8
1 changed files with 8 additions and 1 deletions
pkgs/development/python-modules/numpy
default.nix

9
pkgs/development/python-modules/numpy/default.nix
View File

@ -11,6 +11,7 @@
, isPyPy , isPyPy
, cython , cython
, setuptoolsBuildHook , setuptoolsBuildHook
, fetchpatch
}: }:
assert (!blas.isILP64) && (!lapack.isILP64); assert (!blas.isILP64) && (!lapack.isILP64);
@ -51,7 +52,13 @@ in buildPythonPackage rec {
nativeBuildInputs = [ gfortran cython setuptoolsBuildHook ]; nativeBuildInputs = [ gfortran cython setuptoolsBuildHook ];
buildInputs = [ blas lapack ]; buildInputs = [ blas lapack ];
patches = lib.optionals python.hasDistutilsCxxPatch [ patches = [
# For compatibility with newer pytest
(fetchpatch {
url = "https://github.com/numpy/numpy/commit/ba315034759fbf91c61bb55390edc86e7b2627f3.patch";
sha256 = "F2P5q61CyhqsZfwkLmxb7A9YdE+43FXLbQkSjop2rVY=";
})
] ++ lib.optionals python.hasDistutilsCxxPatch [
# We patch cpython/distutils to fix https://bugs.python.org/issue1222585 # We patch cpython/distutils to fix https://bugs.python.org/issue1222585
# Patching of numpy.distutils is needed to prevent it from undoing the # Patching of numpy.distutils is needed to prevent it from undoing the
# patch to distutils. # patch to distutils.