amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into core-updates

Browse source
This commit is contained in:
Ludovic Courtès 2021-07-18 16:05:21 +02:00
commit 0e47fcced4
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
251 changed files with 56329 additions and 3619 deletions
Download patch file Download diff file Expand all files Collapse all files

27
gnu/packages/virtualization.scm
View file

@ -38,6 +38,7 @@
(define-module (gnu packages virtualization)
#:use-module (gnu packages)
#:use-module (gnu packages acl)
#:use-module (gnu packages admin)
#:use-module (gnu packages assembly)
#:use-module (gnu packages attr)
@ -1035,14 +1036,14 @@ It started as a side project of LXC but can be used by any run-time.")
(define-public libvirt
(package
(name "libvirt")
(version "7.3.0")
(version "7.5.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://libvirt.org/sources/libvirt-"
version ".tar.xz"))
(sha256
(base32 "1gn13mfwbdhp31pkzvrba7avz84yc9f1ik9f3ympa51hq22vpg97"))
(base32 "15987ihnsjvcgi11dzcf1k3zp1si2d4wcxj0r0i30brc0d4pn44h"))
(patches (search-patches "libvirt-add-install-prefix.patch"))))
(build-system meson-build-system)
(arguments
@ -1053,6 +1054,9 @@ It started as a side project of LXC but can be used by any run-time.")
"-Dstorage_disk=enabled"
"-Dstorage_dir=enabled"
"-Dpolkit=enabled"
;; XXX The default, but required to make -Dsasl ‘stick’.
;; See <https://gitlab.com/libvirt/libvirt/-/issues/185>
"-Ddriver_remote=enabled"
"-Dnls=enabled" ;translations
(string-append "-Ddocdir=" (assoc-ref %outputs "out") "/share/doc/"
,name "-" ,version)
@ -1062,6 +1066,12 @@ It started as a side project of LXC but can be used by any run-time.")
"--localstatedir=/var")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'skip-directory-confusion
(lambda _
;; Don't try to install an (unused) /var outside of the store.
(substitute* "scripts/meson-install-dirs.py"
(("destdir = .*")
"destdir = '/tmp'"))))
(add-before 'configure 'disable-broken-tests
(lambda _
(let ((tests (list "commandtest" ; hangs idly
@ -1069,15 +1079,12 @@ It started as a side project of LXC but can be used by any run-time.")
"virnetsockettest"))) ; tries to network
(substitute* "tests/meson.build"
(((format #f ".*'name': '(~a)'.*" (string-join tests "|")))
""))
#t)))
(add-before 'install 'no-polkit-magic
;; Meson ‘magically’ invokes pkexec, which fails (not setuid).
(lambda _
(setenv "PKEXEC_UID" "something")
#t)))))
""))))))))
(inputs
`(("libxml2" ,libxml2)
`(("acl" ,acl)
("attr" ,attr)
("fuse" ,fuse)
("libxml2" ,libxml2)
("eudev" ,eudev)
("libpciaccess" ,libpciaccess)
("gnutls" ,gnutls)