summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Hoffer <jhoffer@sansorgan.es>2022-11-28 00:33:59 -0700
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2022-11-28 10:48:36 +0000
commit1a25244bdb504a608e7fde3ee51a055ca6d6e78c (patch)
tree9b1ddc3afd8e7da5d1975b98baca98a8e4265dab
parenttagainijisho: 1.2.1 -> 1.2.2 (diff)
downloadnixpkgs-1a25244bdb504a608e7fde3ee51a055ca6d6e78c.tar.gz
libvirt, perlPackages.SysVirt: 8.8.0 -> 8.9.0
(cherry picked from commit 065af611420dc1ebb34cafc2265b649fb379896f)
-rw-r--r--pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch6
-rw-r--r--pkgs/development/libraries/libvirt/default.nix4
-rw-r--r--pkgs/development/python-modules/libvirt/default.nix4
-rw-r--r--pkgs/top-level/perl-packages.nix4
4 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch b/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch
index 0945f21211dc..b8d8ddcb1411 100644
--- a/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch
+++ b/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch
@@ -230,7 +230,7 @@ diff --git a/src/network/meson.build b/src/network/meson.build
index b5eff0c3ab..a0f26d624e 100644
--- a/src/network/meson.build
+++ b/src/network/meson.build
-@@ -73,11 +73,11 @@ if conf.has('WITH_NETWORK')
+@@ -73,11 +73,11 @@ 'in_file': files('virtnetworkd.init.in'),
}
virt_install_dirs += [
@@ -247,7 +247,7 @@ index b5eff0c3ab..a0f26d624e 100644
]
configure_file(
-@@ -85,12 +85,12 @@ if conf.has('WITH_NETWORK')
+@@ -85,12 +85,12 @@ input: 'default.xml.in',
output: '@BASENAME@',
copy: true,
install: true,
@@ -256,7 +256,7 @@ index b5eff0c3ab..a0f26d624e 100644
)
meson.add_install_script(
- meson_python_prog.path(), python3_prog.path(), meson_install_symlink_prog.path(),
+ meson_python_prog.full_path(), python3_prog.full_path(), meson_install_symlink_prog.full_path(),
- confdir / 'qemu' / 'networks' / 'autostart',
+ install_prefix + confdir / 'qemu' / 'networks' / 'autostart',
'../default.xml', 'default.xml',
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index a8f612678d04..49cf1907bfd9 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -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 = "8.8.0";
+ version = "8.9.0";
src = fetchFromGitLab {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "sha256-p7z+paiSeIm2cWnc6n9Hrd++BDmccGj+EOhqHNsJiXw=";
+ sha256 = "sha256-79frEYItbf1weOkrcyI/Z/TjTg6kLMQbteaTi9LAt0g=";
fetchSubmodules = true;
};
diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix
index 37114eb70c6f..a2f3f9c732a6 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.8.0";
+ version = "8.9.0";
src = fetchFromGitLab {
owner = "libvirt";
repo = "libvirt-python";
rev = "v${version}";
- sha256 = "sha256-UguqUsIfrql1UZeBoHLKXvLYuWicbJWamglkvqS++FI=";
+ sha256 = "sha256-vquchyGJlpg0R0R6Wh2MWB5RUZ3jzOQYzUoLwiLxIy8=";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index edbe364f7999..c8a0271098a0 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -22634,12 +22634,12 @@ let
SysVirt = buildPerlModule rec {
pname = "Sys-Virt";
- version = "8.8.0";
+ version = "8.9.0";
src = fetchFromGitLab {
owner = "libvirt";
repo = "libvirt-perl";
rev = "v${version}";
- hash = "sha256-8maLIW4hBbMbq+rnwEfaHsUgpppaU5K4aQTwTgUjdcI=";
+ hash = "sha256-s3N4KU0JnIXHKOme+2Vxapd6o8QeT6lUAb+r5i9Ogv0=";
};
nativeBuildInputs = [ pkgs.pkg-config ];
buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ];