diff options
Diffstat (limited to 'pkgs/tools/filesystems/ceph/default.nix')
| -rw-r--r-- | pkgs/tools/filesystems/ceph/default.nix | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 57d5845c9961..a7add68b2dac 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -1,5 +1,4 @@ { lib, stdenv, runCommand, fetchurl -, fetchpatch , ensureNewerSourcesHook , cmake, pkg-config , which, git @@ -14,6 +13,15 @@ , libnl, libcap_ng , rdkafka , nixosTests +, cryptsetup +, sqlite +, lua +, icu +, bzip2 +, doxygen +, graphviz +, fmt +, python3 # Optional Dependencies , yasm ? null, fcgi ? null, expat ? null @@ -123,10 +131,10 @@ let ]); sitePackages = ceph-python-env.python.sitePackages; - version = "15.2.10"; + version = "16.2.1"; src = fetchurl { url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz"; - sha256 = "1xfijynfb56gydpwh6h4q781xymwxih6nx26idnkcjqih48nsn01"; + sha256 = "1qqvfhnc94vfrq1ddizf6habjlcp77abry4v18zlq6rnhwr99zrh"; }; in rec { ceph = stdenv.mkDerivation { @@ -142,12 +150,18 @@ in rec { pkg-config which git python3Packages.wrapPython makeWrapper python3Packages.python # for the toPythonPath function (ensureNewerSourcesHook { year = "1980"; }) + python3 + fmt + # for building docs/man-pages presumably + doxygen + graphviz ]; buildInputs = cryptoLibsMap.${cryptoStr} ++ [ boost ceph-python-env libxml2 optYasm optLibatomic_ops optLibs3 malloc zlib openldap lttng-ust babeltrace gperf gtest cunit 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 # ceph 14 @@ -172,7 +186,6 @@ in rec { ''; cmakeFlags = [ - "-DWITH_PYTHON3=ON" "-DWITH_SYSTEM_ROCKSDB=OFF" # breaks Bluestore "-DCMAKE_INSTALL_DATADIR=${placeholder "lib"}/lib" @@ -183,6 +196,8 @@ in rec { "-DWITH_TESTS=OFF" # 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"}'' ]; postFixup = '' |