diff options
| author | Maxim Cournoyer <[email protected]> | 2022-01-25 23:36:11 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <[email protected]> | 2022-01-25 23:48:37 -0500 |
| commit | 0d41fe4855588fb659b8adafe215d5573517a79b (patch) | |
| tree | 38b274bd03375f4fa5b7d3a9fb3f64a19786bef2 /gnu/packages/storage.scm | |
| parent | 7c57821c68d199ad56a8ed750b36eccc7ef238dd (diff) | |
| parent | 1a5302435ff0d2822b823f5a6fe01faa7a85c629 (diff) | |
Merge branch 'staging' into core-updates.
With "conflicts" resolved in (mostly in favor of master/staging):
gnu/packages/admin.scm
gnu/packages/gnuzilla.scm
gnu/packages/gtk.scm
gnu/packages/kerberos.scm
gnu/packages/linux.scm
guix/lint.scm
Diffstat (limited to 'gnu/packages/storage.scm')
| -rw-r--r-- | gnu/packages/storage.scm | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/gnu/packages/storage.scm b/gnu/packages/storage.scm index 094d7ade74..d29486bd4b 100644 --- a/gnu/packages/storage.scm +++ b/gnu/packages/storage.scm @@ -59,14 +59,14 @@ (define-public ceph (package (name "ceph") - (version "16.2.6") + (version "16.2.7") (source (origin (method url-fetch) (uri (string-append "https://download.ceph.com/tarballs/ceph-" version ".tar.gz")) (sha256 (base32 - "104xmc84d4ycdn7f4z09kvzwl1vlywxp3hbfxhgq0kcmgikb4wad")) + "0n7vpdcxji49bqaa5b7zxif1r80rrkbh0dfacbibvf20kzzbn2fz")) (patches (search-patches "ceph-disable-cpu-optimizations.patch" @@ -74,22 +74,20 @@ "ceph-rocksdb-compat.patch")) (modules '((guix build utils))) (snippet - '(begin - (for-each delete-file-recursively - '(;; TODO: Unbundle these: - ;"src/isa-l" - ;"src/lua" - ;"src/xxHash" - ;"src/zstd" - ;"src/civetweb" - "src/c-ares" - "src/fmt" - "src/googletest" - "src/rapidjson" - "src/spdk" - "src/rocksdb" - "src/boost")) - #t)))) + '(for-each delete-file-recursively + '(;; TODO: Unbundle these: + ;;"src/isa-l" + ;;"src/lua" + ;;"src/xxHash" + ;;"src/zstd" + ;;"src/civetweb" + "src/c-ares" + "src/fmt" + "src/googletest" + "src/rapidjson" + "src/spdk" + "src/rocksdb" + "src/boost"))))) (build-system cmake-build-system) (arguments `(#:configure-flags |