BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #177253 from dotlambda/ceph-python39

Browse source
This commit is contained in:
Martin Weinelt 2022-06-11 13:20:36 +02:00 committed by GitHub
commit f13315dd4c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/tools/filesystems/ceph/default.nix
View file

@ -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

1
pkgs/top-level/all-packages.nix
View file

@ -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