alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

ceph: 15.2.10 -> 16.2.1

Browse source
This commit is contained in:
Johan Thomsen 2021-04-21 10:02:36 +02:00
parent 0a5f5bab0e
commit c3bd75c752
2 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,4 @@
{ lib, stdenv, runCommand, fetchurl { lib, stdenv, runCommand, fetchurl
, fetchpatch
, ensureNewerSourcesHook , ensureNewerSourcesHook
, cmake, pkg-config , cmake, pkg-config
, which, git , which, git
@ -14,6 +13,15 @@
, libnl, libcap_ng , libnl, libcap_ng
, rdkafka , rdkafka
, nixosTests , nixosTests
, cryptsetup
, sqlite
, lua
, icu
, bzip2
, doxygen
, graphviz
, fmt
, python3
# Optional Dependencies # Optional Dependencies
, yasm ? null, fcgi ? null, expat ? null , yasm ? null, fcgi ? null, expat ? null
@ -123,10 +131,10 @@ let
]); ]);
sitePackages = ceph-python-env.python.sitePackages; sitePackages = ceph-python-env.python.sitePackages;
version = "15.2.10"; version = "16.2.1";
src = fetchurl { src = fetchurl {
url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz"; url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz";
sha256 = "1xfijynfb56gydpwh6h4q781xymwxih6nx26idnkcjqih48nsn01"; sha256 = "1qqvfhnc94vfrq1ddizf6habjlcp77abry4v18zlq6rnhwr99zrh";
}; };
in rec { in rec {
ceph = stdenv.mkDerivation { ceph = stdenv.mkDerivation {
@ -142,12 +150,18 @@ in rec {
pkg-config which git python3Packages.wrapPython makeWrapper pkg-config which git python3Packages.wrapPython makeWrapper
python3Packages.python # for the toPythonPath function python3Packages.python # for the toPythonPath function
(ensureNewerSourcesHook { year = "1980"; }) (ensureNewerSourcesHook { year = "1980"; })
python3
fmt
# for building docs/man-pages presumably
doxygen
graphviz
]; ];
buildInputs = cryptoLibsMap.${cryptoStr} ++ [ buildInputs = cryptoLibsMap.${cryptoStr} ++ [
boost ceph-python-env libxml2 optYasm optLibatomic_ops optLibs3 boost ceph-python-env libxml2 optYasm optLibatomic_ops optLibs3
malloc zlib openldap lttng-ust babeltrace gperf gtest cunit malloc zlib openldap lttng-ust babeltrace gperf gtest cunit
snappy lz4 oathToolkit leveldb libnl libcap_ng rdkafka snappy lz4 oathToolkit leveldb libnl libcap_ng rdkafka
cryptsetup sqlite lua icu bzip2
] ++ lib.optionals stdenv.isLinux [ ] ++ lib.optionals stdenv.isLinux [
linuxHeaders util-linux libuuid udev keyutils optLibaio optLibxfs optZfs linuxHeaders util-linux libuuid udev keyutils optLibaio optLibxfs optZfs
# ceph 14 # ceph 14
@ -171,7 +185,6 @@ in rec {
''; '';
cmakeFlags = [ cmakeFlags = [
"-DWITH_PYTHON3=ON"
"-DWITH_SYSTEM_ROCKSDB=OFF" # breaks Bluestore "-DWITH_SYSTEM_ROCKSDB=OFF" # breaks Bluestore
"-DCMAKE_INSTALL_DATADIR=${placeholder "lib"}/lib" "-DCMAKE_INSTALL_DATADIR=${placeholder "lib"}/lib"
@ -182,6 +195,8 @@ in rec {
"-DWITH_TESTS=OFF" "-DWITH_TESTS=OFF"
# TODO breaks with sandbox, tries to download stuff with npm # TODO breaks with sandbox, tries to download stuff with npm
"-DWITH_MGR_DASHBOARD_FRONTEND=OFF" "-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 = '' postFixup = ''

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

@ -3313,7 +3313,8 @@ in
libceph = ceph.lib; libceph = ceph.lib;
inherit (callPackages ../tools/filesystems/ceph { inherit (callPackages ../tools/filesystems/ceph {
boost = boost172.override { enablePython = true; python = python38; }; boost = boost17x.override { enablePython = true; python = python3; };
lua = lua5_4;
}) })
ceph ceph
ceph-client; ceph-client;