Skip to content

[staging-next] ceph: use python39 #177253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mweinelt merged 1 commit into from
Jun 11, 2022
Merged

[staging-next] ceph: use python39 #177253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions pkgs/tools/filesystems/ceph/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
, ensureNewerSourcesHook
, cmake, pkg-config
, which, git
, boost
, boost175
, libxml2, zlib, lz4
, openldap, lttng-ust
, babeltrace, gperf
Expand All @@ -21,7 +21,7 @@
, doxygen
, graphviz
, fmt
, python3
, python39

# Optional Dependencies
, yasm ? null, fcgi ? null, expat ? null
Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down