From 55d82d54307e9c30ef34342e68ef615e4350b0a0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 27 Jul 2019 11:34:47 +0200 Subject: [PATCH] python: numpy: 1.16.4 -> 1.17.0 --- pkgs/development/python-modules/numpy/default.nix | 4 ++-- pkgs/top-level/python-packages.nix | 15 ++++++++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index a66694dc477b..10a1df8876cb 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.16.4"; + version = "1.17.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "7242be12a58fec245ee9734e625964b97cf7e3f2f7d016603f9e56660ce479c7"; + sha256 = "951fefe2fb73f84c620bec4e001e80a80ddaa1b84dce244ded7f1e0cbe0ed34a"; }; nativeBuildInputs = [ gfortran pytest ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8796bde83b89..d34aae045293 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3840,9 +3840,18 @@ in { Nuitka = callPackage ../development/python-modules/nuitka { }; - numpy = callPackage ../development/python-modules/numpy { - blas = pkgs.openblasCompat; - }; + numpy = let + numpy_ = callPackage ../development/python-modules/numpy { + blas = pkgs.openblasCompat; + }; + numpy_2 = numpy_.overridePythonAttrs(oldAttrs: rec { + version = "1.16.4"; + src = oldAttrs.src.override { + inherit version; + sha256 = "1ivrwh66cmly7xh1dl7pybizfz5rcicn4kkkx5g29v4gll9bwhkj"; + }; + }); + in if pythonOlder "3.5" then numpy_2 else numpy_; numpydoc = callPackage ../development/python-modules/numpydoc { };