diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-16 10:53:23 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-16 10:53:23 +0200 |
commit | 16cd8b039b4ce9d84837861daa1f275e6814d5ed (patch) | |
tree | 9e0d0133f5d7dfc475df172c09c1fca7ad2172f2 /nixos | |
parent | 7c7bfa817a046e89e6cd73c0db7314fec4a8ff2b (diff) | |
download | nixlib-16cd8b039b4ce9d84837861daa1f275e6814d5ed.tar nixlib-16cd8b039b4ce9d84837861daa1f275e6814d5ed.tar.gz nixlib-16cd8b039b4ce9d84837861daa1f275e6814d5ed.tar.bz2 nixlib-16cd8b039b4ce9d84837861daa1f275e6814d5ed.tar.lz nixlib-16cd8b039b4ce9d84837861daa1f275e6814d5ed.tar.xz nixlib-16cd8b039b4ce9d84837861daa1f275e6814d5ed.tar.zst nixlib-16cd8b039b4ce9d84837861daa1f275e6814d5ed.zip |
Remove nix.manualNixMachines
Suggested by Marc Weber. Fixes #1059. Generate /etc/nix.machines only if buildMachines is not empty. Thus, if you want to manage /etc/nix.machines in some other way, you can set nix.distributedBuilds to true but not set nix.buildMachines.
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/services/misc/nix-daemon.nix | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index adf4f145f25d..f85a46fa60d7 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -108,24 +108,10 @@ in distributedBuilds = mkOption { default = false; - description = " + description = '' Whether to distribute builds to the machines listed in <option>nix.buildMachines</option>. - If you know that the <option>buildMachines</option> are not - always available either use nixos - <command>nixos-rebuild --no-build-hook</command> - or consider managing <filename>/etc/nix.machines</filename> manually - by setting <option>manualNixMachines</option>. Then you can comment - unavailable build machines. - "; - }; - - manualNixMachines = mkOption { - default = false; - description = " - Whether to manually manage the list of build machines used in distributed - builds in /etc/nix.machines. - "; + ''; }; daemonNiceLevel = mkOption { @@ -145,6 +131,7 @@ in }; buildMachines = mkOption { + default = []; example = [ { hostName = "voila.labs.cs.uu.nl"; sshUser = "nix"; @@ -161,7 +148,7 @@ in mandatoryFeatures = "perf"; } ]; - description = " + description = '' This option lists the machines to be used if distributed builds are enabled (see <option>nix.distributedBuilds</option>). Nix will perform @@ -185,7 +172,7 @@ in key should be added to <filename>~<replaceable>sshUser</replaceable>/authorized_keys</filename> on the remote machine. - "; + ''; }; proxy = mkOption { @@ -263,7 +250,7 @@ in # List of machines for distributed Nix builds in the format # expected by build-remote.pl. environment.etc."nix.machines" = - { enable = cfg.distributedBuilds && !cfg.manualNixMachines; + { enable = cfg.buildMachines != []; text = concatMapStrings (machine: "${machine.sshUser}@${machine.hostName} " |