From edc8808603be2e13cf5b6ec3cbcca61de3de3ba0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 11 Jun 2022 06:29:30 +0000 Subject: [PATCH] ceph: use python39 Boost 1.75 is not compatible with Python 3.10. --- pkgs/tools/filesystems/ceph/default.nix | 12 +++++++++--- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 678835bf7bf8..47a76c33c80e 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -2,7 +2,7 @@ , ensureNewerSourcesHook , cmake, pkg-config , which, git -, boost +, boost175 , libxml2, zlib, lz4 , openldap, lttng-ust , babeltrace, gperf @@ -21,7 +21,7 @@ , doxygen , graphviz , fmt -, python3 +, python39 # Optional Dependencies , yasm ? null, fcgi ? null, expat ? null @@ -104,7 +104,13 @@ let meta = getMeta "Ceph common module for code shared by manager modules"; }; - python = python3; + # Boost 1.75 is not compatible with Python 3.10 + python = python39; + + boost = boost175.override { + enablePython = true; + inherit python; + }; ceph-python-env = python.withPackages (ps: [ ps.sphinx diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0e58fec366c..3960268aa7db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4601,7 +4601,6 @@ with pkgs; libceph = ceph.lib; inherit (callPackages ../tools/filesystems/ceph { - boost = boost175.override { enablePython = true; python = python3; }; lua = lua5_4; }) ceph