From 69119368fdc58820b1468ab41bf4be9e6ead2c23 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 4 Nov 2024 20:11:17 +0100 Subject: [PATCH 1/6] libvirt: 10.5.0 -> 10.9.0 --- pkgs/development/libraries/libvirt/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index f6e5807f6958..e99bc3d1d8c9 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -34,7 +34,7 @@ , stdenv , substituteAll , xhtml1 -, yajl +, json_c , writeScript , nixosTests @@ -114,13 +114,13 @@ stdenv.mkDerivation rec { # NOTE: You must also bump: # # SysVirt in - version = "10.5.0"; + version = "10.9.0"; src = fetchFromGitLab { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-Nku4l1f34NOUr23KWDH9uZu72OgMK3KfYjsRRbuTvf8="; + hash = "sha256-LYQYA5UIKYs+8rSNZDymmrxuTWsgmukP5Y17lGB5UQs="; fetchSubmodules = true; }; @@ -202,7 +202,7 @@ stdenv.mkDerivation rec { python3 readline xhtml1 - yajl + json_c ] ++ lib.optionals isLinux [ acl attr @@ -312,7 +312,7 @@ stdenv.mkDerivation rec { (feat "ssh_proxy" isLinux) (feat "tests" true) (feat "udev" isLinux) - (feat "yajl" true) + (feat "json_c" true) (driver "ch" isLinux) (driver "esx" true) From e6f77dadc335820672bc0ebb1940b9e578530d46 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 4 Nov 2024 20:11:25 +0100 Subject: [PATCH 2/6] python312Packages.libvirt: 10.5.0 -> 10.9.0 --- pkgs/development/python-modules/libvirt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix index 6dbb2c867112..d2a4acd7277e 100644 --- a/pkgs/development/python-modules/libvirt/default.nix +++ b/pkgs/development/python-modules/libvirt/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "libvirt"; - version = "10.5.0"; + version = "10.9.0"; pyproject = true; src = fetchFromGitLab { owner = "libvirt"; repo = "libvirt-python"; rev = "v${version}"; - hash = "sha256-dPjT9PRoUzNrY79yejAW/sbkMr0fpLif7IKZIW/K3KI="; + hash = "sha256-/kjpB19X90btIewW+hjLjLagJvI5X2oIHXpcSZVtu2I="; }; build-system = [ setuptools ]; From df6ffb01522b802fc69c4550bbf240baac2e92c2 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 4 Nov 2024 20:11:35 +0100 Subject: [PATCH 3/6] perlPackages.SysVirt: 10.2.0 -> 10.9.0 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6b709ce625f0..fa15b777e3a5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -24077,12 +24077,12 @@ with self; { SysVirt = buildPerlModule rec { pname = "Sys-Virt"; - version = "10.2.0"; + version = "10.9.0"; src = fetchFromGitLab { owner = "libvirt"; repo = "libvirt-perl"; rev = "v${version}"; - hash = "sha256-xpgZeXk9QefqbBMsvcMh/Cg/XFGEiVi3FbU/jBbSIr0="; + hash = "sha256-g2HH9Ep5cAa4qXo9/MKJmxeive6oqHQEX9C8qY+u2g4="; }; nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ]; From a96052fe5ffbfdf15287c8d5632947571b2402a4 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 7 Nov 2024 02:38:55 +0100 Subject: [PATCH 4/6] virt-manager: disable testCLI0263virt_xml --- pkgs/applications/virtualization/virt-manager/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 8546f64a55b0..d7e07ed311a3 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -97,6 +97,7 @@ python3.pkgs.buildPythonApplication rec { "test_misc_nonpredicatble_generate" "test_disk_dir_searchable" # does something strange with permissions "testCLI0001virt_install_many_devices" # expects /var to exist + "testCLI0263virt_xml" # depends on a specific libvirt version ]; preCheck = '' From b83eab78d7ec20068c73ef56e0e051755db07586 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 10 Nov 2024 01:33:15 +0100 Subject: [PATCH 5/6] libvirt: increase timeout on darwin --- pkgs/development/libraries/libvirt/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index e99bc3d1d8c9..b1e565266f86 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -163,6 +163,9 @@ stdenv.mkDerivation rec { sed -i '/qemuvhostusertest/d' tests/meson.build sed -i '/qemuxml2xmltest/d' tests/meson.build sed -i '/domaincapstest/d' tests/meson.build + # virshtest frequently times out on Darwin + substituteInPlace tests/meson.build \ + --replace-fail "data.get('timeout', 30)" "data.get('timeout', 120)" '' + lib.optionalString enableXen '' # Has various hardcoded paths that don't exist outside of a Xen dom0. sed -i '/libxlxml2domconfigtest/d' tests/meson.build From 09efcc6e4be945de29aeba093eca7c7d6cd47c40 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 10 Nov 2024 03:29:42 +0100 Subject: [PATCH 6/6] libvirt-glib: relax max stack size limit --- pkgs/by-name/li/libvirt-glib/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/li/libvirt-glib/package.nix b/pkgs/by-name/li/libvirt-glib/package.nix index c750d2a25551..472812e27d9e 100644 --- a/pkgs/by-name/li/libvirt-glib/package.nix +++ b/pkgs/by-name/li/libvirt-glib/package.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , meson , ninja , pkg-config @@ -28,6 +29,14 @@ stdenv.mkDerivation rec { sha256 = "m/7DRjgkFqNXXYcpm8ZBsqRkqlGf2bEofjGKpDovO4s="; }; + patches = [ + (fetchpatch { + name = "relax-max-stack-size-limit.patch"; + url = "https://gitlab.com/libvirt/libvirt-glib/-/commit/062f21ccaa810087637ae24e0eb69f1a0f0a45f5.patch"; + hash = "sha256-6mvINDd1HYS7oZsyNiyEwdNJfK5I5nPx86TRMq2RevA="; + }) + ]; + nativeBuildInputs = [ meson ninja