diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-02-18 01:12:31 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-02-18 01:12:31 +0000 |
| commit | 50053cda79099c9a0b2a7803aef61f730a54848f (patch) | |
| tree | 6413bbed5cbdd3f58d26d54cbf1b37d54a8c3a22 /nixpkgs/pkgs/development/python-modules/numpy/default.nix | |
| parent | 7fbd32a525182f2089e1098723219a1a4ef264bb (diff) | |
| parent | 36f316007494c388df1fec434c1e658542e3c3cc (diff) | |
| download | nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.tar nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.tar.gz nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.tar.bz2 nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.tar.lz nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.tar.xz nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.tar.zst nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.zip | |
Merge commit '36f316007494c388df1fec434c1e658542e3c3cc'
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/numpy/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/python-modules/numpy/default.nix | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/numpy/default.nix b/nixpkgs/pkgs/development/python-modules/numpy/default.nix index d66cbd77bbc5..c9cd7f91833b 100644 --- a/nixpkgs/pkgs/development/python-modules/numpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/numpy/default.nix @@ -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 |