alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #211194 from fpletz/pkgs/libvirt-9.0.0

Browse source
This commit is contained in:
Franz Pletz 2023-01-20 14:11:57 +01:00 committed by GitHub
parent 2305457d52 608528afe6
commit 750788e804
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch
View file

@ -305,7 +305,7 @@ diff --git a/src/qemu/meson.build b/src/qemu/meson.build
index 39f0f615cc..5f6f30f82b 100644 index 39f0f615cc..5f6f30f82b 100644
--- a/src/qemu/meson.build --- a/src/qemu/meson.build
+++ b/src/qemu/meson.build +++ b/src/qemu/meson.build
@@ -175,24 +175,24 @@ if conf.has('WITH_QEMU') @@ -200,25 +200,25 @@ if conf.has('WITH_QEMU')
endif endif
virt_install_dirs += [ virt_install_dirs += [
@ -326,6 +326,7 @@ index 39f0f615cc..5f6f30f82b 100644
- localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu', - localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu',
- runstatedir / 'libvirt' / 'qemu', - runstatedir / 'libvirt' / 'qemu',
- runstatedir / 'libvirt' / 'qemu' / 'dbus', - runstatedir / 'libvirt' / 'qemu' / 'dbus',
- runstatedir / 'libvirt' / 'qemu' / 'passt',
- runstatedir / 'libvirt' / 'qemu' / 'slirp', - runstatedir / 'libvirt' / 'qemu' / 'slirp',
- runstatedir / 'libvirt' / 'qemu' / 'swtpm', - runstatedir / 'libvirt' / 'qemu' / 'swtpm',
+ install_prefix + confdir / 'qemu', + install_prefix + confdir / 'qemu',
@ -345,6 +346,7 @@ index 39f0f615cc..5f6f30f82b 100644
+ install_prefix + localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu', + install_prefix + localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu',
+ install_prefix + runstatedir / 'libvirt' / 'qemu', + install_prefix + runstatedir / 'libvirt' / 'qemu',
+ install_prefix + runstatedir / 'libvirt' / 'qemu' / 'dbus', + install_prefix + runstatedir / 'libvirt' / 'qemu' / 'dbus',
+ install_prefix + runstatedir / 'libvirt' / 'qemu' / 'passt',
+ install_prefix + runstatedir / 'libvirt' / 'qemu' / 'slirp', + install_prefix + runstatedir / 'libvirt' / 'qemu' / 'slirp',
+ install_prefix + runstatedir / 'libvirt' / 'qemu' / 'swtpm', + install_prefix + runstatedir / 'libvirt' / 'qemu' / 'swtpm',
] ]

8
pkgs/development/libraries/libvirt/default.nix
View file

@ -42,7 +42,7 @@
, attr ? null , attr ? null
, audit ? null , audit ? null
, dmidecode ? null , dmidecode ? null
, fuse ? null , fuse3 ? null
, kmod ? null , kmod ? null
, libapparmor ? null , libapparmor ? null
, libcap_ng ? null , libcap_ng ? null
@ -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 = "8.10.0"; version = "9.0.0";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-MboJLQ0R3l9lUQDjNVACvmxISjypvfxxMHSKF0+k6WM="; sha256 = "sha256-YnkgTl6C3QkvMBGm95JgWmWaP4mAECe9B0wwjOx94p8=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -201,7 +201,7 @@ stdenv.mkDerivation rec {
acl acl
attr attr
audit audit
fuse fuse3
libapparmor libapparmor
libcap_ng libcap_ng
libnl libnl

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

@ -2,13 +2,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "libvirt"; pname = "libvirt";
version = "8.10.0"; version = "9.0.0";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "libvirt"; owner = "libvirt";
repo = "libvirt-python"; repo = "libvirt-python";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-f2ZWBNCgylKQCmbLCaJsIb5alvZDRZUWQAMOMsxwGbk="; sha256 = "sha256-/u6sctXn4Jmn2bUl1FjjrKpHReaTg+O9LprKXx3OAyU=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

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

@ -22646,12 +22646,12 @@ let
SysVirt = buildPerlModule rec { SysVirt = buildPerlModule rec {
pname = "Sys-Virt"; pname = "Sys-Virt";
version = "8.10.0"; version = "9.0.0";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "libvirt"; owner = "libvirt";
repo = "libvirt-perl"; repo = "libvirt-perl";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-rVTofRtnYDF5CmWp3SB2+kJZz4u6+OTzNAUwiDrqdTo="; hash = "sha256-QiaB272kxs/Y3/l8KbFy8f9iyOCxhzfA/h2FnfGzmE4=";
}; };
nativeBuildInputs = [ pkgs.pkg-config ]; nativeBuildInputs = [ pkgs.pkg-config ];
buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ]; buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ];