02/04: gnu: ceph: Update to 12.2.5.

[Marius Bakke]

mbakke pushed a commit to branch master
in repository guix.

commit 3743e1320eb6ff6da8265d6576d4a6969ec5514e
Author: Marius Bakke <address@hidden>
Date:   Wed Apr 25 12:26:25 2018 +0200

    gnu: ceph: Update to 12.2.5.
    
    * gnu/packages/patches/ceph-skip-collect-sys-info-test.patch: Adjust.
    * gnu/packages/storage.scm (ceph): Update to 12.2.5.
---
 gnu/packages/patches/ceph-skip-collect-sys-info-test.patch | 11 +++--------
 gnu/packages/storage.scm                                   |  4 ++--
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/patches/ceph-skip-collect-sys-info-test.patch 
b/gnu/packages/patches/ceph-skip-collect-sys-info-test.patch
index f210799..429087c 100644
--- a/gnu/packages/patches/ceph-skip-collect-sys-info-test.patch
+++ b/gnu/packages/patches/ceph-skip-collect-sys-info-test.patch
@@ -1,14 +1,13 @@
 This test fails because /etc/os-release is not available.
 
 diff --git a/src/test/common/test_util.cc b/src/test/common/test_util.cc
-index 288dd37db1..95b6cd4b30 100644
+index 64eace923c..6daf4aa514 100644
 --- a/src/test/common/test_util.cc
 +++ b/src/test/common/test_util.cc
-@@ -31,19 +31,3 @@ TEST(util, unit_to_bytesize)
- 
+@@ -32,17 +32,3 @@ TEST(util, unit_to_bytesize)
    ASSERT_EQ(65536ll, unit_to_bytesize(" 64K", &cerr));
  }
--
+ 
 -#if defined(__linux__)
 -TEST(util, collect_sys_info)
 -{
@@ -18,12 +17,8 @@ index 288dd37db1..95b6cd4b30 100644
 -  collect_sys_info(&sys_info, cct);
 -
 -  ASSERT_TRUE(sys_info.find("distro") != sys_info.end());
--  ASSERT_TRUE(sys_info.find("distro_version") != sys_info.end());
 -  ASSERT_TRUE(sys_info.find("distro_description") != sys_info.end());
 -
 -  cct->put();
 -}
 -#endif
--- 
-2.11.1
-
diff --git a/gnu/packages/storage.scm b/gnu/packages/storage.scm
index 54d91c1..2ba6b85 100644
--- a/gnu/packages/storage.scm
+++ b/gnu/packages/storage.scm
@@ -52,14 +52,14 @@
 (define-public ceph
   (package
     (name "ceph")
-    (version "12.2.4")
+    (version "12.2.5")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://download.ceph.com/tarballs/ceph-";
                                   version ".tar.gz"))
               (sha256
                (base32
-                "13hv8scaxc1gdvrhzbfnsk4yy3pla6n1i4j4j4zf7schmbf0j8mp"))
+                "1ydc3mfvc0vpnpfnfmissvsrsj4jyxgzc2pcl1a4vdr3bwkcglp3"))
               (patches
                (search-patches "ceph-skip-unittest_blockdev.patch"
                                "ceph-skip-collect-sys-info-test.patch"