diff options
Diffstat (limited to 'pkgs/development/python-modules/numpy/default.nix')
| -rw-r--r-- | pkgs/development/python-modules/numpy/default.nix | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 622f784fb8ba9..51eeab3177e20 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -4,13 +4,14 @@ , buildPythonPackage , gfortran , hypothesis -, pytest +, pytest_5 , blas , lapack , writeTextFile , isPyPy , cython , setuptoolsBuildHook +, fetchpatch }: assert (!blas.isILP64) && (!lapack.isILP64); @@ -48,10 +49,16 @@ in buildPythonPackage rec { sha256 = "141ec3a3300ab89c7f2b0775289954d193cc8edb621ea05f99db9cb181530512"; }; - nativeBuildInputs = [ gfortran pytest cython setuptoolsBuildHook ]; + nativeBuildInputs = [ gfortran cython setuptoolsBuildHook ]; 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 # Patching of numpy.distutils is needed to prevent it from undoing the # patch to distutils. @@ -75,7 +82,10 @@ in buildPythonPackage rec { doCheck = !isPyPy; # numpy 1.16+ hits a bug in pypy's ctypes, using either numpy or pypy HEAD fixes this (https://github.com/numpy/numpy/issues/13807) - checkInputs = [ hypothesis ]; + checkInputs = [ + pytest_5 # pytest 6 will error: "module is already imported: hypothesis" + hypothesis + ]; checkPhase = '' runHook preCheck |