ceph: 14.2.4 -> 14.2.5

This commit is contained in:
Sarah Brofeldt 2020-01-07 03:51:20 +01:00
parent e1eedf29e5
commit c373fc3b80

View File

@ -10,6 +10,7 @@
, cunit, snappy , cunit, snappy
, rocksdb, makeWrapper , rocksdb, makeWrapper
, leveldb, oathToolkit , leveldb, oathToolkit
, libnl, libcap_ng
# Optional Dependencies # Optional Dependencies
, yasm ? null, fcgi ? null, expat ? null , yasm ? null, fcgi ? null, expat ? null
@ -88,9 +89,10 @@ let
ps.webob ps.webob
ps.bcrypt ps.bcrypt
ps.six ps.six
ps.pyyaml
]); ]);
version = "14.2.4"; version = "14.2.5";
in rec { in rec {
ceph = stdenv.mkDerivation { ceph = stdenv.mkDerivation {
pname = "ceph"; pname = "ceph";
@ -98,7 +100,7 @@ in rec {
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 = "1y6hixh6srd5aswhzq0sf0dbygwhx0ardx3w3f7qazf5rapvd03i"; sha256 = "0wbkdplxs8higmlj57a7rydmx9rq08h0arjrmxmp0s80bn0v5x2c";
}; };
patches = [ patches = [
@ -116,7 +118,7 @@ in rec {
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 rocksdb lz4 oathToolkit leveldb snappy rocksdb lz4 oathToolkit leveldb libnl libcap_ng
] ++ optionals stdenv.isLinux [ ] ++ optionals stdenv.isLinux [
linuxHeaders utillinux libuuid udev keyutils optLibaio optLibxfs optZfs linuxHeaders utillinux libuuid udev keyutils optLibaio optLibxfs optZfs
# ceph 14 # ceph 14