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

python3Packages.numpy: proper fix for Werror misdetection bug

Browse Source
This commit is contained in:
Dmitry Kalinkin 2021-08-10 23:29:42 -04:00
parent 47da9ffbd3
commit 160c8d8886
No known key found for this signature in database
GPG Key ID: 5157B3EC8B2CA333
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,6 @@
{ lib { lib
, fetchPypi , fetchPypi
, fetchpatch
, python , python
, buildPythonPackage , buildPythonPackage
, gfortran , gfortran
@ -50,7 +51,13 @@ in buildPythonPackage rec {
sha256 = "1za22ggjxzm7drs2vd15s81ad9rlshk4p7pv7mxcbz4acdiszx6z"; sha256 = "1za22ggjxzm7drs2vd15s81ad9rlshk4p7pv7mxcbz4acdiszx6z";
}; };
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 # 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.
@ -73,10 +80,6 @@ in buildPythonPackage rec {
ln -s ${cfg} site.cfg ln -s ${cfg} site.cfg
''; '';
# Workaround flakey compiler feature detection
# https://github.com/numpy/numpy/issues/19624
hardeningDisable = [ "strictoverflow" ];
enableParallelBuilding = true; enableParallelBuilding = true;
checkInputs = [ checkInputs = [