From 6d83b137345f435d2eb1822731a04b9524a19295 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 28 Aug 2015 17:49:03 -0700
Subject: [PATCH] ceph: 0.94.2 -> 0.94.3

---
 pkgs/tools/filesystems/ceph/0.94-pre.nix | 13 -------------
 pkgs/tools/filesystems/ceph/0.94.nix     |  9 +++------
 pkgs/top-level/all-packages.nix          |  1 -
 3 files changed, 3 insertions(+), 20 deletions(-)
 delete mode 100644 pkgs/tools/filesystems/ceph/0.94-pre.nix

diff --git a/pkgs/tools/filesystems/ceph/0.94-pre.nix b/pkgs/tools/filesystems/ceph/0.94-pre.nix
deleted file mode 100644
index fcf57526fd1c..000000000000
--- a/pkgs/tools/filesystems/ceph/0.94-pre.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ callPackage, fetchgit, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "0.94.3";
-
-  src = fetchgit {
-    url = "https://github.com/wkennington/ceph.git";
-    rev = "6218aa41e04533f0d6e62b5c7be591c2e99716ec";
-    sha256 = "0cyl5i1q6lap5a6vk8fjxfpikhxzwm9zkybg37nibahi2bwjr7rr";
-  };
-
-  patches = [ ./fix-pgrefdebugging.patch ];
-})
diff --git a/pkgs/tools/filesystems/ceph/0.94.nix b/pkgs/tools/filesystems/ceph/0.94.nix
index 4dca90e5f273..f564e28c5a3b 100644
--- a/pkgs/tools/filesystems/ceph/0.94.nix
+++ b/pkgs/tools/filesystems/ceph/0.94.nix
@@ -1,16 +1,13 @@
 { callPackage, fetchgit, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "0.94.2";
+  version = "0.94.3";
 
   src = fetchgit {
     url = "https://github.com/ceph/ceph.git";
     rev = "refs/tags/v${version}";
-    sha256 = "1nhqzmxv7bz93b8rbd88wgmw9icm2lhmc94dfscgh23kfpipyd6l";
+    sha256 = "020khb9978wayi4jnx7f9g1fzfg3r2xn9qw66snpd3k8w2dmycxy";
   };
 
-  patches = [
-    ./fix-pgrefdebugging.patch
-    ./boost-158.patch
-  ];
+  patches = [ ./fix-pgrefdebugging.patch ];
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bdbed02ef2d7..e1c50957d003 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1066,7 +1066,6 @@ 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-0_94-pre = callPackage ../tools/filesystems/ceph/0.94-pre.nix { };
   ceph = callPackage ../tools/filesystems/ceph { };
   ceph-dev = lowPrio (callPackage ../tools/filesystems/ceph/dev.nix { });
   ceph-git = lowPrio (callPackage ../tools/filesystems/ceph/git.nix { });