diff options
| author | Sarah Brofeldt <sarah@qtr.dk> | 2020-07-01 10:12:32 +0200 |
|---|---|---|
| committer | Sarah Brofeldt <sarah@qtr.dk> | 2020-07-01 10:39:35 +0200 |
| commit | a1f689819274c4defbaf895793ead8d426a17898 (patch) | |
| tree | a17d0d4f954d50251921a142b4fe15e88af7608f /pkgs/tools/filesystems | |
| parent | b3251e04ee470c20f81e75d5a6080ba92dc7ed3f (diff) | |
| download | nixpkgs-a1f689819274c4defbaf895793ead8d426a17898.tar nixpkgs-a1f689819274c4defbaf895793ead8d426a17898.tar.gz nixpkgs-a1f689819274c4defbaf895793ead8d426a17898.tar.bz2 nixpkgs-a1f689819274c4defbaf895793ead8d426a17898.tar.lz nixpkgs-a1f689819274c4defbaf895793ead8d426a17898.tar.xz nixpkgs-a1f689819274c4defbaf895793ead8d426a17898.tar.zst nixpkgs-a1f689819274c4defbaf895793ead8d426a17898.zip | |
ceph: 14.2.9 -> 14.2.10
Add new dependency on rdkafka Also removed now-obsolete cve patch as it's integrated already
Diffstat (limited to 'pkgs/tools/filesystems')
| -rw-r--r-- | pkgs/tools/filesystems/ceph/default.nix | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 65cd19df0fa..e553089917e 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -11,6 +11,7 @@ , rocksdb, makeWrapper , leveldb, oathToolkit , libnl, libcap_ng +, rdkafka # Optional Dependencies , yasm ? null, fcgi ? null, expat ? null @@ -93,7 +94,7 @@ let ]); sitePackages = ceph-python-env.python.sitePackages; - version = "14.2.9"; + version = "14.2.10"; in rec { ceph = stdenv.mkDerivation { pname = "ceph"; @@ -101,17 +102,11 @@ in rec { src = fetchurl { url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz"; - sha256 = "0zkh1a23v8g1fa5flqa2d53lv08ancab3li57gybpqpnja90k7il"; + sha256 = "0bbs3ag8zav283qpxrrndhvh2z01ykm6126fmwrbc1c5f9jfjq39"; }; patches = [ ./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 = [ @@ -124,7 +119,7 @@ in rec { buildInputs = cryptoLibsMap.${cryptoStr} ++ [ boost ceph-python-env libxml2 optYasm optLibatomic_ops optLibs3 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 [ linuxHeaders utillinux libuuid udev keyutils optLibaio optLibxfs optZfs # ceph 14 |