guix_mirror_bot pushed a commit to branch master
in repository guix.
commit 98b02667e306640116ef3904818c4de88be64e29
Author: Alissa Istleyeva <[email protected]>
AuthorDate: Mon Sep 8 22:44:34 2025 +0500
gnu: libvirt: Update to 11.5.0.
Fixes: guix/guix#2563.
* gnu/packages/virtualization.scm (libvirt): Update to 11.5.0.
(python-libvirt): Update to 11.5.0.
* gnu/packages/patches/libvirt-add-install-prefix.patch: Pull changes
from NixOS.
Change-Id: I13b619028cb2292c46f78669170265ef29e54b6b
Signed-off-by: Efraim Flashner <[email protected]>
---
.../patches/libvirt-add-install-prefix.patch | 55 ++++++++++------------
gnu/packages/virtualization.scm | 8 ++--
2 files changed, 28 insertions(+), 35 deletions(-)
diff --git a/gnu/packages/patches/libvirt-add-install-prefix.patch
b/gnu/packages/patches/libvirt-add-install-prefix.patch
index 041f39e097..30e35567ad 100644
--- a/gnu/packages/patches/libvirt-add-install-prefix.patch
+++ b/gnu/packages/patches/libvirt-add-install-prefix.patch
@@ -1,6 +1,6 @@
Patch from NixOS:
-
https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch
+
https://github.com/NixOS/nixpkgs/blob/master/pkgs/by-name/li/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch
From 58c07f1d59ef683faf8b747e40bd75401306acf4 Mon Sep 17 00:00:00 2001
From: Euan Kemp <[email protected]>
@@ -406,10 +406,10 @@ index 3b859ea7b4..ccddb3e805 100644
]
endif
diff --git a/src/security/apparmor/meson.build
b/src/security/apparmor/meson.build
-index b9257c816d..98701755d8 100644
+index 09d9fac02c..ee0c74ceec 100644
--- a/src/security/apparmor/meson.build
+++ b/src/security/apparmor/meson.build
-@@ -57,7 +57,7 @@ foreach name : apparmor_gen_profiles
+@@ -20,16 +20,16 @@ foreach name : apparmor_gen_profiles
output: name,
configuration: apparmor_gen_profiles_conf,
install: true,
@@ -417,39 +417,25 @@ index b9257c816d..98701755d8 100644
+ install_dir: install_prefix + apparmor_dir,
)
endforeach
-
-@@ -68,13 +68,13 @@ foreach name : apparmor_gen_abstractions
- command: apparmor_gen_cmd,
- capture: true,
- install: true,
-- install_dir: apparmor_dir / 'abstractions',
-+ install_dir: install_prefix + apparmor_dir / 'abstractions',
- )
- endforeach
-
+
+ install_data(
+ [ 'libvirt-qemu', 'libvirt-lxc' ],
+- install_dir: apparmor_dir / 'abstractions',
++ install_dir: install_prefix + apparmor_dir / 'abstractions',
+ )
+
install_data(
[ 'TEMPLATE.qemu', 'TEMPLATE.lxc' ],
- install_dir: apparmor_dir / 'libvirt',
+ install_dir: install_prefix + apparmor_dir / 'libvirt',
)
-
- if not conf.has('WITH_APPARMOR_3')
-@@ -83,7 +83,7 @@ if not conf.has('WITH_APPARMOR_3')
- # files in order to limit the amount of filesystem clutter.
- install_data(
- 'usr.lib.libvirt.virt-aa-helper.local',
-- install_dir: apparmor_dir / 'local',
-+ install_dir: install_prefix + apparmor_dir / 'local',
- rename: 'usr.lib.libvirt.virt-aa-helper',
- )
- endif
diff --git a/src/storage/meson.build b/src/storage/meson.build
index 404d6a6941..fb4e67a0a8 100644
--- a/src/storage/meson.build
+++ b/src/storage/meson.build
@@ -126,9 +126,9 @@ if conf.has('WITH_STORAGE')
}
-
+
virt_install_dirs += [
- confdir / 'storage',
- confdir / 'storage' / 'autostart',
@@ -459,20 +445,27 @@ index 404d6a6941..fb4e67a0a8 100644
+ install_prefix + runstatedir / 'libvirt' / 'storage',
]
endif
-
+
diff --git a/tools/meson.build b/tools/meson.build
-index 1bb84be0be..e04a4e986d 100644
+index a099148d3c..d0d6510f17 100644
--- a/tools/meson.build
+++ b/tools/meson.build
-@@ -121,7 +121,7 @@ if conf.has('WITH_LOGIN_SHELL')
+@@ -123,12 +123,12 @@ if conf.has('WITH_LOGIN_SHELL')
install_rpath: libvirt_rpath,
)
-
+
- install_data('virt-login-shell.conf', install_dir: sysconfdir / 'libvirt')
+ install_data('virt-login-shell.conf', install_dir: install_prefix +
sysconfdir / 'libvirt')
+
+ # Install the sysuser config for the setgid binary
+ install_data(
+ 'libvirt-login-shell.sysusers.conf',
+- install_dir: sysusersdir,
++ install_dir: install_prefix + sysusersdir,
+ rename: [ 'libvirt-login-shell.conf' ],
+ )
endif
-
- if host_machine.system() == 'windows'
+
diff --git a/tools/ssh-proxy/meson.build b/tools/ssh-proxy/meson.build
index e9f312fa25..95d5d8fe0b 100644
--- a/tools/ssh-proxy/meson.build
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index a06082d950..44abfd621e 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -1629,14 +1629,14 @@ It started as a side project of LXC but can be used by
any run-time.")
(define-public libvirt
(package
(name "libvirt")
- (version "11.0.0")
+ (version "11.5.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://libvirt.org/sources/libvirt-";
version ".tar.xz"))
(sha256
- (base32 "0vl0lgzw3x4fkghhw7nfxk8fxj3bbn9f17y0hg7miba283zpd881"))
+ (base32 "08r4sxchhh639a8h346795971zz615j86v9z9vxf5q9q0pbbjqrb"))
(patches (search-patches "libvirt-add-install-prefix.patch"
"libvirt-respect-modules-path.patch"))))
(build-system meson-build-system)
@@ -1793,14 +1793,14 @@ three libraries:
(define-public python-libvirt
(package
(name "python-libvirt")
- (version "11.0.0")
+ (version "11.5.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://libvirt.org/sources/python/libvirt-python-";
version ".tar.gz"))
(sha256
- (base32 "1y26104zgylz0v9d6xc0bm6m13is94shn9dlhjycaf347jjjbs6f"))))
+ (base32 "08xcnzmahmb72rv9cw8dxwnjmrdgmm5j4bbxpwsnhll9qsgdiak9"))))
(build-system pyproject-build-system)
(inputs
(list libvirt))
