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

Revert "ceph: Update git"

Browse Source 
This reverts commit 2154348ba0285b243a143114d87751ef744cfdc2.
This commit is contained in:
Eelco Dolstra 2015-06-01 21:28:45 +02:00
parent 05f1457c1e
commit 24390ab377
2 changed files with 38 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -98,8 +98,7 @@ stdenv.mkDerivation {
./0001-Makefile-env-Don-t-force-sbin.patch ./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} ++ [ buildInputs = buildInputs ++ cryptoLibsMap.${cryptoStr} ++ [
boost python libxml2 optYasm optLibatomic_ops optLibs3 malloc pythonPackages.flask zlib boost python libxml2 optYasm optLibatomic_ops optLibs3 malloc pythonPackages.flask zlib
] ++ optional (versionAtLeast version "9.0.0") [ ] ++ optional (versionAtLeast version "9.0.0") [
@ -152,43 +151,42 @@ stdenv.mkDerivation {
"--libdir=\${lib}/lib" "--libdir=\${lib}/lib"
"--includedir=\${lib}/include" "--includedir=\${lib}/include"
(mkWith true "rbd" null) (mkWith true "rbd" null)
(mkWith true "cephfs" null) (mkWith true "cephfs" null)
(mkWith hasRadosgw "radosgw" null) (mkWith hasRadosgw "radosgw" null)
(mkWith true "radosstriper" null) (mkWith true "radosstriper" null)
(mkWith hasServer "mon" null) (mkWith hasServer "mon" null)
(mkWith hasServer "osd" null) (mkWith hasServer "osd" null)
(mkWith hasServer "mds" null) (mkWith hasServer "mds" null)
(mkEnable true "client" null) (mkEnable true "client" null)
(mkEnable hasServer "server" null) (mkEnable hasServer "server" null)
(mkWith (cryptoStr == "cryptopp") "cryptopp" null) (mkWith (cryptoStr == "cryptopp") "cryptopp" null)
(mkWith (cryptoStr == "nss") "nss" null) (mkWith (cryptoStr == "nss") "nss" null)
(mkEnable false "root-make-check" null) (mkEnable false "root-make-check" null)
(mkWith false "profiler" null) (mkWith false "profiler" null)
(mkWith false "debug" null) (mkWith false "debug" null)
(mkEnable false "coverage" null) (mkEnable false "coverage" null)
(mkWith (optFuse != null) "fuse" null) (mkWith (optFuse != null) "fuse" null)
(mkWith (malloc == optJemalloc) "jemalloc" null) (mkWith (malloc == optJemalloc) "jemalloc" null)
(mkWith (malloc == optGperftools) "tcmalloc" null) (mkWith (malloc == optGperftools) "tcmalloc" null)
(mkEnable false "pgrefdebugging" null) (mkEnable false "pgrefdebugging" null)
(mkEnable false "cephfs-java" null) (mkEnable false "cephfs-java" null)
(mkEnable hasXio "xio" null) (mkEnable hasXio "xio" null)
(mkWith (optLibatomic_ops != null) "libatomic-ops" null) (mkWith (optLibatomic_ops != null) "libatomic-ops" null)
(mkWith true "ocf" null) (mkWith true "ocf" null)
(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 (optLibs3 != null) "system-libs3" null)
(mkWith true "rest-bench" 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)
(mkWith (optZfs != null) "libzfs" null) (mkWith (optZfs != null) "libzfs" null)
] ++ optional (versionAtLeast version "10.0.0") [ ] ++ optional (versionAtLeast version "10.0.0") [
(mkWith true "man-pages" null) (mkWith true "man-pages" null)
(mkWith false "tcmalloc-minimal" null) (mkWith false "tcmalloc-minimal" null)
(mkWith false "valgrind" null) (mkWith false "valgrind" null)
(mkWith true "systemd-libexec-dir" "\${TMPDIR}")
]; ];
preBuild = optionalString (versionAtLeast version "9.0.0") '' preBuild = optionalString (versionAtLeast version "9.0.0") ''

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

@ -1,11 +1,11 @@
{ callPackage, fetchgit, git, ... } @ args: { callPackage, fetchgit, git, ... } @ args:
callPackage ./generic.nix (args // rec { callPackage ./generic.nix (args // rec {
version = "2015-05-29"; version = "2015-04-22";
src = fetchgit { src = fetchgit {
url = "git://github.com/ceph/ceph.git"; url = "git://github.com/ceph/ceph.git";
rev = "64096b870960d021ab5001b6a5cf3a999a9abeb7"; rev = "89262abc53e324f3ef4d504473a4f1d6eb337c20";
sha256 = "18lcn4misyvgjh7r0vkal480x23yr8pcjwzl4k4hbrpqmm97znp9"; sha256 = "0d6hlk1nwgx9cdhvppggz6sbjc1jl8j26l9739qspw1sviac5lcb";
}; };
}) })