Merge branch 'staging' into closure-size

2016-01-19 09:55:31 +01:00
parent f8472457a4 53b389327e
commit 716aac2519
1293 changed files with 75245 additions and 28520 deletions
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -66,6 +66,7 @@ in
      package = mkOption {
        type = types.package;
        default = pkgs.nix;
+        defaultText = "pkgs.nix";
        description = ''
          This option specifies the Nix package instance to use throughout the system.
        '';