From 4699438d876a9db7497c73fbcc04de002f0f9b9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Thu, 9 Dec 2021 02:14:51 +0000
Subject: [PATCH 1/2] ceph: Remove obsolete scipy override.

The mentioned bugs have merged linked pull requests a long time ago:

* https://github.com/ceph/ceph/commit/b9dea87ff1d39d0b9ba2ab469852b78aaa49529b
  in Ceph v15.1.0
* https://github.com/ceph/ceph/commit/f701ed8b261b5414a4b3c8e12b11f9fbdafecd7a
  in Ceph v16.1.0

(cherry picked from commit c6cb7badab8353e84a716710cdc777fb069209fe)
---
 pkgs/tools/filesystems/ceph/default.nix | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix
index 913367084ed2..2c5b731285e4 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

From 54cd463a820d353c7bdf86ab4147d2d5608989d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Thu, 9 Dec 2021 02:17:04 +0000
Subject: [PATCH 2/2] ceph: 16.2.6 -> 16.2.7. Fixes data-loss upgrade bug.

See https://ceph.io/en/news/blog/2021/v16-2-7-pacific-released/

(cherry picked from commit a9bdcf8a821658fd3e8ad0a19d45c5367c1d5e79)
---
 pkgs/tools/filesystems/ceph/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix
index 2c5b731285e4..5975b30ac143 100644
--- a/pkgs/tools/filesystems/ceph/default.nix
+++ b/pkgs/tools/filesystems/ceph/default.nix
@@ -132,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 {