Merge branch 'master' into closure-size

TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.

pkgs/development/libraries/libguestfs/default.nix

@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, autoconf, automake, libtool, makeWrapper
 , ncurses, cpio, gperf, perl, cdrkit, flex, bison, qemu, pcre, augeas, libxml2
 , acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex
-, gmp, readline, file, libintlperl, GetoptLong, SysVirt }:
+, gmp, readline, file, libintlperl, GetoptLong, SysVirt, numactl, xen }:
 
 stdenv.mkDerivation rec {
   name = "libguestfs-${version}";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     makeWrapper pkgconfig autoconf automake libtool ncurses cpio gperf perl
     cdrkit flex bison qemu pcre augeas libxml2 acl libcap libcap_ng libconfig
     systemd fuse yajl libvirt gmp readline file hivex libintlperl GetoptLong
-    SysVirt
+    SysVirt numactl xen
   ];
 
   configureFlags = "--disable-appliance --disable-daemon";