diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-30 18:00:49 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-12-01 14:44:25 +0100 |
| commit | db417d32e81cd3d8e76a9e353ba6c1ff27f809c5 (patch) | |
| tree | 0d58e6e385538e0dc8827b4540768eec1a81e44b | |
| parent | 98a0342b78554ad8277f6e69e00a52683e324294 (diff) | |
python3Packages.numpy: fix compatibility with newer pytest
| -rw-r--r-- | pkgs/development/python-modules/numpy/default.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 118b6cd37785..51eeab3177e2 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -11,6 +11,7 @@ , isPyPy , cython , setuptoolsBuildHook +, fetchpatch }: assert (!blas.isILP64) && (!lapack.isILP64); @@ -51,7 +52,13 @@ in buildPythonPackage rec { 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. |