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

ceph: Enable cephfs-shell and use system liburing

Browse source
This commit is contained in:
Janne Heß 2021-06-30 18:55:32 +02:00
parent cc84f3906e
commit 196a7136a9
No known key found for this signature in database
GPG key ID: 69165158F05265DF
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -38,7 +38,7 @@
# Linux Only Dependencies
, linuxHeaders, util-linux, libuuid, udev, keyutils, rdma-core, rabbitmq-c
, libaio ? null, libxfs ? null, zfs ? null
, libaio ? null, libxfs ? null, zfs ? null, liburing ? null
, ...
}:
@ -130,6 +130,8 @@ let
ps.Mako
ceph-common
ps.cherrypy
ps.cmd2
ps.colorama
ps.dateutil
ps.jsonpatch
ps.pecan
@ -176,7 +178,7 @@ in rec {
snappy lz4 oathToolkit leveldb libnl libcap_ng rdkafka
cryptsetup sqlite lua icu bzip2
] ++ lib.optionals stdenv.isLinux [
linuxHeaders util-linux libuuid udev keyutils optLibaio optLibxfs optZfs
linuxHeaders util-linux libuuid udev keyutils liburing optLibaio optLibxfs optZfs
# ceph 14
rdma-core rabbitmq-c
] ++ lib.optionals hasRadosgw [
@ -207,11 +209,12 @@ in rec {
"-DMGR_PYTHON_VERSION=${ceph-python-env.python.pythonVersion}"
"-DWITH_SYSTEMD=OFF"
"-DWITH_TESTS=OFF"
"-DWITH_CEPHFS_SHELL=ON"
# TODO breaks with sandbox, tries to download stuff with npm
"-DWITH_MGR_DASHBOARD_FRONTEND=OFF"
# WITH_XFS has been set default ON from Ceph 16, keeping it optional in nixpkgs for now
''-DWITH_XFS=${if optLibxfs != null then "ON" else "OFF"}''
];
] ++ lib.optional stdenv.isLinux "-DWITH_SYSTEM_LIBURING=ON";
postFixup = ''
wrapPythonPrograms