From 3addbfc1eb2167e9460177e697a6d701e45f3a94 Mon Sep 17 00:00:00 2001 From: Philipp Schuster Date: Mon, 16 Jun 2025 17:27:14 +0200 Subject: [PATCH] libvirt: 11.0.0 -> 11.4.0 Signed-off-by: Philipp Schuster On-behalf-of: SAP philipp.schuster@sap.com --- ...n-install-prefix-for-building-on-nix.patch | 53 ++++++++----------- pkgs/by-name/li/libvirt/package.nix | 4 +- .../python-modules/libvirt/default.nix | 4 +- pkgs/top-level/perl-packages.nix | 4 +- 4 files changed, 29 insertions(+), 36 deletions(-) diff --git a/pkgs/by-name/li/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch b/pkgs/by-name/li/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch index 5345dffc0445..cc4981130eeb 100644 --- a/pkgs/by-name/li/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch +++ b/pkgs/by-name/li/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch @@ -402,10 +402,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, @@ -413,39 +413,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', @@ -455,20 +441,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/pkgs/by-name/li/libvirt/package.nix b/pkgs/by-name/li/libvirt/package.nix index 496834f8cf5e..5d987089f704 100644 --- a/pkgs/by-name/li/libvirt/package.nix +++ b/pkgs/by-name/li/libvirt/package.nix @@ -115,14 +115,14 @@ assert enableZfs -> isLinux; stdenv.mkDerivation rec { pname = "libvirt"; # if you update, also bump and SysVirt in - version = "11.0.0"; + version = "11.4.0"; src = fetchFromGitLab { owner = "libvirt"; repo = "libvirt"; tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-QxyOc/RbWZnjA4XIDNK7xZqBcP2ciHsOlszaa5pl6XA="; + hash = "sha256-0bOX95Ly8d1/XZan/EyxI6JaACJvOu9QsTkFNQTreqI="; }; patches = diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix index c8f59352cab4..891965e2e941 100644 --- a/pkgs/development/python-modules/libvirt/default.nix +++ b/pkgs/development/python-modules/libvirt/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "libvirt"; - version = "11.0.0"; + version = "11.4.0"; pyproject = true; src = fetchFromGitLab { owner = "libvirt"; repo = "libvirt-python"; tag = "v${version}"; - hash = "sha256-c6viZTQFpLB+k/f45m/AZe+ggDxQbGjQgD51yCuyepc="; + hash = "sha256-jI14/lBuqSqI8mnTa7dqa+B+6tU2erW6wlT8E0eTgtY="; }; postPatch = '' diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6d9f31dc446f..7396e66144e0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -32337,12 +32337,12 @@ with self; SysVirt = buildPerlModule rec { pname = "Sys-Virt"; - version = "11.0.0"; + version = "11.2.0"; src = fetchFromGitLab { owner = "libvirt"; repo = "libvirt-perl"; tag = "v${version}"; - hash = "sha256-k1fpVLWbFgZOUvCPLN6EpYgSfpwig5mHiWMRo8iRvZc="; + hash = "sha256-e/Zb9ox/ehfybpxiCAsEl97T1vjBNpRYJK/kmehPHsY="; }; nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = [