diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-11-22 16:38:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-22 16:38:19 +0100 |
| commit | ff77d0dbb25e7617d4a7531e567a5d5c9c338055 (patch) | |
| tree | 3e59a154fa85629e898f3c69036ad80a84ca78d9 /pkgs/development/python-modules/numpy | |
| parent | 93e835bd92f18bbdb13ef4f3cb1cc64f1415bffb (diff) | |
| parent | 160c8d88867dfe95ec75fb6133d1768c014226d7 (diff) | |
| download | nixpkgs-ff77d0dbb25e7617d4a7531e567a5d5c9c338055.tar nixpkgs-ff77d0dbb25e7617d4a7531e567a5d5c9c338055.tar.gz nixpkgs-ff77d0dbb25e7617d4a7531e567a5d5c9c338055.tar.bz2 nixpkgs-ff77d0dbb25e7617d4a7531e567a5d5c9c338055.tar.lz nixpkgs-ff77d0dbb25e7617d4a7531e567a5d5c9c338055.tar.xz nixpkgs-ff77d0dbb25e7617d4a7531e567a5d5c9c338055.tar.zst nixpkgs-ff77d0dbb25e7617d4a7531e567a5d5c9c338055.zip | |
Merge pull request #133446 from veprbl/pr/numpy_werror_fix
Diffstat (limited to 'pkgs/development/python-modules/numpy')
| -rw-r--r-- | pkgs/development/python-modules/numpy/default.nix | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 6119ee38422..ce75f42c20c 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -1,5 +1,6 @@ { lib , fetchPypi +, fetchpatch , python , buildPythonPackage , gfortran @@ -49,7 +50,13 @@ in buildPythonPackage rec { sha256 = "423216d8afc5923b15df86037c6053bf030d15cc9e3224206ef868c2d63dd6dc"; }; - patches = lib.optionals python.hasDistutilsCxxPatch [ + patches = [ + # fix https://github.com/numpy/numpy/issues/19624 + (fetchpatch { + url = "https://github.com/numpy/numpy/commit/ae279066d6bd253e8675428fac8946938b8d48d9.diff"; + sha256 = "sha256-q8SoF/pMzLI4zYCx2YAZzR31cARlZXerNnBSevBO5pE="; + }) + ] ++ 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. @@ -72,10 +79,6 @@ in buildPythonPackage rec { ln -s ${cfg} site.cfg ''; - # Workaround flakey compiler feature detection - # https://github.com/numpy/numpy/issues/19624 - hardeningDisable = [ "strictoverflow" ]; - enableParallelBuilding = true; checkInputs = [ |