cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #53976 from dtzWill/update/numpy-1.16.0

Browse source 
pythonPackages.numpy: 1.15.4 -> 1.16.0
This commit is contained in:
Will Dietz 2019-01-18 21:29:32 -06:00 committed by GitHub
commit ad24183c62
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkgs/development/python-modules/numpy/default.nix
View file

@ -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