Merge pull request #45645 from xeji/p/ceph

ceph: fix build, 12.2.2 -> 12.2.7
This commit is contained in:
Jörg Thalheim 2018-08-26 13:51:03 +01:00 committed by GitHub
commit 110b7b224a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions

View File

@ -1,12 +1,12 @@
{ callPackage, fetchgit, fetchpatch, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "12.2.2";
version = "12.2.7";
src = fetchgit {
url = "https://github.com/ceph/ceph.git";
rev = "refs/tags/v${version}";
sha256 = "01anqxyffa8l2lzgyb0dj6fjicfjdx2cq9y1klh24x69gxwkdh00";
sha256 = "031nfw2g2fdpxxx39g862phgmdx68hj9r54axazandghfhc1bzrl";
};
})

View File

@ -1706,7 +1706,9 @@ with pkgs;
nrg2iso = callPackage ../tools/cd-dvd/nrg2iso { };
libceph = ceph.lib;
ceph = callPackage ../tools/filesystems/ceph { boost = boost165; };
ceph = callPackage ../tools/filesystems/ceph {
boost = boost166.override { enablePython = true; };
};
ceph-dev = ceph;
certmgr = callPackage ../tools/security/certmgr { };