diff options
author | William A. Kennington III <william@wkennington.com> | 2015-05-29 15:56:28 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-05-29 20:50:12 -0700 |
commit | 2154348ba0285b243a143114d87751ef744cfdc2 (patch) | |
tree | 6fcd5fe67174024b388e68fa451ab2f6d231d84e /pkgs/tools/filesystems/ceph | |
parent | 81f705e98c45ca4a3dfb7e5fe16e9b45ced74f0d (diff) | |
download | nixlib-2154348ba0285b243a143114d87751ef744cfdc2.tar nixlib-2154348ba0285b243a143114d87751ef744cfdc2.tar.gz nixlib-2154348ba0285b243a143114d87751ef744cfdc2.tar.bz2 nixlib-2154348ba0285b243a143114d87751ef744cfdc2.tar.lz nixlib-2154348ba0285b243a143114d87751ef744cfdc2.tar.xz nixlib-2154348ba0285b243a143114d87751ef744cfdc2.tar.zst nixlib-2154348ba0285b243a143114d87751ef744cfdc2.zip |
ceph: Update git
Diffstat (limited to 'pkgs/tools/filesystems/ceph')
-rw-r--r-- | pkgs/tools/filesystems/ceph/generic.nix | 72 | ||||
-rw-r--r-- | pkgs/tools/filesystems/ceph/git.nix | 6 |
2 files changed, 40 insertions, 38 deletions
diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix index 43cbb75de6f0..056440d4afef 100644 --- a/pkgs/tools/filesystems/ceph/generic.nix +++ b/pkgs/tools/filesystems/ceph/generic.nix @@ -98,7 +98,8 @@ stdenv.mkDerivation { ./0001-Makefile-env-Don-t-force-sbin.patch ]; - nativeBuildInputs = [ autoconf automake makeWrapper pkgconfig libtool which ]; + nativeBuildInputs = [ autoconf automake makeWrapper pkgconfig libtool which ] + ++ optionals (versionAtLeast version "10.0.0") [ pythonPackages.setuptools ]; buildInputs = buildInputs ++ cryptoLibsMap.${cryptoStr} ++ [ boost python libxml2 optYasm optLibatomic_ops optLibs3 malloc pythonPackages.flask zlib ] ++ optional (versionAtLeast version "9.0.0") [ @@ -151,42 +152,43 @@ stdenv.mkDerivation { "--libdir=\${lib}/lib" "--includedir=\${lib}/include" - (mkWith true "rbd" null) - (mkWith true "cephfs" null) - (mkWith hasRadosgw "radosgw" null) - (mkWith true "radosstriper" null) - (mkWith hasServer "mon" null) - (mkWith hasServer "osd" null) - (mkWith hasServer "mds" null) - (mkEnable true "client" null) - (mkEnable hasServer "server" null) - (mkWith (cryptoStr == "cryptopp") "cryptopp" null) - (mkWith (cryptoStr == "nss") "nss" null) - (mkEnable false "root-make-check" null) - (mkWith false "profiler" null) - (mkWith false "debug" null) - (mkEnable false "coverage" null) - (mkWith (optFuse != null) "fuse" null) - (mkWith (malloc == optJemalloc) "jemalloc" null) - (mkWith (malloc == optGperftools) "tcmalloc" null) - (mkEnable false "pgrefdebugging" null) - (mkEnable false "cephfs-java" null) - (mkEnable hasXio "xio" null) - (mkWith (optLibatomic_ops != null) "libatomic-ops" null) - (mkWith true "ocf" null) - (mkWith hasKinetic "kinetic" null) - (mkWith hasRocksdb "librocksdb" null) - (mkWith false "librocksdb-static" null) - (mkWith (optLibs3 != null) "system-libs3" null) - (mkWith true "rest-bench" null) + (mkWith true "rbd" null) + (mkWith true "cephfs" null) + (mkWith hasRadosgw "radosgw" null) + (mkWith true "radosstriper" null) + (mkWith hasServer "mon" null) + (mkWith hasServer "osd" null) + (mkWith hasServer "mds" null) + (mkEnable true "client" null) + (mkEnable hasServer "server" null) + (mkWith (cryptoStr == "cryptopp") "cryptopp" null) + (mkWith (cryptoStr == "nss") "nss" null) + (mkEnable false "root-make-check" null) + (mkWith false "profiler" null) + (mkWith false "debug" null) + (mkEnable false "coverage" null) + (mkWith (optFuse != null) "fuse" null) + (mkWith (malloc == optJemalloc) "jemalloc" null) + (mkWith (malloc == optGperftools) "tcmalloc" null) + (mkEnable false "pgrefdebugging" null) + (mkEnable false "cephfs-java" null) + (mkEnable hasXio "xio" null) + (mkWith (optLibatomic_ops != null) "libatomic-ops" null) + (mkWith true "ocf" null) + (mkWith hasKinetic "kinetic" null) + (mkWith hasRocksdb "librocksdb" null) + (mkWith false "librocksdb-static" null) + (mkWith (optLibs3 != null) "system-libs3" null) + (mkWith true "rest-bench" null) ] ++ optional stdenv.isLinux [ - (mkWith (optLibaio != null) "libaio" null) - (mkWith (optLibxfs != null) "libxfs" null) - (mkWith (optZfs != null) "libzfs" null) + (mkWith (optLibaio != null) "libaio" null) + (mkWith (optLibxfs != null) "libxfs" null) + (mkWith (optZfs != null) "libzfs" null) ] ++ optional (versionAtLeast version "10.0.0") [ - (mkWith true "man-pages" null) - (mkWith false "tcmalloc-minimal" null) - (mkWith false "valgrind" null) + (mkWith true "man-pages" null) + (mkWith false "tcmalloc-minimal" null) + (mkWith false "valgrind" null) + (mkWith true "systemd-libexec-dir" "\${TMPDIR}") ]; preBuild = optionalString (versionAtLeast version "9.0.0") '' diff --git a/pkgs/tools/filesystems/ceph/git.nix b/pkgs/tools/filesystems/ceph/git.nix index 8aa4bbd34bb7..c964548b65e4 100644 --- a/pkgs/tools/filesystems/ceph/git.nix +++ b/pkgs/tools/filesystems/ceph/git.nix @@ -1,11 +1,11 @@ { callPackage, fetchgit, git, ... } @ args: callPackage ./generic.nix (args // rec { - version = "2015-04-22"; + version = "2015-05-29"; src = fetchgit { url = "git://github.com/ceph/ceph.git"; - rev = "89262abc53e324f3ef4d504473a4f1d6eb337c20"; - sha256 = "0d6hlk1nwgx9cdhvppggz6sbjc1jl8j26l9739qspw1sviac5lcb"; + rev = "64096b870960d021ab5001b6a5cf3a999a9abeb7"; + sha256 = "18lcn4misyvgjh7r0vkal480x23yr8pcjwzl4k4hbrpqmm97znp9"; }; }) |