From ff0e5a52095814c3b16ca6e941914d53a2c3ef9c Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 14 Jan 2019 16:26:58 -0600 Subject: [PATCH] numpy: 1.15.4 -> 1.16.0 https://mail.python.org/pipermail/numpy-discussion/2019-January/079130.html Remove musl workarounds/fixups since they don't apply, haven't investigated if they're still needed yet. --- .../development/python-modules/numpy/default.nix | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index d66cbd77bbc5..c9cd7f91833b 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/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