Merge branch 'devel' into 'main'

Devel

See merge request glicid-public/guix-glicid!40
This commit is contained in:
Yann Dupont 2022-05-23 08:53:12 +00:00
commit 859b9eaf02

View file

@ -3,12 +3,47 @@
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (gnu packages virtualization) #:use-module (gnu packages virtualization)
#:use-module (gnu packages storage) #:use-module (gnu packages storage)
#:use-module (guix download)
#:use-module (glicid utils)
; #:use-module (glicid packages storage) ; #:use-module (glicid packages storage)
) )
(define-public qemu-7.0-upstream
(package
(inherit qemu)
(name "qemu-upstream")
(version "7.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://download.qemu.org/qemu-"
version ".tar.xz"))
(sha256
(base32
"0iavlsy9hin8k38230j8lfmyipx3965zljls1dp34mmc8n75vqb8"))
(patches (search-patches "qemu-build-info-manual.patch"
"qemu-fix-agent-paths.patch"))
(modules '((guix build utils)))
(snippet
'(begin
;; Delete the bundled meson copy.
(delete-file-recursively "meson")))))
)
)
(define local-qemu qemu-7.0-upstream)
(define qemu-latest (latest-version local-qemu qemu))
(define-public qemu-with-rbd (define-public qemu-with-rbd
(package (package
(inherit qemu) (inherit qemu-latest)
(name "qemu-with-rbd") (name "qemu-with-rbd")
(arguments (arguments
(substitute-keyword-arguments `( (substitute-keyword-arguments `(