diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-02-16 18:32:21 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-02-16 18:32:21 +0000 |
commit | 9becdcc5df71b47a5da84ad670e9a7eae9e0c65a (patch) | |
tree | 2ddf0335eb393f89501e3753b50c3f7ab0552d12 /nixpkgs/pkgs/development/libraries/libvirt/default.nix | |
parent | 49f2a77ac9abc88c253f68952eda26557fc3b555 (diff) | |
parent | ff96a0fa5635770390b184ae74debea75c3fd534 (diff) | |
download | nixlib-9becdcc5df71b47a5da84ad670e9a7eae9e0c65a.tar nixlib-9becdcc5df71b47a5da84ad670e9a7eae9e0c65a.tar.gz nixlib-9becdcc5df71b47a5da84ad670e9a7eae9e0c65a.tar.bz2 nixlib-9becdcc5df71b47a5da84ad670e9a7eae9e0c65a.tar.lz nixlib-9becdcc5df71b47a5da84ad670e9a7eae9e0c65a.tar.xz nixlib-9becdcc5df71b47a5da84ad670e9a7eae9e0c65a.tar.zst nixlib-9becdcc5df71b47a5da84ad670e9a7eae9e0c65a.zip |
nixpkgs: merge nixos-unstable
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libvirt/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/libvirt/default.nix | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libvirt/default.nix b/nixpkgs/pkgs/development/libraries/libvirt/default.nix index f3f48cec770b..100f79ae4e83 100644 --- a/nixpkgs/pkgs/development/libraries/libvirt/default.nix +++ b/nixpkgs/pkgs/development/libraries/libvirt/default.nix @@ -31,19 +31,19 @@ let }; in stdenv.mkDerivation rec { pname = "libvirt"; - version = "6.8.0"; + version = "7.0.0"; src = if buildFromTarball then fetchurl { url = "https://libvirt.org/sources/${pname}-${version}.tar.xz"; - sha256 = "0hhk2r0dnm9zmfwmnsnmnacm4pik6z60llp22axx7kcpqxv98nv5"; + sha256 = "12fxkpy7j2qhfxypw9jg3bzdd9xx6vf6x96iy5kjihh89n236f6a"; } else fetchgit { url = "https://gitlab.com/libvirt/libvirt.git"; rev = "v${version}"; - sha256 = "sha256-BQZPdmDE0g7xWd6QOHMKosP2HgVpIjsfgfohA9VxEHs="; + sha256 = "0xg9d410008mny73r2cp5ipghqpk0gz9gy7j32vcfk691dq75b3c"; fetchSubmodules = true; }; @@ -111,7 +111,6 @@ in stdenv.mkDerivation rec { "-Ddriver_esx=enabled" "-Ddriver_remote=enabled" "-Dpolkit=enabled" - "-Ddbus=enabled" (opt "storage_iscsi" enableIscsi) ] ++ optionals stdenv.isLinux [ (opt "storage_zfs" (zfs != null)) @@ -119,8 +118,6 @@ in stdenv.mkDerivation rec { "-Dapparmor=enabled" "-Dsecdriver_apparmor=enabled" "-Dnumad=enabled" - "-Dmacvtap=enabled" - "-Dvirtualport=enabled" "-Dstorage_disk=enabled" (opt "storage_rbd" enableCeph) ] ++ optionals stdenv.isDarwin [ |