From cd8bcb5f9f02557a04781679fc450c8e6cf08a68 Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Sun, 26 Aug 2018 13:07:32 +0200 Subject: [PATCH] ceph: fix build, 12.2.2 -> 12.2.7 Since 772eef91686974b7710081a9a77e5c0e287c25e8, Boost doesn't support by python by default, which broke ceph. Also bump to 12.2.7, the latest release of ceph 12. --- pkgs/tools/filesystems/ceph/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 0f712853f24..ef3e36ff627 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -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"; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6a25ec7c561..410c1a3fe7b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };