From 7994b9405793abb0aa7930761797ed956cf817c5 Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Thu, 9 Jul 2020 09:28:46 +0200 Subject: [PATCH] pythonPackages.scipy_1_3: re-init for ceph --- pkgs/tools/filesystems/ceph/default.nix | 5 ++++- pkgs/top-level/python-packages.nix | 9 +++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index cd0e18eb748..767730c4030 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -112,7 +112,10 @@ let ps.pyjwt ps.webob ps.bcrypt - ps.scipy + # scipy > 1.3 breaks diskprediction_local, leading to mgr hang on startup + # Bump (and get rid of scipy_1_3) once these issues are resolved: + # https://tracker.ceph.com/issues/42764 https://tracker.ceph.com/issues/45147 + ps.scipy_1_3 ps.six ps.pyyaml ]); diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4340f6a30ee..9a6b0338168 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5902,6 +5902,15 @@ in { }); in if pythonOlder "3.5" then scipy_1_2 else scipy_; + scipy_1_3 = self.scipy.overridePythonAttrs(oldAttrs: rec { + version = "1.3.3"; + src = oldAttrs.src.override { + inherit version; + sha256 = "02iqb7ws7fw5fd1a83hx705pzrw1imj7z0bphjsl4bfvw254xgv4"; + }; + doCheck = false; + }); + scikitimage = callPackage ../development/python-modules/scikit-image { }; scikitlearn = let