From 660e85a0d9a95373d0cc9610d3040cd8d3774df9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Jun 2015 21:28:51 +0200
Subject: [PATCH] Revert "ceph: Add development version"

This reverts commit 81f705e98c45ca4a3dfb7e5fe16e9b45ced74f0d.
---
 pkgs/tools/filesystems/ceph/dev.nix     | 14 +-------------
 pkgs/tools/filesystems/ceph/generic.nix | 13 +++----------
 2 files changed, 4 insertions(+), 23 deletions(-)
 mode change 100644 => 120000 pkgs/tools/filesystems/ceph/dev.nix

diff --git a/pkgs/tools/filesystems/ceph/dev.nix b/pkgs/tools/filesystems/ceph/dev.nix
deleted file mode 100644
index aec5d35b51a..00000000000
--- a/pkgs/tools/filesystems/ceph/dev.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ callPackage, fetchgit, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "9.0.0";
-
-  src = fetchgit {
-    url = "https://github.com/ceph/ceph.git";
-    rev = "refs/tags/v${version}";
-    sha256 = "07x5riqxh2mjcvlblv900vclgh8glnb464s6ssdcgkp31fk1gybg";
-  };
-
-  patches = [ ./fix-pgrefdebugging.patch ];
-})
diff --git a/pkgs/tools/filesystems/ceph/dev.nix b/pkgs/tools/filesystems/ceph/dev.nix
new file mode 120000
index 00000000000..31d5e95359c
--- /dev/null
+++ b/pkgs/tools/filesystems/ceph/dev.nix
@@ -0,0 +1 @@
+0.94.nix
\ No newline at end of file
diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
index 43cbb75de6f..9dbc85a3243 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -63,13 +63,13 @@ let
   hasRadosgw = optFcgi != null && optExpat != null && optCurl != null && optLibedit != null;
 
   hasXio = (stdenv.isLinux || stdenv.isFreeBSD) &&
-    versionAtLeast version "9.0.0" &&
+    versionAtLeast version "0.95" &&
     optAccelio != null && optLibibverbs != null && optLibrdmacm != null;
 
-  hasRocksdb = versionAtLeast version "9.0.0" && optRocksdb != null;
+  hasRocksdb = versionAtLeast version "0.95" && optRocksdb != null;
 
   # TODO: Reenable when kinetic support is fixed
-  #hasKinetic = versionAtLeast version "9.0.0" && optKinetic-cpp-client != null;
+  #hasKinetic = versionAtLeast version "0.95" && optKinetic-cpp-client != null;
   hasKinetic = false;
 
   # Malloc implementation (can be jemalloc, tcmalloc or null)
@@ -124,9 +124,6 @@ stdenv.mkDerivation {
 
     # Fix seagate kinetic linking
     sed -i 's,libcrypto.a,-lcrypto,g' src/os/Makefile.am
-  '' + optionalString (versionAtLeast version "9.0.0") ''
-    # Fix gmock
-    patchShebangs src/gmock
   '';
 
   preConfigure = ''
@@ -189,10 +186,6 @@ stdenv.mkDerivation {
     (mkWith   false                        "valgrind"          null)
   ];
 
-  preBuild = optionalString (versionAtLeast version "9.0.0") ''
-    (cd src/gmock; make -j $NIX_BUILD_CORES)
-  '';
-
   installFlags = [ "sysconfdir=\${out}/etc" ];
 
   outputs = [ "out" "lib" ];