From 452f1736d509b0896cf6e91e641b6b664097e8a6 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 5 Nov 2015 18:22:36 -0800
Subject: [PATCH] ceph: Major Update 0.94.4 -> 9.2.0

---
 .../filesystems/ceph/9.0.3-i686-fix.patch     | 25 -------------------
 pkgs/tools/filesystems/ceph/9.nix             | 13 ++++++++++
 pkgs/tools/filesystems/ceph/default.nix       | 14 ++++++++++-
 pkgs/tools/filesystems/ceph/dev.nix           | 14 +----------
 pkgs/top-level/all-packages.nix               |  1 +
 5 files changed, 28 insertions(+), 39 deletions(-)
 delete mode 100644 pkgs/tools/filesystems/ceph/9.0.3-i686-fix.patch
 create mode 100644 pkgs/tools/filesystems/ceph/9.nix
 mode change 120000 => 100644 pkgs/tools/filesystems/ceph/default.nix
 mode change 100644 => 120000 pkgs/tools/filesystems/ceph/dev.nix

diff --git a/pkgs/tools/filesystems/ceph/9.0.3-i686-fix.patch b/pkgs/tools/filesystems/ceph/9.0.3-i686-fix.patch
deleted file mode 100644
index 142bcabec54..00000000000
--- a/pkgs/tools/filesystems/ceph/9.0.3-i686-fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 1213dde3d207d0d91ccecfca4dd6af1bdee0ed65 Mon Sep 17 00:00:00 2001
-From: Kefu Chai <kchai@redhat.com>
-Date: Fri, 17 Jul 2015 01:12:03 +0800
-Subject: [PATCH] cls: fix the build on i386
-
-this is a leftover of 0dae022
-
-Signed-off-by: Kefu Chai <kchai@redhat.com>
----
- src/cls/cephfs/cls_cephfs.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/cls/cephfs/cls_cephfs.h b/src/cls/cephfs/cls_cephfs.h
-index 3cee0db..d4a5f23 100644
---- a/src/cls/cephfs/cls_cephfs.h
-+++ b/src/cls/cephfs/cls_cephfs.h
-@@ -118,7 +118,7 @@ class AccumulateResult
-   // Largest object seen
-   uint64_t max_obj_size;
-   // Highest mtime seen
--  time_t   max_mtime;
-+  int64_t   max_mtime;
- 
-   AccumulateResult()
-     : ceiling_obj_index(0), ceiling_obj_size(0), max_obj_size(0), max_mtime(0)
diff --git a/pkgs/tools/filesystems/ceph/9.nix b/pkgs/tools/filesystems/ceph/9.nix
new file mode 100644
index 00000000000..f3d15a252cb
--- /dev/null
+++ b/pkgs/tools/filesystems/ceph/9.nix
@@ -0,0 +1,13 @@
+{ callPackage, fetchgit, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "9.2.0";
+
+  src = fetchgit {
+    url = "https://github.com/ceph/ceph.git";
+    rev = "refs/tags/v${version}";
+    sha256 = "1f8z0dxl945370ifz2ila9bc55d81h41bmdq241y9z4pvaynl6pa";
+  };
+
+  patches = [ ./fix-pythonpath.patch ];
+})
diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix
deleted file mode 120000
index 31d5e95359c..00000000000
--- a/pkgs/tools/filesystems/ceph/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-0.94.nix
\ No newline at end of file
diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix
new file mode 100644
index 00000000000..a82867e59a2
--- /dev/null
+++ b/pkgs/tools/filesystems/ceph/default.nix
@@ -0,0 +1,13 @@
+{ callPackage, fetchgit, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "9.2.0";
+
+  src = fetchgit {
+    url = "https://github.com/ceph/ceph.git";
+    rev = "refs/tags/v${version}";
+    sha256 = "1lcal0jbpnm6y91s2v0g2zdnq7q0i5ql4bky294cz7g011di12vc";
+  };
+
+  patches = [ ./fix-pythonpath.patch ];
+})
diff --git a/pkgs/tools/filesystems/ceph/dev.nix b/pkgs/tools/filesystems/ceph/dev.nix
deleted file mode 100644
index d092b4057e5..00000000000
--- a/pkgs/tools/filesystems/ceph/dev.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ callPackage, fetchgit, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "9.1.0";
-
-  src = fetchgit {
-    url = "https://github.com/ceph/ceph.git";
-    rev = "refs/tags/v${version}";
-    sha256 = "1f8z0dxl945370ifz2ila9bc55d81h41bmdq241y9z4pvaynl6pz";
-  };
-
-  patches = [ ./fix-pythonpath.patch ];
-})
diff --git a/pkgs/tools/filesystems/ceph/dev.nix b/pkgs/tools/filesystems/ceph/dev.nix
new file mode 120000
index 00000000000..0f6f2dfda1d
--- /dev/null
+++ b/pkgs/tools/filesystems/ceph/dev.nix
@@ -0,0 +1 @@
+9.nix
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 179550afb96..3e3bcd807cc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1027,6 +1027,7 @@ let
   libceph = ceph.lib;
   ceph-0_80 = callPackage ../tools/filesystems/ceph/0.80.nix { };
   ceph-0_94 = callPackage ../tools/filesystems/ceph/0.94.nix { };
+  ceph-9 = callPackage ../tools/filesystems/ceph/9.nix { };
   ceph = callPackage ../tools/filesystems/ceph { };
   ceph-dev = lowPrio (callPackage ../tools/filesystems/ceph/dev.nix { });
   ceph-git = lowPrio (callPackage ../tools/filesystems/ceph/git.nix { });