public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ceph-git: 2015-07-29 -> 2015-07-31

Browse Source
This commit is contained in:
William A. Kennington III 2015-08-01 18:05:40 -07:00
parent dd41013dba
commit 1b20c87d1f
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/tools/filesystems/ceph/generic.nix
View File

@ -56,7 +56,7 @@ let
optLibatomic_ops = shouldUsePkg libatomic_ops; optLibatomic_ops = shouldUsePkg libatomic_ops;
optKinetic-cpp-client = shouldUsePkg kinetic-cpp-client; optKinetic-cpp-client = shouldUsePkg kinetic-cpp-client;
optRocksdb = shouldUsePkg rocksdb; optRocksdb = shouldUsePkg rocksdb;
optLibs3 = shouldUsePkg libs3; optLibs3 = if versionAtLeast version "10.0.0" then null else shouldUsePkg libs3;
optJemalloc = shouldUsePkg jemalloc; optJemalloc = shouldUsePkg jemalloc;
optGperftools = shouldUsePkg gperftools; optGperftools = shouldUsePkg gperftools;
@ -195,8 +195,6 @@ stdenv.mkDerivation {
(mkWith hasKinetic "kinetic" null) (mkWith hasKinetic "kinetic" null)
(mkWith hasRocksdb "librocksdb" null) (mkWith hasRocksdb "librocksdb" null)
(mkWith false "librocksdb-static" null) (mkWith false "librocksdb-static" null)
(mkWith (optLibs3 != null) "system-libs3" null)
(mkWith true "rest-bench" null)
] ++ optional stdenv.isLinux [ ] ++ optional stdenv.isLinux [
(mkWith (optLibaio != null) "libaio" null) (mkWith (optLibaio != null) "libaio" null)
(mkWith (optLibxfs != null) "libxfs" null) (mkWith (optLibxfs != null) "libxfs" null)
@ -207,6 +205,9 @@ stdenv.mkDerivation {
] ++ optional (versionAtLeast version "9.0.2") [ ] ++ optional (versionAtLeast version "9.0.2") [
(mkWith true "man-pages" null) (mkWith true "man-pages" null)
(mkWith true "systemd-libexec-dir" "\${TMPDIR}") (mkWith true "systemd-libexec-dir" "\${TMPDIR}")
] ++ optional (versionOlder version "10.0.0") [
(mkWith (optLibs3 != null) "system-libs3" null)
(mkWith true "rest-bench" null)
]; ];
preBuild = optionalString (versionAtLeast version "9.0.0") '' preBuild = optionalString (versionAtLeast version "9.0.0") ''

7
pkgs/tools/filesystems/ceph/git.nix
View File

@ -1,13 +1,12 @@
{ callPackage, fetchgit, ... } @ args: { callPackage, fetchgit, ... } @ args:
callPackage ./generic.nix (args // rec { callPackage ./generic.nix (args // rec {
version = "2015-07-29"; version = "2015-07-31";
src = fetchgit { src = fetchgit {
url = "git://github.com/ceph/ceph.git"; url = "git://github.com/ceph/ceph.git";
rev = "338ead0f498238fd1b5b7f18d86ad407de6f347b"; rev = "ef86e29259d0e863e62115926bf67287dc9a7e41";
leaveDotGit = true; sha256 = "14h387ngx3fmdm0b0sgl0l743j3d22gnp3lv68ah59yc4crfgdcx";
sha256 = "0ip62l4qkcmszbczwdnqhn93glnpgy0fhymf627x0vf49dgv3a6i";
}; };
patches = [ ./fix-pythonpath.patch ]; patches = [ ./fix-pythonpath.patch ];