Merge branch 'devel' into 'main'

bump qemu to 7.1

See merge request glicid-public/guix-glicid!76
This commit is contained in:
Yann Dupont 2022-08-31 20:27:38 +00:00
commit aeba805e52

View file

@ -35,6 +35,31 @@
) )
) )
(define-public qemu-7.1-upstream
(package
(inherit qemu)
(name "qemu-upstream")
(version "7.1.0")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qemu.org/qemu-" version ".tar.xz"))
(sha256 (base32 "1rmvrgqjhrvcmchnz170dxvrrf14n6nm39y8ivrprmfydd9lwqx0"))
(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-public qemu-minimal-7.0-upstream (define-public qemu-minimal-7.0-upstream
(package (package
(inherit qemu-minimal) (inherit qemu-minimal)
@ -59,7 +84,7 @@
) )
) )
(define local-qemu qemu-7.0-upstream) (define local-qemu qemu-7.1-upstream)
(define qemu-latest (latest-version local-qemu qemu)) (define qemu-latest (latest-version local-qemu qemu))