diff options
author | Sarah Brofeldt <sbrofeldt@gmail.com> | 2021-12-09 07:46:37 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-09 07:46:37 +0100 |
commit | 600442421b3e79d676de80d38a687e19f1950693 (patch) | |
tree | 8cfdf51e4a2c7fc5c7338dc78d8bdbf42417ccd4 | |
parent | 273018e39a8705582355ee9066fdfb2a6fb82226 (diff) | |
parent | a9bdcf8a821658fd3e8ad0a19d45c5367c1d5e79 (diff) |
Merge pull request #149766 from nh2/ceph-16.2.7
ceph: 16.2.6 -> 16.2.7
-rw-r--r-- | pkgs/tools/filesystems/ceph/default.nix | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 913367084ed25..5975b30ac1439 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -104,21 +104,7 @@ let meta = getMeta "Ceph common module for code shared by manager modules"; }; - python = python3.override { - packageOverrides = self: super: { - # scipy > 1.3 breaks diskprediction_local, leading to mgr hang on startup - # Bump once these issues are resolved: - # https://tracker.ceph.com/issues/42764 https://tracker.ceph.com/issues/45147 - scipy = super.scipy.overridePythonAttrs (oldAttrs: rec { - version = "1.3.3"; - src = oldAttrs.src.override { - inherit version; - sha256 = "02iqb7ws7fw5fd1a83hx705pzrw1imj7z0bphjsl4bfvw254xgv4"; - }; - doCheck = false; - }); - }; - }; + python = python3; ceph-python-env = python.withPackages (ps: [ ps.sphinx @@ -146,10 +132,10 @@ let ]); sitePackages = ceph-python-env.python.sitePackages; - version = "16.2.6"; + version = "16.2.7"; src = fetchurl { url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz"; - sha256 = "sha256-TXGyZnyVTYAf7G7BcTv3dAfK/54JfOKObcyTRhCrnYA="; + sha256 = "0n7vpdcxji49bqaa5b7zxif1r80rrkbh0dfacbibvf20kzzbn2fz"; }; in rec { ceph = stdenv.mkDerivation { |