diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-01 21:28:45 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-04 14:54:50 +0200 |
| commit | 24390ab377e036b55e4331b6aed89a9d068d1b11 (patch) | |
| tree | b40f317c944349d90d8cf00be08611ac84a4ce9d /pkgs/tools/filesystems/ceph | |
| parent | 05f1457c1e7bfa376e949ac196db0b0412faaa85 (diff) | |
| download | nixlib-24390ab377e036b55e4331b6aed89a9d068d1b11.tar nixlib-24390ab377e036b55e4331b6aed89a9d068d1b11.tar.gz nixlib-24390ab377e036b55e4331b6aed89a9d068d1b11.tar.bz2 nixlib-24390ab377e036b55e4331b6aed89a9d068d1b11.tar.lz nixlib-24390ab377e036b55e4331b6aed89a9d068d1b11.tar.xz nixlib-24390ab377e036b55e4331b6aed89a9d068d1b11.tar.zst nixlib-24390ab377e036b55e4331b6aed89a9d068d1b11.zip | |
Revert "ceph: Update git"
This reverts commit 2154348ba0285b243a143114d87751ef744cfdc2.
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, 38 insertions, 40 deletions
diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix index 056440d4afef..43cbb75de6f0 100644 --- a/pkgs/tools/filesystems/ceph/generic.nix +++ b/pkgs/tools/filesystems/ceph/generic.nix @@ -98,8 +98,7 @@ stdenv.mkDerivation { ./0001-Makefile-env-Don-t-force-sbin.patch ]; - nativeBuildInputs = [ autoconf automake makeWrapper pkgconfig libtool which ] - ++ optionals (versionAtLeast version "10.0.0") [ pythonPackages.setuptools ]; + nativeBuildInputs = [ autoconf automake makeWrapper pkgconfig libtool which ]; buildInputs = buildInputs ++ cryptoLibsMap.${cryptoStr} ++ [ boost python libxml2 optYasm optLibatomic_ops optLibs3 malloc pythonPackages.flask zlib ] ++ optional (versionAtLeast version "9.0.0") [ @@ -152,43 +151,42 @@ 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 "systemd-libexec-dir" "\${TMPDIR}") + (mkWith true "man-pages" null) + (mkWith false "tcmalloc-minimal" null) + (mkWith false "valgrind" null) ]; preBuild = optionalString (versionAtLeast version "9.0.0") '' diff --git a/pkgs/tools/filesystems/ceph/git.nix b/pkgs/tools/filesystems/ceph/git.nix index c964548b65e4..8aa4bbd34bb7 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-05-29"; + version = "2015-04-22"; src = fetchgit { url = "git://github.com/ceph/ceph.git"; - rev = "64096b870960d021ab5001b6a5cf3a999a9abeb7"; - sha256 = "18lcn4misyvgjh7r0vkal480x23yr8pcjwzl4k4hbrpqmm97znp9"; + rev = "89262abc53e324f3ef4d504473a4f1d6eb337c20"; + sha256 = "0d6hlk1nwgx9cdhvppggz6sbjc1jl8j26l9739qspw1sviac5lcb"; }; }) |