cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #81161 from wedens/libvirt-6.0.0

Browse source 
libvirt: 5.4.0 -> 6.1.0
This commit is contained in:
Robin Gloster 2020-03-30 13:19:00 +00:00 committed by GitHub
commit d6fa642608
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 204 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
nixos/modules/tasks/network-interfaces-scripted.nix
View file

@ -291,13 +291,19 @@ let
${optionalString config.virtualisation.libvirtd.enable ''
# Enslave dynamically added interfaces which may be lost on nixos-rebuild
for uri in qemu:///system lxc:///; do
for dom in $(${pkgs.libvirt}/bin/virsh -c $uri list --name); do
${pkgs.libvirt}/bin/virsh -c $uri dumpxml "$dom" | \
${pkgs.xmlstarlet}/bin/xmlstarlet sel -t -m "//domain/devices/interface[@type='bridge'][source/@bridge='${n}'][target/@dev]" -v "concat('ip link set ',target/@dev,' master ',source/@bridge,';')" | \
${pkgs.bash}/bin/bash
#
# if `libvirtd.service` is not running, do not use `virsh` which would try activate it via 'libvirtd.socket' and thus start it out-of-order.
# `libvirtd.service` will set up bridge interfaces when it will start normally.
#
if ${pkgs.systemd}/bin/systemctl --quiet is-active 'libvirtd.service'; then
for uri in qemu:///system lxc:///; do
for dom in $(${pkgs.libvirt}/bin/virsh -c $uri list --name); do
${pkgs.libvirt}/bin/virsh -c $uri dumpxml "$dom" | \
${pkgs.xmlstarlet}/bin/xmlstarlet sel -t -m "//domain/devices/interface[@type='bridge'][source/@bridge='${n}'][target/@dev]" -v "concat('ip link set ',target/@dev,' master ',source/@bridge,';')" | \
${pkgs.bash}/bin/bash
done
done
done
fi
''}
# Enable stp on the interface

11
nixos/modules/virtualisation/libvirtd.nix
View file

@ -214,14 +214,14 @@ in {
};
systemd.services.libvirtd = {
description = "Libvirt Virtual Machine Management Daemon";
wantedBy = [ "multi-user.target" ];
requires = [ "libvirtd-config.service" ];
after = [ "systemd-udev-settle.service" "libvirtd-config.service" ]
++ optional vswitch.enable "ovs-vswitchd.service";
environment.LIBVIRTD_ARGS = ''--config "${configFile}" ${concatStringsSep " " cfg.extraOptions}'';
environment.LIBVIRTD_ARGS = escapeShellArgs (
[ "--config" configFile
"--timeout" "120" # from ${libvirt}/var/lib/sysconfig/libvirtd
] ++ cfg.extraOptions);
path = [ cfg.qemuPackage ] # libvirtd requires qemu-img to manage disk images
++ optional vswitch.enable vswitch.package;
@ -266,5 +266,8 @@ in {
serviceConfig.ExecStart = "@${pkgs.libvirt}/sbin/virtlockd virtlockd";
restartIfChanged = false;
};
systemd.sockets.libvirtd .wantedBy = [ "sockets.target" ];
systemd.sockets.libvirtd-tcp.wantedBy = [ "sockets.target" ];
};
}

136
pkgs/development/libraries/libvirt/5.9.0.nix Normal file
View file

@ -0,0 +1,136 @@
{ stdenv, fetchurl, fetchgit
, pkgconfig, makeWrapper, libtool, autoconf, automake, fetchpatch
, coreutils, libxml2, gnutls, perl, python2, attr
, iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext
, libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor
, dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages
, curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode, glib
, enableXen ? false, xen ? null
, enableIscsi ? false, openiscsi
, enableCeph ? false, ceph
}:
with stdenv.lib;
# if you update, also bump <nixpkgs/pkgs/development/python-modules/libvirt/default.nix> and SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix>
let
buildFromTarball = stdenv.isDarwin;
in stdenv.mkDerivation rec {
pname = "libvirt";
version = "5.9.0";
src =
if buildFromTarball then
fetchurl {
url = "http://libvirt.org/sources/${pname}-${version}.tar.xz";
sha256 = "0fc9jxw3v6x5hc10bkd7bbcayn24hbld5adj2gh5s648v7hx55il";
}
else
fetchgit {
url = git://libvirt.org/libvirt.git;
rev = "v${version}";
sha256 = "0smm77ag8bg24xkbhl4akqikjrsq2pd3wk31nj0hk1avqnl00gmk";
fetchSubmodules = true;
};
nativeBuildInputs = [ makeWrapper pkgconfig ];
buildInputs = [
libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl
libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib
] ++ optionals (!buildFromTarball) [
libtool autoconf automake
] ++ optionals stdenv.isLinux [
libpciaccess lvm2 utillinux systemd libnl numad zfs
libapparmor libcap_ng numactl attr parted
] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [
xen
] ++ optionals enableIscsi [
openiscsi
] ++ optionals enableCeph [
ceph
] ++ optionals stdenv.isDarwin [
libiconv gmp
];
preConfigure = ''
${ optionalString (!buildFromTarball) "./bootstrap --no-git --gnulib-srcdir=$(pwd)/.gnulib" }
PATH=${stdenv.lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute iptables ebtables lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH
# the path to qemu-kvm will be stored in VM's .xml and .save files
# do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations
substituteInPlace src/lxc/lxc_conf.c \
--replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",'
patchShebangs . # fixes /usr/bin/python references
'';
configureFlags = [
"--localstatedir=/var"
"--sysconfdir=/var/lib"
"--with-libpcap"
"--with-qemu"
"--with-vmware"
"--with-vbox"
"--with-test"
"--with-esx"
"--with-remote"
] ++ optionals stdenv.isLinux [
"QEMU_BRIDGE_HELPER=/run/wrappers/bin/qemu-bridge-helper"
"QEMU_PR_HELPER=/run/libvirt/nix-helpers/qemu-pr-helper"
"EBTABLES_PATH=${ebtables}/bin/ebtables-legacy"
"--with-attr"
"--with-apparmor"
"--with-secdriver-apparmor"
"--with-numad"
"--with-macvtap"
"--with-virtualport"
"--with-storage-disk"
] ++ optionals (stdenv.isLinux && zfs != null) [
"--with-storage-zfs"
] ++ optionals enableIscsi [
"--with-storage-iscsi"
] ++ optionals enableCeph [
"--with-storage-rbd"
] ++ optionals stdenv.isDarwin [
"--with-init-script=none"
];
installFlags = [
"localstatedir=$(TMPDIR)/var"
"sysconfdir=$(out)/var/lib"
];
postInstall = let
binPath = [ iptables iproute pmutils numad numactl bridge-utils dmidecode dnsmasq ebtables ] ++ optionals enableIscsi [ openiscsi ];
in ''
substituteInPlace $out/libexec/libvirt-guests.sh \
--replace 'ON_BOOT=start' 'ON_BOOT=''${ON_BOOT:-start}' \
--replace 'ON_SHUTDOWN=suspend' 'ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}' \
--replace "$out/bin" '${gettext}/bin' \
--replace 'lock/subsys' 'lock' \
--replace 'gettext.sh' 'gettext.sh
# Added in nixpkgs:
gettext() { "${gettext}/bin/gettext" "$@"; }
'
'' + optionalString stdenv.isLinux ''
substituteInPlace $out/lib/systemd/system/libvirtd.service --replace /bin/kill ${coreutils}/bin/kill
rm $out/lib/systemd/system/{virtlockd,virtlogd}.*
wrapProgram $out/sbin/libvirtd \
--prefix PATH : /run/libvirt/nix-emulators:${makeBinPath binPath}
'';
enableParallelBuilding = true;
NIX_CFLAGS_COMPILE = "-fno-stack-protector";
meta = {
homepage = http://libvirt.org/;
repositories.git = git://libvirt.org/libvirt.git;
description = ''
A toolkit to interact with the virtualization capabilities of recent
versions of Linux (and other OSes)
'';
license = licenses.lgpl2Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ fpletz globin ];
};
}

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

@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchgit
, pkgconfig, makeWrapper, libtool, autoconf, automake, fetchpatch
, coreutils, libxml2, gnutls, perl, python2, attr
, pkgconfig, makeWrapper, autoreconfHook, fetchpatch
, coreutils, libxml2, gnutls, perl, python2, attr, glib, docutils
, iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext
, libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor
, dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages
@ -17,52 +17,26 @@ let
buildFromTarball = stdenv.isDarwin;
in stdenv.mkDerivation rec {
pname = "libvirt";
version = "5.4.0";
version = "6.1.0";
src =
if buildFromTarball then
fetchurl {
url = "http://libvirt.org/sources/${pname}-${version}.tar.xz";
sha256 = "0ywf8m9yz2hxnic7fylzlmgy4m353r4vv5zsvp89zq5yh4h81yhw";
sha256 = "1h7bmd7zgl64mwnxx4ji8l0mqmcbfxsx6kp1scyyfq2mwidihz0n";
}
else
fetchgit {
url = git://libvirt.org/libvirt.git;
rev = "v${version}";
sha256 = "1dja1mf295w0sl83zag62c4j55cfbzzfbhdxpkyv2zm3zv0mwdyc";
sha256 = "18sr3jvpxn45c4vrjzpa4qgnnfxxh95v6l6qk31zka3siv8rrwqx";
fetchSubmodules = true;
};
patches = optionals (!stdenv.isDarwin) [
(fetchpatch {
name = "5.4.0-CVE-2019-10161.patch";
url = "https://libvirt.org/git/?p=libvirt.git;a=patch;h=aed6a032cead4386472afb24b16196579e239580";
sha256 = "19k9z9xx68nf03igbgy1imxnlp5ppj7cgdbq9kri3s834hkjcygs";
})
] ++ [
(fetchpatch {
name = "5.4.0-CVE-2019-10166.patch";
url = "https://libvirt.org/git/?p=libvirt.git;a=patch;h=db0b78457f183e4c7ac45bc94de86044a1e2056a";
sha256 = "17pd1rab2mxj4q0vg30vi2gh78mf52ik1p5l12wrghb0wjf7swml";
})
(fetchpatch {
name = "5.4.0-CVE-2019-10167.patch";
url = "https://libvirt.org/git/?p=libvirt.git;a=patch;h=8afa68bac0cf99d1f8aaa6566685c43c22622f26";
sha256 = "0hgbwk0y2n6ihzjk8vqabhw914axjqgzcb7c5xx893r86c54c0ml";
})
(fetchpatch {
name = "5.4.0-CVE-2019-10168.patch";
url = "https://libvirt.org/git/?p=libvirt.git;a=patch;h=bf6c2830b6c338b1f5699b095df36f374777b291";
sha256 = "0s4hc3hsjncx1852ndjas1nng9v23pxf4mi1jxcajsqvhw89la0g";
})
];
nativeBuildInputs = [ makeWrapper pkgconfig ];
nativeBuildInputs = [ makeWrapper pkgconfig docutils ] ++ optionals (!buildFromTarball) [ autoreconfHook ];
buildInputs = [
libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl
libxslt xhtml1 perlPackages.XMLXPath curl libpcap
] ++ optionals (!buildFromTarball) [
libtool autoconf automake
libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib
] ++ optionals stdenv.isLinux [
libpciaccess lvm2 utillinux systemd libnl numad zfs
libapparmor libcap_ng numactl attr parted
@ -77,18 +51,19 @@ in stdenv.mkDerivation rec {
];
preConfigure = ''
${ optionalString (!buildFromTarball) "./bootstrap --no-git --gnulib-srcdir=$(pwd)/.gnulib" }
PATH=${stdenv.lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute iptables ebtables lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH
# the path to qemu-kvm will be stored in VM's .xml and .save files
# do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations
substituteInPlace src/lxc/lxc_conf.c \
--replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",'
patchShebangs . # fixes /usr/bin/python references
mkdir -p build && cd build
'';
configureScript = "../configure";
dontAddDisableDepTrack = true;
configureFlags = [
"--localstatedir=/var"
"--sysconfdir=/var/lib"
@ -125,7 +100,6 @@ in stdenv.mkDerivation rec {
"sysconfdir=$(out)/var/lib"
];
postInstall = let
binPath = [ iptables iproute pmutils numad numactl bridge-utils dmidecode dnsmasq ebtables ] ++ optionals enableIscsi [ openiscsi ];
in ''

27
pkgs/development/python-modules/libvirt/5.9.0.nix Normal file
View file

@ -0,0 +1,27 @@
{ stdenv, buildPythonPackage, fetchgit, pkgconfig, lxml, libvirt, nose }:
buildPythonPackage rec {
pname = "libvirt";
version = "5.9.0";
src = fetchgit {
url = git://libvirt.org/libvirt-python.git;
rev = "v${version}";
sha256 = "0qvr0s7yasswy1s5cvkm91iifk33pb8s7nbb38zznc46706b358r";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libvirt lxml ];
checkInputs = [ nose ];
checkPhase = ''
nosetests
'';
meta = with stdenv.lib; {
homepage = http://www.libvirt.org/;
description = "libvirt Python bindings";
license = licenses.lgpl2;
maintainers = [ maintainers.fpletz ];
};
}

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

@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "libvirt";
version = "5.4.0";
version = "6.1.0";
src = assert version == libvirt.version; fetchgit {
url = git://libvirt.org/libvirt-python.git;
rev = "v${version}";
sha256 = "0ja35z90i3m7vsjfpzfm7awkmja3h0150376i5pzmf2q8vp61fi5";
sha256 = "0h3w1p5y4kg2hdbhxmg4lphcnmr7979iwi0m750f8vzbfccsrp7k";
};
nativeBuildInputs = [ pkgconfig ];

1
pkgs/top-level/all-packages.nix
View file

@ -13324,6 +13324,7 @@ in
libversion = callPackage ../development/libraries/libversion { };
libvirt = callPackage ../development/libraries/libvirt { };
libvirt_5_9_0 = callPackage ../development/libraries/libvirt/5.9.0.nix { };
libvirt-glib = callPackage ../development/libraries/libvirt-glib { };

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

@ -17358,11 +17358,11 @@ let
SysVirt = buildPerlModule rec {
pname = "Sys-Virt";
version = "5.4.0";
version = "6.1.0";
src = assert version == pkgs.libvirt.version; pkgs.fetchgit {
url = git://libvirt.org/libvirt-perl.git;
rev = "v${version}";
sha256 = "0csg10mydcif2l0qf16nlphq6ih5378nk6dk1vznf5bspws2ch7a";
sha256 = "00w4fmki7ff7i9bi39w2w15mvv38b5ifwk3zib90ny536r3n63sb";
};
nativeBuildInputs = [ pkgs.pkgconfig ];
buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ];

7
pkgs/top-level/python-packages.nix
View file

@ -6445,9 +6445,12 @@ in {
inherit (pkgs) libversion pkgconfig;
};
libvirt = callPackage ../development/python-modules/libvirt {
libvirt = if isPy3k then (callPackage ../development/python-modules/libvirt {
inherit (pkgs) libvirt pkgconfig;
};
}) else (callPackage ../development/python-modules/libvirt/5.9.0.nix {
inherit (pkgs) pkgconfig;
libvirt = pkgs.libvirt_5_9_0;
});
rpdb = callPackage ../development/python-modules/rpdb { };