Merge branch 'master' into staging

That's to get mesa rebuild from master, as it's nontrivial.
2016-05-23 09:02:10 +02:00
parent dc5bbc4700 0e54c74911
commit 0b192a0976
206 changed files with 25329 additions and 3237 deletions
@@ -85,6 +85,10 @@ in
  };

  config = mkIf (config.boot.initrd.network.enable && cfg.enable) {
+    assertions = [ {
+      assertion = cfg.hostRSAKey != null || cfg.hostDSSKey != null || cfg.hostECDSAKey != null;
+      message = "You should specify at least one host key for initrd SSH";
+    } ];

    boot.initrd.extraUtilsCommands = ''
      copy_bin_and_libs ${pkgs.dropbear}/bin/dropbear