about summary refs log tree commit diff
path: root/pkgs/tools/filesystems
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2019-09-06 16:55:11 +0200
committerJan Tojnar <jtojnar@gmail.com>2019-09-06 16:55:11 +0200
commitf9237f315264a0ccb8b50ff4fa6ff456239e4dc1 (patch)
tree4c7212dd0f5244a3f09b8dcd5abca15737cffedf /pkgs/tools/filesystems
parentcdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f (diff)
parent4a1189e0abdbe26e34fc05555cf49c25583dfe3d (diff)
downloadnixlib-f9237f315264a0ccb8b50ff4fa6ff456239e4dc1.tar
nixlib-f9237f315264a0ccb8b50ff4fa6ff456239e4dc1.tar.gz
nixlib-f9237f315264a0ccb8b50ff4fa6ff456239e4dc1.tar.bz2
nixlib-f9237f315264a0ccb8b50ff4fa6ff456239e4dc1.tar.lz
nixlib-f9237f315264a0ccb8b50ff4fa6ff456239e4dc1.tar.xz
nixlib-f9237f315264a0ccb8b50ff4fa6ff456239e4dc1.tar.zst
nixlib-f9237f315264a0ccb8b50ff4fa6ff456239e4dc1.zip
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/tools/filesystems')
-rw-r--r--pkgs/tools/filesystems/ceph/default.nix9
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix
index efb292687ab4..1755ef625f5a 100644
--- a/pkgs/tools/filesystems/ceph/default.nix
+++ b/pkgs/tools/filesystems/ceph/default.nix
@@ -89,14 +89,15 @@ let
     ps.six
   ]);
 
-  version = "14.2.1";
+  version = "14.2.3";
 in rec {
   ceph = stdenv.mkDerivation {
-    name="ceph-${version}";
+    pname = "ceph";
+    inherit version;
 
     src = fetchurl {
       url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz";
-      sha256 = "0qa9p8xp26d45h3jfj1rbwhmqv44f9n1mvccmpzaf2i05v42kmzb";
+      sha256 = "1pa8czb205pz4vjfh82gsgickj3cdjrx51mcx7acsyqgp3dfvl33";
     };
 
     patches = [
@@ -181,7 +182,7 @@ in rec {
         homepage = https://ceph.com/;
         description = "Tools needed to mount Ceph's RADOS Block Devices";
         license = with licenses; [ lgpl21 gpl2 bsd3 mit publicDomain ];
-        maintainers = with maintainers; [ adev ak krav ];
+        maintainers = with maintainers; [ adev ak johanot krav ];
         platforms = platforms.unix;
       };
     } ''