Merge commit '3ab2949' from staging into master

Conflicts: pkgs/development/compilers/llvm/6/llvm.nix pkgs/servers/home-assistant/component-packages.nix
2018-03-15 22:30:56 +02:00
parent 208abe9ae3 3ab2949e1f
commit ef64208eba
323 changed files with 2064 additions and 3432 deletions
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -30,7 +30,7 @@ let
  # Shell script to start the VM.
  startVM =
    ''
-      #! ${pkgs.stdenv.shell}
+      #! ${pkgs.runtimeShell}

      NIX_DISK_IMAGE=$(readlink -f ''${NIX_DISK_IMAGE:-${config.virtualisation.diskImage}})