libvirt: 10.5.0 -> 10.9.0 (#353684) (9e1f7a1f) · Commits · nix / nixpkgs

pkgs/applications/virtualization/virt-manager/default.nix

+1 −0

Original line number	Diff line number	Diff line
		@@ -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 = ''

+9 −0

Original line number	Diff line number	Diff line
		{ 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

+8 −5

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@
		, stdenv
		, substituteAll
		, xhtml1
		, yajl
		, json_c
		, writeScript
		, nixosTests

		@@ -114,13 +114,13 @@ stdenv.mkDerivation rec {
		# NOTE: You must also bump:
		# <nixpkgs/pkgs/development/python-modules/libvirt/default.nix>
		# SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix>
		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;
		};

		@@ -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
		@@ -202,7 +205,7 @@ stdenv.mkDerivation rec {
		python3
		readline
		xhtml1
		yajl
		json_c
		] ++ lib.optionals isLinux [
		acl
		attr
		@@ -312,7 +315,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)

+2 −2

Original line number	Diff line number	Diff line
		@@ -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 ];

+2 −2

Original line number	Diff line number	Diff line
		@@ -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 ];