b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

libvirt: 9.5.0 -> 9.6.0

Browse source
This commit is contained in:
Ilan Joselevich 2023-08-16 00:07:08 +00:00
parent 8ce8940e90
commit 3f2a40e34d
No known key found for this signature in database
3 changed files with 27 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -401,10 +401,10 @@ index 1bda59849b..392bc2cb2e 100644
] ]
endif endif
diff --git a/src/security/apparmor/meson.build b/src/security/apparmor/meson.build diff --git a/src/security/apparmor/meson.build b/src/security/apparmor/meson.build
index 990f00b4f3..e5a7a14e1d 100644 index b9257c816d..98701755d8 100644
--- a/src/security/apparmor/meson.build --- a/src/security/apparmor/meson.build
+++ b/src/security/apparmor/meson.build +++ b/src/security/apparmor/meson.build
@@ -19,22 +19,22 @@ foreach name : apparmor_gen_profiles @@ -57,7 +57,7 @@ foreach name : apparmor_gen_profiles
output: name, output: name,
configuration: apparmor_gen_profiles_conf, configuration: apparmor_gen_profiles_conf,
install: true, install: true,
@ -412,25 +412,32 @@ index 990f00b4f3..e5a7a14e1d 100644
+ install_dir: install_prefix + apparmor_dir, + install_dir: install_prefix + apparmor_dir,
) )
endforeach endforeach
install_data( @@ -68,13 +68,13 @@ foreach name : apparmor_gen_abstractions
[ 'libvirt-qemu', 'libvirt-lxc' ], command: apparmor_gen_cmd,
- install_dir: apparmor_dir / 'abstractions', capture: true,
+ install_dir: install_prefix + apparmor_dir / 'abstractions', install: true,
) - install_dir: apparmor_dir / 'abstractions',
+ install_dir: install_prefix + apparmor_dir / 'abstractions',
)
endforeach
install_data( install_data(
[ 'TEMPLATE.qemu', 'TEMPLATE.lxc' ], [ 'TEMPLATE.qemu', 'TEMPLATE.lxc' ],
- install_dir: apparmor_dir / 'libvirt', - install_dir: apparmor_dir / 'libvirt',
+ install_dir: install_prefix + apparmor_dir / 'libvirt', + install_dir: install_prefix + apparmor_dir / 'libvirt',
) )
install_data( if not conf.has('WITH_APPARMOR_3')
'usr.lib.libvirt.virt-aa-helper.local', @@ -83,7 +83,7 @@ if not conf.has('WITH_APPARMOR_3')
- install_dir: apparmor_dir / 'local', # files in order to limit the amount of filesystem clutter.
+ install_dir: install_prefix + apparmor_dir / 'local', install_data(
rename: 'usr.lib.libvirt.virt-aa-helper', 'usr.lib.libvirt.virt-aa-helper.local',
) - install_dir: apparmor_dir / 'local',
+ install_dir: install_prefix + apparmor_dir / 'local',
rename: 'usr.lib.libvirt.virt-aa-helper',
)
endif
diff --git a/src/storage/meson.build b/src/storage/meson.build diff --git a/src/storage/meson.build b/src/storage/meson.build
index 26e7ff1a1a..ad5c6eddc3 100644 index 26e7ff1a1a..ad5c6eddc3 100644
--- a/src/storage/meson.build --- a/src/storage/meson.build

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

@ -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 = "9.5.0"; version = "9.6.0";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-u+J1ejv7JH6Lcwk8zDVUS8Vk806WvG59rLAZr0UOqj0="; sha256 = "sha256-dQr6bUaZOX1MN+MZxbsPqbv3bsyyWBM0SBYlSnV04K0=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

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

@ -2,13 +2,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "libvirt"; pname = "libvirt";
version = "9.5.0"; version = "9.6.0";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "libvirt"; owner = "libvirt";
repo = "libvirt-python"; repo = "libvirt-python";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-DhScwkbyCluLc/V26Y6wbZfzo1WBcLswBVzLCGs0PPs="; hash = "sha256-DIyvd13BeKP4HzgHz1FGUTau19MJgBKPiHnpK5nq0os=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];