GLiCID/guix-glicid
7
0
Fork 0
mirror of https://gitlab.univ-nantes.fr/glicid-public/guix-glicid.git synced 2025-04-30 06:08:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'devel' into 'main'

Browse source 
test last quincy released.

See merge request glicid-public/guix-glicid!399
This commit is contained in:
Yann Dupont 2024-09-06 20:50:41 +00:00
commit 8fc3d56fc5
1 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
glicid/packages/storage.scm
View file

@ -2,9 +2,11 @@
(use-modules (guix packages) (use-modules (guix packages)
(guix git-download) (guix git-download)
(guix download)
; (guix utils) ; (guix utils)
(gnu packages) (gnu packages)
(gnu packages storage) (gnu packages storage)
(gnu packages crypto)
(gnu packages python-xyz) ; wcwidth (gnu packages python-xyz) ; wcwidth
(gnu packages linux) ; liburing (gnu packages linux) ; liburing
) )
@ -13,18 +15,26 @@
(package (package
(inherit ceph) (inherit ceph)
(name "ceph-upstream") (name "ceph-upstream")
(version "17.2.8-pre") ; (version "17.2.7releasetag")
(source (origin (version "17.2.7")
; (source (origin
; (method git-fetch)
; (uri (git-reference
; (url "https://github.com/ceph/ceph.git")
; (commit "b12291d110049b2f35e32e0de30d70e9a4c060d2") ;; last version 20240906
;; (branch "quincy")
;
; (recursive? #t)))
; (file-name version)
(source (origin
(method url-fetch)
(uri (string-append "https://download.ceph.com/tarballs/ceph-"
version ".tar.gz"))
(method git-fetch)
(uri (git-reference
(url "https://github.com/ceph/ceph.git")
(commit "00f3877cc47f7a85e5ce4fa2585254b148b0d1ca") ;; last version 20240325
; (branch "quincy")
(recursive? #t)))
(sha256 (sha256
(base32 (base32
"0mnc20jxnyxh6ipgg9m40allkhf1pfm7pmcy8d7ggmx3aw6xg2cw")) "1612424yrf39dz010ygz8k5x1vc8731549ckfj1r39dg00m62klp"))
(patches (patches
(search-patches (search-patches
"ceph-disable-cpu-optimizations.patch")) "ceph-disable-cpu-optimizations.patch"))
@ -47,7 +57,7 @@
; "src/boost" ; inexistant ?? ; "src/boost" ; inexistant ??
"src/utf8proc"))))) "src/utf8proc")))))
(inputs (modify-inputs (package-inputs ceph) (append liburing))) (inputs (modify-inputs (package-inputs ceph) (append liburing libxcrypt)))
(native-inputs (modify-inputs (package-native-inputs ceph) (native-inputs (modify-inputs (package-native-inputs ceph)
(append python-wcwidth))))) (append python-wcwidth)))))