mirror of
https://gitlab.univ-nantes.fr/glicid-public/guix-glicid.git
synced 2025-04-30 06:08:37 +02:00
Merge branch 'ccipl' of gitlab.univ-nantes.fr:glicid-public/guix-mirror into ccipl
This commit is contained in:
commit
8706095d9f
1 changed files with 28 additions and 5 deletions
|
@ -1092,7 +1092,7 @@ in the @code{debug} output), and binutils.")))
|
||||||
(package
|
(package
|
||||||
|
|
||||||
(name "glicid-libfido2")
|
(name "glicid-libfido2")
|
||||||
(version "1.7.0")
|
(version "1.8.0")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
|
|
||||||
|
@ -1102,7 +1102,7 @@ in the @code{debug} output), and binutils.")))
|
||||||
; (file-name (string-append name "-" version ".tar.gz"))
|
; (file-name (string-append name "-" version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"13khkp2q8g447797l09p83qxy0z8vgmzr54l8dcnapy9lsr4jrqi"))
|
"07gxyy5yzgfh5hg7q9fr77z5mkj0xjvd5ya7p5f5kar4iwc92hjm"))
|
||||||
|
|
||||||
|
|
||||||
))
|
))
|
||||||
|
@ -1255,7 +1255,7 @@ for most inputs, but the resulting compressed files are anywhere from 20% to
|
||||||
(package
|
(package
|
||||||
(inherit ceph)
|
(inherit ceph)
|
||||||
(name "glicid-ceph-14")
|
(name "glicid-ceph-14")
|
||||||
(version "14.2.21")
|
(version "14.2.22")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
|
|
||||||
|
@ -1493,11 +1493,34 @@ storage protocols (S3, NFS, and others) through the RADOS gateway.")
|
||||||
|
|
||||||
(define-public glicid-ceph glicid-ceph-15)
|
(define-public glicid-ceph glicid-ceph-15)
|
||||||
|
|
||||||
|
(define-public glicid-qemu
|
||||||
|
|
||||||
|
(package
|
||||||
|
(inherit qemu)
|
||||||
|
(name "glicid-qemu")
|
||||||
|
(version "6.1.0")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append "https://download.qemu.org/qemu-"
|
||||||
|
version ".tar.xz"))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"15iw7982g6vc4jy1l9kk1z9sl5bm1bdbwr74y7nvwjs1nffhig7f"))
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
(define-public qemu-with-rbd
|
(define-public qemu-with-rbd
|
||||||
|
|
||||||
|
|
||||||
(package
|
(package
|
||||||
(inherit qemu)
|
(inherit glicid-qemu)
|
||||||
(name "qemu-with-rbd")
|
(name "qemu-with-rbd")
|
||||||
; (arguments
|
; (arguments
|
||||||
; `(#:configure-flags
|
; `(#:configure-flags
|
||||||
|
@ -1523,7 +1546,7 @@ storage protocols (S3, NFS, and others) through the RADOS gateway.")
|
||||||
|
|
||||||
|
|
||||||
(inputs `(("glicid-ceph:lib", glicid-ceph "lib" )
|
(inputs `(("glicid-ceph:lib", glicid-ceph "lib" )
|
||||||
,@(package-inputs qemu)))
|
,@(package-inputs glicid-qemu)))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue