summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorSarah Brofeldt <sarah@qtr.dk>2020-01-07 03:51:20 +0100
committerSarah Brofeldt <sarah@qtr.dk>2020-01-09 08:00:00 +0100
commitc373fc3b80e62206298c74c2ebc50bc87adbaaf3 (patch)
tree84f9e4b3ea893f87f9cf488005967dd23e7226fc /pkgs/tools
parente1eedf29e5d22e6824e614d75449b75a2e3455d6 (diff)
downloadnixpkgs-c373fc3b80e62206298c74c2ebc50bc87adbaaf3.tar
nixpkgs-c373fc3b80e62206298c74c2ebc50bc87adbaaf3.tar.gz
nixpkgs-c373fc3b80e62206298c74c2ebc50bc87adbaaf3.tar.bz2
nixpkgs-c373fc3b80e62206298c74c2ebc50bc87adbaaf3.tar.lz
nixpkgs-c373fc3b80e62206298c74c2ebc50bc87adbaaf3.tar.xz
nixpkgs-c373fc3b80e62206298c74c2ebc50bc87adbaaf3.tar.zst
nixpkgs-c373fc3b80e62206298c74c2ebc50bc87adbaaf3.zip
ceph: 14.2.4 -> 14.2.5
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/filesystems/ceph/default.nix8
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix
index 3066be27772..9c770441025 100644
--- a/pkgs/tools/filesystems/ceph/default.nix
+++ b/pkgs/tools/filesystems/ceph/default.nix
@@ -10,6 +10,7 @@
 , cunit, snappy
 , rocksdb, makeWrapper
 , leveldb, oathToolkit
+, libnl, libcap_ng
 
 # Optional Dependencies
 , yasm ? null, fcgi ? null, expat ? null
@@ -88,9 +89,10 @@ let
     ps.webob
     ps.bcrypt
     ps.six
+    ps.pyyaml
   ]);
 
-  version = "14.2.4";
+  version = "14.2.5";
 in rec {
   ceph = stdenv.mkDerivation {
     pname = "ceph";
@@ -98,7 +100,7 @@ in rec {
 
     src = fetchurl {
       url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz";
-      sha256 = "1y6hixh6srd5aswhzq0sf0dbygwhx0ardx3w3f7qazf5rapvd03i";
+      sha256 = "0wbkdplxs8higmlj57a7rydmx9rq08h0arjrmxmp0s80bn0v5x2c";
     };
 
     patches = [
@@ -116,7 +118,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
+      snappy rocksdb lz4 oathToolkit leveldb libnl libcap_ng
     ] ++ optionals stdenv.isLinux [
       linuxHeaders utillinux libuuid udev keyutils optLibaio optLibxfs optZfs
       # ceph 14