libvirt: 11.0.0 -> 11.4.0 (#417265)

authored by philiptaron.tngl.sh and committed by GitHub 2e99aa1e 4011114b

+29 -36
+23 -30
pkgs/by-name/li/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch
··· 402 402 ] 403 403 endif 404 404 diff --git a/src/security/apparmor/meson.build b/src/security/apparmor/meson.build 405 - index b9257c816d..98701755d8 100644 405 + index 09d9fac02c..ee0c74ceec 100644 406 406 --- a/src/security/apparmor/meson.build 407 407 +++ b/src/security/apparmor/meson.build 408 - @@ -57,7 +57,7 @@ foreach name : apparmor_gen_profiles 408 + @@ -20,16 +20,16 @@ foreach name : apparmor_gen_profiles 409 409 output: name, 410 410 configuration: apparmor_gen_profiles_conf, 411 411 install: true, ··· 413 413 + install_dir: install_prefix + apparmor_dir, 414 414 ) 415 415 endforeach 416 - 417 - @@ -68,13 +68,13 @@ foreach name : apparmor_gen_abstractions 418 - command: apparmor_gen_cmd, 419 - capture: true, 420 - install: true, 421 - - install_dir: apparmor_dir / 'abstractions', 422 - + install_dir: install_prefix + apparmor_dir / 'abstractions', 423 - ) 424 - endforeach 425 - 416 + 417 + install_data( 418 + [ 'libvirt-qemu', 'libvirt-lxc' ], 419 + - install_dir: apparmor_dir / 'abstractions', 420 + + install_dir: install_prefix + apparmor_dir / 'abstractions', 421 + ) 422 + 426 423 install_data( 427 424 [ 'TEMPLATE.qemu', 'TEMPLATE.lxc' ], 428 425 - install_dir: apparmor_dir / 'libvirt', 429 426 + install_dir: install_prefix + apparmor_dir / 'libvirt', 430 427 ) 431 - 432 - if not conf.has('WITH_APPARMOR_3') 433 - @@ -83,7 +83,7 @@ if not conf.has('WITH_APPARMOR_3') 434 - # files in order to limit the amount of filesystem clutter. 435 - install_data( 436 - 'usr.lib.libvirt.virt-aa-helper.local', 437 - - install_dir: apparmor_dir / 'local', 438 - + install_dir: install_prefix + apparmor_dir / 'local', 439 - rename: 'usr.lib.libvirt.virt-aa-helper', 440 - ) 441 - endif 442 428 diff --git a/src/storage/meson.build b/src/storage/meson.build 443 429 index 404d6a6941..fb4e67a0a8 100644 444 430 --- a/src/storage/meson.build 445 431 +++ b/src/storage/meson.build 446 432 @@ -126,9 +126,9 @@ if conf.has('WITH_STORAGE') 447 433 } 448 - 434 + 449 435 virt_install_dirs += [ 450 436 - confdir / 'storage', 451 437 - confdir / 'storage' / 'autostart', ··· 455 441 + install_prefix + runstatedir / 'libvirt' / 'storage', 456 442 ] 457 443 endif 458 - 444 + 459 445 diff --git a/tools/meson.build b/tools/meson.build 460 - index 1bb84be0be..e04a4e986d 100644 446 + index a099148d3c..d0d6510f17 100644 461 447 --- a/tools/meson.build 462 448 +++ b/tools/meson.build 463 - @@ -121,7 +121,7 @@ if conf.has('WITH_LOGIN_SHELL') 449 + @@ -123,12 +123,12 @@ if conf.has('WITH_LOGIN_SHELL') 464 450 install_rpath: libvirt_rpath, 465 451 ) 466 - 452 + 467 453 - install_data('virt-login-shell.conf', install_dir: sysconfdir / 'libvirt') 468 454 + install_data('virt-login-shell.conf', install_dir: install_prefix + sysconfdir / 'libvirt') 455 + 456 + # Install the sysuser config for the setgid binary 457 + install_data( 458 + 'libvirt-login-shell.sysusers.conf', 459 + - install_dir: sysusersdir, 460 + + install_dir: install_prefix + sysusersdir, 461 + rename: [ 'libvirt-login-shell.conf' ], 462 + ) 469 463 endif 470 - 471 - if host_machine.system() == 'windows' 464 + 472 465 diff --git a/tools/ssh-proxy/meson.build b/tools/ssh-proxy/meson.build 473 466 index e9f312fa25..95d5d8fe0b 100644 474 467 --- a/tools/ssh-proxy/meson.build
+2 -2
pkgs/by-name/li/libvirt/package.nix
··· 115 115 stdenv.mkDerivation rec { 116 116 pname = "libvirt"; 117 117 # if you update, also bump <nixpkgs/pkgs/development/python-modules/libvirt/default.nix> and SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix> 118 - version = "11.0.0"; 118 + version = "11.4.0"; 119 119 120 120 src = fetchFromGitLab { 121 121 owner = "libvirt"; 122 122 repo = "libvirt"; 123 123 tag = "v${version}"; 124 124 fetchSubmodules = true; 125 - hash = "sha256-QxyOc/RbWZnjA4XIDNK7xZqBcP2ciHsOlszaa5pl6XA="; 125 + hash = "sha256-0bOX95Ly8d1/XZan/EyxI6JaACJvOu9QsTkFNQTreqI="; 126 126 }; 127 127 128 128 patches =
+2 -2
pkgs/development/python-modules/libvirt/default.nix
··· 12 12 13 13 buildPythonPackage rec { 14 14 pname = "libvirt"; 15 - version = "11.0.0"; 15 + version = "11.4.0"; 16 16 pyproject = true; 17 17 18 18 src = fetchFromGitLab { 19 19 owner = "libvirt"; 20 20 repo = "libvirt-python"; 21 21 tag = "v${version}"; 22 - hash = "sha256-c6viZTQFpLB+k/f45m/AZe+ggDxQbGjQgD51yCuyepc="; 22 + hash = "sha256-jI14/lBuqSqI8mnTa7dqa+B+6tU2erW6wlT8E0eTgtY="; 23 23 }; 24 24 25 25 postPatch = ''
+2 -2
pkgs/top-level/perl-packages.nix
··· 32322 32322 32323 32323 SysVirt = buildPerlModule rec { 32324 32324 pname = "Sys-Virt"; 32325 - version = "11.0.0"; 32325 + version = "11.2.0"; 32326 32326 src = fetchFromGitLab { 32327 32327 owner = "libvirt"; 32328 32328 repo = "libvirt-perl"; 32329 32329 tag = "v${version}"; 32330 - hash = "sha256-k1fpVLWbFgZOUvCPLN6EpYgSfpwig5mHiWMRo8iRvZc="; 32330 + hash = "sha256-e/Zb9ox/ehfybpxiCAsEl97T1vjBNpRYJK/kmehPHsY="; 32331 32331 }; 32332 32332 nativeBuildInputs = [ pkgs.pkg-config ]; 32333 32333 buildInputs = [