backporting master into devel (devel was behind master)

This commit is contained in:
Jean-François GUILLAUME 2022-05-10 10:00:46 +02:00
parent cc5cc2847f
commit 54560ad0ea
GPG key ID: 38751DAE145EFB5A
34 changed files with 10115 additions and 1803 deletions

View file

@ -2,29 +2,40 @@
#:use-module (guix packages)
#:use-module (guix utils)
#:use-module (gnu packages virtualization)
#:use-module (gnu packages storage) ;; «regular» ceph is defined here
#:use-module (glicid packages storage) ;; a «more up to date» version MAY be here
#:use-module (gnu packages storage)
; #:use-module (glicid packages storage)
)
;;;;;;;;
(define-public qemu-with-rbd
(package
(inherit qemu)
(name "qemu-with-rbd")
(arguments
(substitute-keyword-arguments
`(#:tests? #f
,@(package-arguments qemu)))
(substitute-keyword-arguments `(
#:tests? #f
,@(package-arguments qemu)
))
)
(inputs `(("ceph:lib", ceph "lib" ) ;; will take the more up to date ceph
,@(package-inputs qemu)))
(inputs `(
("ceph:lib", ceph "lib")
,@(package-inputs qemu)
))
)
)
;;; glicid/virtualizationvirtualization.scm ends here
(define-public qemu-minimal-with-rbd
(package
(inherit qemu-minimal)
(name "qemu-minimal-with-rbd")
(arguments
(substitute-keyword-arguments `(
#:tests? #f
,@(package-arguments qemu-minimal)
))
)
(inputs `(
("ceph:lib", ceph "lib" )
,@(package-inputs qemu-minimal)
))
)
)