From 3fc231a878816a2b5973ebe73b837177d33ed7a0 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Fri, 22 Oct 2021 17:53:42 +0200 Subject: [PATCH] redef ceph 15 --- glicid/packages/glicid.scm | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/glicid/packages/glicid.scm b/glicid/packages/glicid.scm index c1717c1..65e9e8f 100644 --- a/glicid/packages/glicid.scm +++ b/glicid/packages/glicid.scm @@ -1222,9 +1222,9 @@ in the @code{debug} output), and binutils."))) ) + (define-public ceph-15 (package -; (inherit ceph) (name "ceph-15") (version "15.2.14") (source (origin @@ -1234,10 +1234,8 @@ in the @code{debug} output), and binutils."))) (sha256 (base32 "12cz10aascr2h7xbxp9ba5207pn9qv6m50xp5f8ns80vj6lzi6d3")) - (patches - (search-patches - "ceph-fix-snappy-breaking-change.patch")) - +; (patches +; (search-patches "ceph-disable-cpu-optimizations.patch")) (modules '((guix build utils))) (snippet '(begin @@ -1258,8 +1256,7 @@ in the @code{debug} output), and binutils."))) "src/rocksdb" "src/boost")) #t)))) - - (build-system cmake-build-system) + (build-system cmake-build-system) (arguments `(#:configure-flags (let* ((out (assoc-ref %outputs "out")) @@ -1373,7 +1370,6 @@ in the @code{debug} output), and binutils."))) `("PYTHONPATH" ":" prefix (,PYTHONPATH)))) scripts) #t)))))) - (outputs '("out" "lib")) (native-inputs @@ -1411,7 +1407,7 @@ in the @code{debug} output), and binutils."))) ("rapidjson" ,rapidjson) ("rdma-core" ,rdma-core) ("rocksdb" ,rocksdb) - ("snappy" ,snappy) + ("snappy" ,snappy-1.1.8) ("udev" ,eudev) ("util-linux" ,util-linux) ("util-linux:lib" ,util-linux "lib")