git.iko.soy/typeable/nixpkgs
on master help sign in
libvirt: 6.0.0 -> 6.1.0, fix module
commitd8664c78b13161e366cfaa31efb32c187b95ba6c authorvolth <volth@volth.com> dateMon 9 Mar 2020, 06:29 (7 years ago) parent24c8d75
4 files changed+17−17
nixos/modules/virtualisation/libvirtd.nix+7−4 pkgs/development/libraries/libvirt/default.nix+5−8 pkgs/development/python-modules/libvirt/default.nix+2−2 pkgs/top-level/perl-packages.nix+3−3
nixos/modules/virtualisation/libvirtd.nix+7−4
@@ -214,14 +214,14 @@ in {
214214 };
215215
216216 systemd.services.libvirtd = {
217− description = "Libvirt Virtual Machine Management Daemon";
218−
219− wantedBy = [ "multi-user.target" ];
220217 requires = [ "libvirtd-config.service" ];
221218 after = [ "systemd-udev-settle.service" "libvirtd-config.service" ]
222219 ++ optional vswitch.enable "ovs-vswitchd.service";
223220
224− environment.LIBVIRTD_ARGS = ''--config "${configFile}" ${concatStringsSep " " cfg.extraOptions}'';
221+ environment.LIBVIRTD_ARGS = concatMapStringsSep " " escapeShellArg (
222+ [ "--config" configFile
223+ "--timeout" "120" # from ${libvirt}/var/lib/sysconfig/libvirtd
224+ ] ++ cfg.extraOptions);
225225
226226 path = [ cfg.qemuPackage ] # libvirtd requires qemu-img to manage disk images
227227 ++ optional vswitch.enable vswitch.package;
@@ -266,5 +266,8 @@ in {
266266 serviceConfig.ExecStart = "@${pkgs.libvirt}/sbin/virtlockd virtlockd";
267267 restartIfChanged = false;
268268 };
269+
270+ systemd.sockets.libvirtd .wantedBy = [ "sockets.target" ];
271+ systemd.sockets.libvirtd-tcp.wantedBy = [ "sockets.target" ];
269272 };
270273}
pkgs/development/libraries/libvirt/default.nix+5−8
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, fetchgit
2−, pkgconfig, makeWrapper, libtool, autoconf, automake, fetchpatch
2+, pkgconfig, makeWrapper, autoreconfHook, fetchpatch
33, coreutils, libxml2, gnutls, perl, python2, attr, glib, docutils
44, iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext
55, libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor
@@ -17,28 +17,26 @@ let
1717 buildFromTarball = stdenv.isDarwin;
1818in stdenv.mkDerivation rec {
1919 pname = "libvirt";
20− version = "6.0.0";
20+ version = "6.1.0";
2121
2222 src =
2323 if buildFromTarball then
2424 fetchurl {
2525 url = "http://libvirt.org/sources/${pname}-${version}.tar.xz";
26− sha256 = "0xkz6n6pyv7k4jj7762v65jdsj8pkcpbnas65hjy7b5vi4in9fz6";
26+ sha256 = "1h7bmd7zgl64mwnxx4ji8l0mqmcbfxsx6kp1scyyfq2mwidihz0n";
2727 }
2828 else
2929 fetchgit {
3030 url = git://libvirt.org/libvirt.git;
3131 rev = "v${version}";
32− sha256 = "0j0rvymxaqavak03w7gblm8ingvbcwczpwfk8s0iqvsgfgk9974p";
32+ sha256 = "18sr3jvpxn45c4vrjzpa4qgnnfxxh95v6l6qk31zka3siv8rrwqx";
3333 fetchSubmodules = true;
3434 };
3535
36− nativeBuildInputs = [ makeWrapper pkgconfig docutils ];
36+ nativeBuildInputs = [ makeWrapper pkgconfig docutils ] ++ optionals (!buildFromTarball) [ autoreconfHook ];
3737 buildInputs = [
3838 libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl
3939 libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib
40− ] ++ optionals (!buildFromTarball) [
41− libtool autoconf automake
4240 ] ++ optionals stdenv.isLinux [
4341 libpciaccess lvm2 utillinux systemd libnl numad zfs
4442 libapparmor libcap_ng numactl attr parted
@@ -53,7 +51,6 @@ in stdenv.mkDerivation rec {
5351 ];
5452
5553 preConfigure = ''
56− ${ optionalString (!buildFromTarball) "./bootstrap --no-git --gnulib-srcdir=$(pwd)/.gnulib" }
5754 PATH=${stdenv.lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute iptables ebtables lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH
5855 # the path to qemu-kvm will be stored in VM's .xml and .save files
5956 # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations
pkgs/development/python-modules/libvirt/default.nix+2−2
@@ -2,12 +2,12 @@
22
33buildPythonPackage rec {
44 pname = "libvirt";
5− version = "6.0.0";
5+ version = "6.1.0";
66
77 src = assert version == libvirt.version; fetchgit {
88 url = git://libvirt.org/libvirt-python.git;
99 rev = "v${version}";
10− sha256 = "0p6a8mlqf1kb0pg1avygg6ymlfvqsk7qisyhmyaxkj4pn8q87cxy";
10+ sha256 = "0h3w1p5y4kg2hdbhxmg4lphcnmr7979iwi0m750f8vzbfccsrp7k";
1111 };
1212
1313 nativeBuildInputs = [ pkgconfig ];
pkgs/top-level/perl-packages.nix+3−3
@@ -17282,11 +17282,11 @@ let
1728217282
1728317283 SysVirt = buildPerlModule rec {
1728417284 pname = "Sys-Virt";
17285− version = "6.0.0";
17285+ version = "6.1.0";
1728617286 src = assert version == pkgs.libvirt.version; pkgs.fetchgit {
1728717287 url = git://libvirt.org/libvirt-perl.git;
17288− rev = "v${version}";
17289− sha256 = "06r333bc52x0g511lw3nwp5w5q9d7mwxrbx5ihiv7shwyxn7dh93";
17288+ rev = "299f3ba34ae4daea966bf1cb07d90f4151da895f"; # there is no "v6.1.0" tag
17289+ sha256 = "0k18spb6r8fym5v4rsnma1fspnzqf1mgr2wkvb8s4cwn915sccp4";
1729017290 };
1729117291 nativeBuildInputs = [ pkgs.pkgconfig ];
1729217292 buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ];