diff options
| author | Luke Granger-Brown <git@lukegb.com> | 2021-07-03 01:34:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-03 01:34:07 +0100 |
| commit | 3db607501e82abfb504876d09267698aac9fc13d (patch) | |
| tree | 097ec04fa88923be74f929dad246d20f4e93b7c1 | |
| parent | 83292f696d7efb694c3dad77cb74358f74b5f3b8 (diff) | |
| parent | 196a7136a953eb3fa1b28a17b8d51126b0ee8372 (diff) | |
| download | nixlib-3db607501e82abfb504876d09267698aac9fc13d.tar nixlib-3db607501e82abfb504876d09267698aac9fc13d.tar.gz nixlib-3db607501e82abfb504876d09267698aac9fc13d.tar.bz2 nixlib-3db607501e82abfb504876d09267698aac9fc13d.tar.lz nixlib-3db607501e82abfb504876d09267698aac9fc13d.tar.xz nixlib-3db607501e82abfb504876d09267698aac9fc13d.tar.zst nixlib-3db607501e82abfb504876d09267698aac9fc13d.zip | |
Merge pull request #128794 from helsinki-systems/feat/cephsh-shell
ceph: Enable cephfs-shell and use system liburing
| -rw-r--r-- | pkgs/tools/filesystems/ceph/default.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index a25bf744a91a..72de0295c714 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -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 |