mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 23:03:40 +01:00
Merge pull request #53976 from dtzWill/update/numpy-1.16.0
pythonPackages.numpy: 1.15.4 -> 1.16.0
This commit is contained in:
commit
ad24183c62
1 changed files with 2 additions and 14 deletions
|
@ -16,12 +16,12 @@ let
|
|||
};
|
||||
in buildPythonPackage rec {
|
||||
pname = "numpy";
|
||||
version = "1.15.4";
|
||||
version = "1.16.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "3d734559db35aa3697dadcea492a423118c5c55d176da2f3be9c98d4803fc2a7";
|
||||
sha256 = "cb189bd98b2e7ac02df389b6212846ab20661f4bafe16b5a70a6f1728c1cc7cb";
|
||||
};
|
||||
|
||||
disabled = isPyPy;
|
||||
|
@ -35,18 +35,6 @@ in buildPythonPackage rec {
|
|||
./numpy-distutils-C++.patch
|
||||
];
|
||||
|
||||
postPatch = lib.optionalString stdenv.hostPlatform.isMusl ''
|
||||
# Use fenv.h
|
||||
sed -i \
|
||||
numpy/core/src/npymath/ieee754.c.src \
|
||||
numpy/core/include/numpy/ufuncobject.h \
|
||||
-e 's/__GLIBC__/__linux__/'
|
||||
# Don't use various complex trig functions
|
||||
substituteInPlace numpy/core/src/private/npy_config.h \
|
||||
--replace '#if defined(__GLIBC__)' "#if 1" \
|
||||
--replace '#if !__GLIBC_PREREQ(2, 18)' "#if 1"
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
sed -i 's/-faltivec//' numpy/distutils/system_info.py
|
||||
export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES
|
||||
|
|
Loading…
Reference in a new issue