JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #91919 from srhb/ceph-14.2.10

Browse Source 
ceph: 14.2.9 -> 14.2.10
This commit is contained in:
Sarah Brofeldt 2020-07-02 07:11:50 +02:00 committed by GitHub
commit f4a34b2c08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/tools/filesystems/ceph/default.nix
View File

@ -11,6 +11,7 @@
, rocksdb, makeWrapper , rocksdb, makeWrapper
, leveldb, oathToolkit , leveldb, oathToolkit
, libnl, libcap_ng , libnl, libcap_ng
, rdkafka
# Optional Dependencies # Optional Dependencies
, yasm ? null, fcgi ? null, expat ? null , yasm ? null, fcgi ? null, expat ? null
@ -93,7 +94,7 @@ let
]); ]);
sitePackages = ceph-python-env.python.sitePackages; sitePackages = ceph-python-env.python.sitePackages;
version = "14.2.9"; version = "14.2.10";
in rec { in rec {
ceph = stdenv.mkDerivation { ceph = stdenv.mkDerivation {
pname = "ceph"; pname = "ceph";
@ -101,17 +102,11 @@ 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 = "0zkh1a23v8g1fa5flqa2d53lv08ancab3li57gybpqpnja90k7il"; sha256 = "0bbs3ag8zav283qpxrrndhvh2z01ykm6126fmwrbc1c5f9jfjq39";
}; };
patches = [ patches = [
./0000-fix-SPDK-build-env.patch ./0000-fix-SPDK-build-env.patch
(fetchurl {
# Remove for Ceph > v15.2.3; https://www.openwall.com/lists/oss-security/2020/06/25/5
name = "CVE-2020-10753.patch";
url = "https://github.com/ceph/ceph/pull/35773/commits/1524d3c0c5cb11775313ea1e2bb36a93257947f2.patch";
sha256 = "1c04kirijp4c8a5pgwqx17dzdnzvd29nl2nr3qdvf4fkqwnlf48s";
})
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
@ -124,7 +119,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 libnl libcap_ng snappy rocksdb lz4 oathToolkit leveldb libnl libcap_ng rdkafka
] ++ 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
@ -182,7 +177,7 @@ in rec {
homepage = "https://ceph.com/"; homepage = "https://ceph.com/";
description = "Distributed storage system"; description = "Distributed storage system";
license = with licenses; [ lgpl21 gpl2 bsd3 mit publicDomain ]; license = with licenses; [ lgpl21 gpl2 bsd3 mit publicDomain ];
maintainers = with maintainers; [ adev ak krav johanot ]; maintainers = with maintainers; [ adev ak krav johanot srhb ];
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
}; };