ceph: Fix detection of git versioning
This commit is contained in:
parent
6492dc8900
commit
6d30af58a0
|
@ -6,7 +6,8 @@ callPackage ./generic.nix (args // rec {
|
||||||
src = fetchgit {
|
src = fetchgit {
|
||||||
url = "git://github.com/ceph/ceph.git";
|
url = "git://github.com/ceph/ceph.git";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
sha256 = "1arajccczjdqp7igs17569xlq5cj4azcm5wwixg6ryypjr2grcbl";
|
leaveDotGit = true;
|
||||||
|
sha256 = "0s81j6yj8y27hlx1hid9maz0l7bhjjskjxzxlhsikzmdc1j27m4r";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
|
|
@ -6,7 +6,8 @@ callPackage ./generic.nix (args // rec {
|
||||||
src = fetchgit {
|
src = fetchgit {
|
||||||
url = "https://github.com/ceph/ceph.git";
|
url = "https://github.com/ceph/ceph.git";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
sha256 = "1nhqzmxv7bz93b8rbd88wgmw9icm2lhmc94dfscgh23kfpipyd6l";
|
leaveDotGit = true;
|
||||||
|
sha256 = "094f9knxgx8vb9fb1yzld9ib4m0wpqwqgqjl3xqf0dzm48nxqd73";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [ ./fix-pgrefdebugging.patch ];
|
patches = [ ./fix-pgrefdebugging.patch ];
|
||||||
|
|
|
@ -6,7 +6,8 @@ callPackage ./generic.nix (args // rec {
|
||||||
src = fetchgit {
|
src = fetchgit {
|
||||||
url = "https://github.com/ceph/ceph.git";
|
url = "https://github.com/ceph/ceph.git";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
sha256 = "0kydjyvb1566mh33p6dlljfx1r4cfdj8ic4i19h5r9vavkc46nf0";
|
leaveDotGit = true;
|
||||||
|
sha256 = "13iyv53kq2ka5py759cdiw0wmzpsycskvhmyr74qkpxmw9g6177y";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [ ./fix-pythonpath.patch ];
|
patches = [ ./fix-pythonpath.patch ];
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{ stdenv, autoconf, automake, makeWrapper, pkgconfig, libtool, which
|
{ stdenv, autoconf, automake, makeWrapper, pkgconfig, libtool, which, git
|
||||||
, boost, python, pythonPackages, libxml2, git, zlib
|
, boost, python, pythonPackages, libxml2, zlib
|
||||||
|
|
||||||
# Optional Dependencies
|
# Optional Dependencies
|
||||||
, snappy ? null, leveldb ? null, yasm ? null, fcgi ? null, expat ? null
|
, snappy ? null, leveldb ? null, yasm ? null, fcgi ? null, expat ? null
|
||||||
|
@ -112,14 +112,13 @@ 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 git ]
|
||||||
++ optionals (versionAtLeast version "9.0.2") [
|
++ optionals (versionAtLeast version "9.0.2") [
|
||||||
pythonPackages.setuptools pythonPackages.argparse
|
pythonPackages.setuptools pythonPackages.argparse
|
||||||
];
|
];
|
||||||
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") [
|
||||||
git # Used for the gitversion string
|
|
||||||
pythonPackages.sphinx # Used for docs
|
pythonPackages.sphinx # Used for docs
|
||||||
] ++ optional stdenv.isLinux [
|
] ++ optional stdenv.isLinux [
|
||||||
linuxHeaders libuuid udev keyutils optLibaio optLibxfs optZfs
|
linuxHeaders libuuid udev keyutils optLibaio optLibxfs optZfs
|
||||||
|
|
Loading…
Reference in New Issue