Merge branch 'master' into staging

* master: (80 commits)
  lkl: Supports aarch64
  wimlib: nitpicks
  gitAndTools.git-codeowners: 0.1.1 -> 0.1.2
  wimlib: init at 1.12.0
  kernel: improve modDirVersion error message
  releaseTools.sourceTarball: Clean up temporary files
  dotnetPackages.SmartIrc4net: rehash source
  migmix: make it a fixed-output derivation
  vm: Create /dev/full
  samba: 4.6.8 -> 4.6.11 to address CVEs CVE-2017-14746 & CVE-2017-15275
  microcodeIntel: 20170707 -> 20171117
  sshd: Remove ripemd160 MACs
  kernel config: Enable MEDIA_CONTROLLER
  linux: 4.4.99 -> 4.4.100
  linux: 4.9.63 -> 4.9.64
  nix-bash-completions: 0.4 -> 0.5
  linux: 4.14 -> 4.14.1
  linux: 4.13.14 -> 4.13.15
  nix-zsh-completions: 0.3.3 -> 0.3.5
  dns-root-data: use a stable URL that I maintain anyway
  ...

pkgs/development/tools/misc/xxdiff/tip.nix

@@ -15,16 +15,13 @@ stdenv.mkDerivation rec {
   buildInputs = [ qtbase ];
 
   preConfigure = ''
-    ln -s ${qtbase.dev}/mkspecs/* ../__nix_qt*__/mkspecs
-    ln -s ${qtbase.dev}/bin/* ../__nix_qt*__/bin || true
+    cd src
+    make -f Makefile.bootstrap
   '';
 
-  NIX_CFLAGS_COMPILE="-I${qtbase.dev}/include/QtCore -I${qtbase.dev}/include/QtGui -I${qtbase.dev}/include/QtWidgets";
-  
-  configurePhase = "${preConfigure} cd src; make -f Makefile.bootstrap";
-
-  installPhase = "mkdir -pv $out/bin; cp -v ../bin/xxdiff $out/bin";
-
+  postInstall = ''
+    install -D ../bin/xxdiff $out/bin/xxdiff
+  '';
 
   meta = with stdenv.lib; {
     homepage = http://furius.ca/xxdiff/;