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

Merge branch 'devel' into 'main'

Browse source 
simplifitcation - non test pour qemu

See merge request glicid-public/guix-glicid!86
This commit is contained in:
Yann Dupont 2022-09-14 19:45:55 +00:00
commit a31343db45
1 changed files with 35 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

112
glicid/packages/virtualization.scm
View file

@ -11,97 +11,34 @@
) )
(define-public qemu-7.0-upstream
(package
(inherit qemu)
(name "qemu-upstream")
(version "7.0.0")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qemu.org/qemu-" version ".tar.xz"))
(sha256 (base32 "0fgq8szlc75ymgpxpkj47njqqiw65nxsl2wbg4188whzjp3pbczn"))
(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-public qemu-7.1-upstream ;(define qemu-latest (latest-version local-qemu qemu))
(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 local-qemu-minimal qemu-minimal-7.0-upstream)
(package
(inherit qemu-minimal)
(name "qemu-minimal-upstream")
(version "7.0.0")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qemu.org/qemu-" version ".tar.xz"))
(sha256 (base32 "0fgq8szlc75ymgpxpkj47njqqiw65nxsl2wbg4188whzjp3pbczn"))
(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-minimal-latest (latest-version local-qemu-minimal qemu-minimal))
(define qemu-latest (latest-version local-qemu qemu)) ;; current guix version is latest.
(define qemu-latest qemu)
(define qemu-minimal-latest qemu-minimal)
(define local-qemu-minimal qemu-minimal-7.0-upstream)
(define qemu-minimal-latest (latest-version local-qemu-minimal qemu-minimal))
(define-public qemu-with-rbd (define-public qemu-with-rbd
(package (package
(inherit qemu-latest) (inherit qemu-latest)
(name "qemu-with-rbd") (name "qemu-with-rbd")
(arguments (arguments
(substitute-keyword-arguments `( (substitute-keyword-arguments (package-arguments qemu)
#:tests? #f ((#:tests? _ #f)
,@(package-arguments qemu) ;; FIXME: To run the test suite, fix all the instances where scripts
)) ;; generates "#! /bin/sh" shebangs.
#f)
)
) )
(inputs `( (inputs `(
("ceph:lib", ceph "lib") ("ceph:lib", ceph "lib")
,@(package-inputs qemu) ,@(package-inputs qemu)
@ -109,6 +46,25 @@
) )
) )
;(define-public qemu-with-rbd
; (package
; (inherit qemu-latest)
; (name "qemu-with-rbd")
; (arguments
; (substitute-keyword-arguments `(
; #:tests? #f
; ,@(package-arguments qemu)
; ))
; )
; (inputs `(
; ("ceph:lib", ceph "lib")
; ,@(package-inputs qemu)
; ))
; )
;)
(define-public qemu-minimal-with-rbd (define-public qemu-minimal-with-rbd
(package (package
(inherit qemu-minimal-latest) (inherit qemu-minimal-latest)