From 2bdcc9e537c50e0feee28d9f1c0e2f72887f3c44 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 18 Aug 2022 04:54:58 +0200 Subject: [PATCH 1/4] libvirt: 8.5.0 -> 8.6.0 --- pkgs/development/libraries/libvirt/default.nix | 4 ++-- pkgs/development/python-modules/libvirt/default.nix | 4 ++-- pkgs/top-level/perl-packages.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 0142ac4505f9..fff549bf7a48 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -113,13 +113,13 @@ stdenv.mkDerivation rec { # NOTE: You must also bump: # # SysVirt in - version = "8.5.0"; + version = "8.6.0"; src = fetchFromGitLab { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-x6TnMFYjcUSdQZd9ctN2hITCAl9TGVb7/qAObGb9xMk="; + sha256 = "sha256-bSId7G2o808WfHGt5ioFEIhPyy4+XW+R349UgHKOvQU="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix index c24a27e7d300..34909a2741a8 100644 --- a/pkgs/development/python-modules/libvirt/default.nix +++ b/pkgs/development/python-modules/libvirt/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "libvirt"; - version = "8.5.0"; + version = "8.6.0"; src = fetchFromGitLab { owner = "libvirt"; repo = "libvirt-python"; rev = "v${version}"; - sha256 = "sha256-/OS+qBo0h9jshKDuxKX++cRPAjegImQROb7Uh+imOUA="; + sha256 = "sha256-eJ0RPxJ4Gm+VGs6NeTWP2FbvDnJy4mURPlFbgvkSgo0="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2a4ff900d8bf..9bd853f1b377 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -21320,12 +21320,12 @@ let SysVirt = buildPerlModule rec { pname = "Sys-Virt"; - version = "8.4.0"; + version = "8.5.0"; src = fetchFromGitLab { owner = "libvirt"; repo = "libvirt-perl"; rev = "v${version}"; - sha256 = "sha256-nw9KG3dO0Oxre2NVp+4Z+kgIluU5j1xOu8grZJRXhik="; + sha256 = "sha256-VuM4rPrG15vXnF5e1MBSGB76zLI+8nkSiJmwWg8aJgE="; }; nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ]; From 602fcc8608cb270d53adc97dc4db3e955e6192c9 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 18 Aug 2022 04:54:12 +0200 Subject: [PATCH 2/4] libvirt: hardcode path to parted fixes #182835 --- pkgs/development/libraries/libvirt/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index fff549bf7a48..5f1b0cc00377 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -133,6 +133,10 @@ stdenv.mkDerivation rec { sed -i '/virnetsockettest/d' tests/meson.build # delete only the first occurrence of this sed -i '0,/qemuxml2argvtest/{/qemuxml2argvtest/d;}' tests/meson.build + '' + optionalString isLinux '' + sed -i 's,define PARTED "parted",define PARTED "${parted}/bin/parted",' \ + src/storage/storage_backend_disk.c \ + src/storage/storage_util.c '' + optionalString isDarwin '' sed -i '/qemucapabilitiestest/d' tests/meson.build sed -i '/vircryptotest/d' tests/meson.build From 3e373de30151f03ce839aabbf2c62d5e767b5dd3 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 18 Aug 2022 05:04:01 +0200 Subject: [PATCH 3/4] nixos/libvirtd: point qemu-bridge-helper to store path fixes #165897 --- nixos/modules/virtualisation/libvirtd.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index c2ff6b611af5..be6ebb3eacc9 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -282,7 +282,7 @@ in setuid = true; owner = "root"; group = "root"; - source = "/run/${dirName}/nix-helpers/qemu-bridge-helper"; + source = "${cfg.qemu.package}/libexec/qemu-bridge-helper"; }; systemd.packages = [ cfg.package ]; @@ -308,7 +308,7 @@ in ln -s --force "$emulator" /run/${dirName}/nix-emulators/ done - for helper in libexec/qemu-bridge-helper bin/qemu-pr-helper; do + for helper in bin/qemu-pr-helper; do ln -s --force ${cfg.qemu.package}/$helper /run/${dirName}/nix-helpers/ done From 38c67944cbcaa9ba5c0c52ee7260da4f845ca914 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 22 Aug 2022 05:17:06 +0200 Subject: [PATCH 4/4] nixos/tests/libvirtd: init --- nixos/tests/all-tests.nix | 1 + nixos/tests/libvirtd.nix | 49 +++++++++++++++++++ .../development/libraries/libvirt/default.nix | 3 ++ 3 files changed, 53 insertions(+) create mode 100644 nixos/tests/libvirtd.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index c718c292b257..b6192a5f26ad 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -284,6 +284,7 @@ in { libreswan = handleTest ./libreswan.nix {}; librewolf = handleTest ./firefox.nix { firefoxPackage = pkgs.librewolf; }; libuiohook = handleTest ./libuiohook.nix {}; + libvirtd = handleTest ./libvirtd.nix {}; lidarr = handleTest ./lidarr.nix {}; lightdm = handleTest ./lightdm.nix {}; lighttpd = handleTest ./lighttpd.nix {}; diff --git a/nixos/tests/libvirtd.nix b/nixos/tests/libvirtd.nix new file mode 100644 index 000000000000..1ab082c1e9d1 --- /dev/null +++ b/nixos/tests/libvirtd.nix @@ -0,0 +1,49 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "libvirtd"; + meta.maintainers = with pkgs.lib.maintainers; [ fpletz ]; + + nodes = { + virthost = + { pkgs, ... }: + { + virtualisation = { + cores = 2; + memorySize = 2048; + + libvirtd.enable = true; + }; + networking.nameservers = [ "192.168.122.1" ]; + security.polkit.enable = true; + environment.systemPackages = with pkgs; [ virt-manager ]; + }; + }; + + testScript = let + nixosInstallISO = (import ../release.nix {}).iso_minimal.${pkgs.hostPlatform.system}; + virshShutdownCmd = if pkgs.stdenv.isx86_64 then "shutdown" else "destroy"; + in '' + start_all() + + virthost.wait_for_unit("sockets.target") + + with subtest("enable default network"): + virthost.succeed("virsh net-start default") + virthost.succeed("virsh net-autostart default") + virthost.succeed("virsh net-info default") + + with subtest("check if partition disk pools works with parted"): + virthost.succeed("fallocate -l100m /tmp/foo; losetup /dev/loop0 /tmp/foo; echo 'label: dos' | sfdisk /dev/loop0") + virthost.succeed("virsh pool-create-as foo disk --source-dev /dev/loop0 --target /dev") + virthost.succeed("virsh vol-create-as foo loop0p1 25MB") + virthost.succeed("virsh vol-create-as foo loop0p2 50MB") + + with subtest("check if nixos install iso boots and network works"): + virthost.succeed( + "virt-install -n nixos --osinfo=nixos-unstable --ram=1024 --graphics=none --disk=`find ${nixosInstallISO}/iso -type f | head -n1`,readonly=on --import --noautoconsole" + ) + virthost.succeed("virsh domstate nixos | grep running") + virthost.wait_until_succeeds("ping -c 1 nixos") + virthost.succeed("virsh ${virshShutdownCmd} nixos") + virthost.wait_until_succeeds("virsh domstate nixos | grep 'shut off'") + ''; +}) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 5f1b0cc00377..adc9409ddf5c 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -36,6 +36,7 @@ , xhtml1 , yajl , writeScript +, nixosTests # Linux , acl ? null @@ -349,6 +350,8 @@ stdenv.mkDerivation rec { update-source-version perlPackages.SysVirt "$sysvirtVersion" --file="pkgs/top-level/perl-packages.nix" ''; + passthru.tests.libvirtd = nixosTests.libvirtd; + meta = { homepage = "https://libvirt.org/"; description = ''