Revert "ceph: Add development version"
This reverts commit 81f705e98c45ca4a3dfb7e5fe16e9b45ced74f0d.
This commit is contained in:
parent
24390ab377
commit
660e85a0d9
@ -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 ];
|
||||
})
|
1
pkgs/tools/filesystems/ceph/dev.nix
Symbolic link
1
pkgs/tools/filesystems/ceph/dev.nix
Symbolic link
@ -0,0 +1 @@
|
||||
0.94.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" ];
|
||||
|
Loading…
x
Reference in New Issue
Block a user