libvirt: 9.5.0 -> 9.6.0
This commit is contained in:
parent
8ce8940e90
commit
3f2a40e34d
|
@ -401,10 +401,10 @@ index 1bda59849b..392bc2cb2e 100644
|
|||
]
|
||||
endif
|
||||
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
|
||||
+++ 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,
|
||||
configuration: apparmor_gen_profiles_conf,
|
||||
install: true,
|
||||
|
@ -413,11 +413,14 @@ index 990f00b4f3..e5a7a14e1d 100644
|
|||
)
|
||||
endforeach
|
||||
|
||||
install_data(
|
||||
[ 'libvirt-qemu', 'libvirt-lxc' ],
|
||||
- install_dir: apparmor_dir / 'abstractions',
|
||||
+ install_dir: install_prefix + apparmor_dir / 'abstractions',
|
||||
)
|
||||
@@ -68,13 +68,13 @@ foreach name : apparmor_gen_abstractions
|
||||
command: apparmor_gen_cmd,
|
||||
capture: true,
|
||||
install: true,
|
||||
- install_dir: apparmor_dir / 'abstractions',
|
||||
+ install_dir: install_prefix + apparmor_dir / 'abstractions',
|
||||
)
|
||||
endforeach
|
||||
|
||||
install_data(
|
||||
[ 'TEMPLATE.qemu', 'TEMPLATE.lxc' ],
|
||||
|
@ -425,12 +428,16 @@ index 990f00b4f3..e5a7a14e1d 100644
|
|||
+ install_dir: install_prefix + apparmor_dir / 'libvirt',
|
||||
)
|
||||
|
||||
install_data(
|
||||
'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',
|
||||
)
|
||||
if not conf.has('WITH_APPARMOR_3')
|
||||
@@ -83,7 +83,7 @@ if not conf.has('WITH_APPARMOR_3')
|
||||
# files in order to limit the amount of filesystem clutter.
|
||||
install_data(
|
||||
'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
|
||||
index 26e7ff1a1a..ad5c6eddc3 100644
|
||||
--- a/src/storage/meson.build
|
||||
|
|
|
@ -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 = "9.5.0";
|
||||
version = "9.6.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-u+J1ejv7JH6Lcwk8zDVUS8Vk806WvG59rLAZr0UOqj0=";
|
||||
sha256 = "sha256-dQr6bUaZOX1MN+MZxbsPqbv3bsyyWBM0SBYlSnV04K0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "libvirt";
|
||||
version = "9.5.0";
|
||||
version = "9.6.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "libvirt";
|
||||
repo = "libvirt-python";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-DhScwkbyCluLc/V26Y6wbZfzo1WBcLswBVzLCGs0PPs=";
|
||||
hash = "sha256-DIyvd13BeKP4HzgHz1FGUTau19MJgBKPiHnpK5nq0os=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
Loading…
Reference in a new issue