diff --git a/pkgs/tools/filesystems/ceph/0.80.nix b/pkgs/tools/filesystems/ceph/0.80.nix index 302a65f626b9..c987e0bd6418 100644 --- a/pkgs/tools/filesystems/ceph/0.80.nix +++ b/pkgs/tools/filesystems/ceph/0.80.nix @@ -6,7 +6,8 @@ callPackage ./generic.nix (args // rec { src = fetchgit { url = "git://github.com/ceph/ceph.git"; rev = "refs/tags/v${version}"; - sha256 = "1arajccczjdqp7igs17569xlq5cj4azcm5wwixg6ryypjr2grcbl"; + leaveDotGit = true; + sha256 = "0s81j6yj8y27hlx1hid9maz0l7bhjjskjxzxlhsikzmdc1j27m4r"; }; patches = [ diff --git a/pkgs/tools/filesystems/ceph/0.94.nix b/pkgs/tools/filesystems/ceph/0.94.nix index 9b9455b90612..75045cb13445 100644 --- a/pkgs/tools/filesystems/ceph/0.94.nix +++ b/pkgs/tools/filesystems/ceph/0.94.nix @@ -6,7 +6,8 @@ callPackage ./generic.nix (args // rec { src = fetchgit { url = "https://github.com/ceph/ceph.git"; rev = "refs/tags/v${version}"; - sha256 = "1nhqzmxv7bz93b8rbd88wgmw9icm2lhmc94dfscgh23kfpipyd6l"; + leaveDotGit = true; + sha256 = "094f9knxgx8vb9fb1yzld9ib4m0wpqwqgqjl3xqf0dzm48nxqd73"; }; patches = [ ./fix-pgrefdebugging.patch ]; diff --git a/pkgs/tools/filesystems/ceph/dev.nix b/pkgs/tools/filesystems/ceph/dev.nix index 5cc183d1053c..c57bc200f24c 100644 --- a/pkgs/tools/filesystems/ceph/dev.nix +++ b/pkgs/tools/filesystems/ceph/dev.nix @@ -6,7 +6,8 @@ callPackage ./generic.nix (args // rec { src = fetchgit { url = "https://github.com/ceph/ceph.git"; rev = "refs/tags/v${version}"; - sha256 = "0kydjyvb1566mh33p6dlljfx1r4cfdj8ic4i19h5r9vavkc46nf0"; + leaveDotGit = true; + sha256 = "13iyv53kq2ka5py759cdiw0wmzpsycskvhmyr74qkpxmw9g6177y"; }; patches = [ ./fix-pythonpath.patch ]; diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix index bece841d5f51..61659ef26fd4 100644 --- a/pkgs/tools/filesystems/ceph/generic.nix +++ b/pkgs/tools/filesystems/ceph/generic.nix @@ -1,5 +1,5 @@ -{ stdenv, autoconf, automake, makeWrapper, pkgconfig, libtool, which -, boost, python, pythonPackages, libxml2, git, zlib +{ stdenv, autoconf, automake, makeWrapper, pkgconfig, libtool, which, git +, boost, python, pythonPackages, libxml2, zlib # Optional Dependencies , snappy ? null, leveldb ? null, yasm ? null, fcgi ? null, expat ? null @@ -112,14 +112,13 @@ stdenv.mkDerivation { ./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") [ pythonPackages.setuptools pythonPackages.argparse ]; buildInputs = buildInputs ++ cryptoLibsMap.${cryptoStr} ++ [ boost python libxml2 optYasm optLibatomic_ops optLibs3 malloc pythonPackages.flask zlib ] ++ optional (versionAtLeast version "9.0.0") [ - git # Used for the gitversion string pythonPackages.sphinx # Used for docs ] ++ optional stdenv.isLinux [ linuxHeaders libuuid udev keyutils optLibaio optLibxfs optZfs