diff options
| author | Florian Klink <flokli@flokli.de> | 2020-01-09 18:39:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-09 18:39:05 +0100 |
| commit | 2603d15a4d2b90f3f1b4c878ad7b010f8dba7af4 (patch) | |
| tree | ccd5e35bbe799f93aad1a32cab1267d62e2dba9e /pkgs | |
| parent | f7a4e4a93a2a317fb76b9e09a97ea6246e477da2 (diff) | |
| parent | 59233d67b1ffbf2fa3ccd70ff61778da9cd09265 (diff) | |
| download | nixpkgs-2603d15a4d2b90f3f1b4c878ad7b010f8dba7af4.tar nixpkgs-2603d15a4d2b90f3f1b4c878ad7b010f8dba7af4.tar.gz nixpkgs-2603d15a4d2b90f3f1b4c878ad7b010f8dba7af4.tar.bz2 nixpkgs-2603d15a4d2b90f3f1b4c878ad7b010f8dba7af4.tar.lz nixpkgs-2603d15a4d2b90f3f1b4c878ad7b010f8dba7af4.tar.xz nixpkgs-2603d15a4d2b90f3f1b4c878ad7b010f8dba7af4.tar.zst nixpkgs-2603d15a4d2b90f3f1b4c878ad7b010f8dba7af4.zip | |
Merge pull request #77167 from srhb/ceph-14_2_5
ceph: 14.2.4 -> 14.2.5
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/filesystems/ceph/default.nix | 8 |
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 |