nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-16 17:14:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

libvirt: 10.5.0 -> 10.9.0 (#353684)

Browse Source
This commit is contained in:
Austin Horstman 2024-11-10 10:10:58 -06:00 committed by GitHub
commit 9e1f7a1fc7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/applications/virtualization/virt-manager/default.nix
View File

@ -97,6 +97,7 @@ python3.pkgs.buildPythonApplication rec {
"test_misc_nonpredicatble_generate" "test_misc_nonpredicatble_generate"
"test_disk_dir_searchable" # does something strange with permissions "test_disk_dir_searchable" # does something strange with permissions
"testCLI0001virt_install_many_devices" # expects /var to exist "testCLI0001virt_install_many_devices" # expects /var to exist
"testCLI0263virt_xml" # depends on a specific libvirt version
]; ];
preCheck = '' preCheck = ''

9
pkgs/by-name/li/libvirt-glib/package.nix
View File

@ -1,6 +1,7 @@
{ lib { lib
, stdenv , stdenv
, fetchurl , fetchurl
, fetchpatch
, meson , meson
, ninja , ninja
, pkg-config , pkg-config
@ -28,6 +29,14 @@ stdenv.mkDerivation rec {
sha256 = "m/7DRjgkFqNXXYcpm8ZBsqRkqlGf2bEofjGKpDovO4s="; 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 = [ nativeBuildInputs = [
meson meson
ninja ninja

13
pkgs/development/libraries/libvirt/default.nix
View File

@ -34,7 +34,7 @@
, stdenv , stdenv
, substituteAll , substituteAll
, xhtml1 , xhtml1
, yajl , json_c
, writeScript , writeScript
, nixosTests , nixosTests
@ -114,13 +114,13 @@ stdenv.mkDerivation rec {
# NOTE: You must also bump: # NOTE: You must also bump:
# <nixpkgs/pkgs/development/python-modules/libvirt/default.nix> # <nixpkgs/pkgs/development/python-modules/libvirt/default.nix>
# SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix> # SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix>
version = "10.5.0"; version = "10.9.0";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-Nku4l1f34NOUr23KWDH9uZu72OgMK3KfYjsRRbuTvf8="; hash = "sha256-LYQYA5UIKYs+8rSNZDymmrxuTWsgmukP5Y17lGB5UQs=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -163,6 +163,9 @@ stdenv.mkDerivation rec {
sed -i '/qemuvhostusertest/d' tests/meson.build sed -i '/qemuvhostusertest/d' tests/meson.build
sed -i '/qemuxml2xmltest/d' tests/meson.build sed -i '/qemuxml2xmltest/d' tests/meson.build
sed -i '/domaincapstest/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 '' '' + lib.optionalString enableXen ''
# Has various hardcoded paths that don't exist outside of a Xen dom0. # Has various hardcoded paths that don't exist outside of a Xen dom0.
sed -i '/libxlxml2domconfigtest/d' tests/meson.build sed -i '/libxlxml2domconfigtest/d' tests/meson.build
@ -202,7 +205,7 @@ stdenv.mkDerivation rec {
python3 python3
readline readline
xhtml1 xhtml1
yajl json_c
] ++ lib.optionals isLinux [ ] ++ lib.optionals isLinux [
acl acl
attr attr
@ -312,7 +315,7 @@ stdenv.mkDerivation rec {
(feat "ssh_proxy" isLinux) (feat "ssh_proxy" isLinux)
(feat "tests" true) (feat "tests" true)
(feat "udev" isLinux) (feat "udev" isLinux)
(feat "yajl" true) (feat "json_c" true)
(driver "ch" isLinux) (driver "ch" isLinux)
(driver "esx" true) (driver "esx" true)

4
pkgs/development/python-modules/libvirt/default.nix
View File

@ -11,14 +11,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "libvirt"; pname = "libvirt";
version = "10.5.0"; version = "10.9.0";
pyproject = true; pyproject = true;
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "libvirt"; owner = "libvirt";
repo = "libvirt-python"; repo = "libvirt-python";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-dPjT9PRoUzNrY79yejAW/sbkMr0fpLif7IKZIW/K3KI="; hash = "sha256-/kjpB19X90btIewW+hjLjLagJvI5X2oIHXpcSZVtu2I=";
}; };
build-system = [ setuptools ]; build-system = [ setuptools ];

4
pkgs/top-level/perl-packages.nix
View File

@ -24077,12 +24077,12 @@ with self; {
SysVirt = buildPerlModule rec { SysVirt = buildPerlModule rec {
pname = "Sys-Virt"; pname = "Sys-Virt";
version = "10.2.0"; version = "10.9.0";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "libvirt"; owner = "libvirt";
repo = "libvirt-perl"; repo = "libvirt-perl";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-xpgZeXk9QefqbBMsvcMh/Cg/XFGEiVi3FbU/jBbSIr0="; hash = "sha256-g2HH9Ep5cAa4qXo9/MKJmxeive6oqHQEX9C8qY+u2g4=";
}; };
nativeBuildInputs = [ pkgs.pkg-config ]; nativeBuildInputs = [ pkgs.pkg-config ];
buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ]; buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ];