diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-26 18:12:47 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-26 18:44:44 +0200 |
| commit | fb203a34c01d1df38bae24804f879b7ac013e88e (patch) | |
| tree | 35d4bacc9cd2ee69b076b191a8c9b87dbf2d8193 /nixos | |
| parent | 946a6823b27010787bd43ae8de74b3ff2f42783e (diff) | |
| download | nixlib-fb203a34c01d1df38bae24804f879b7ac013e88e.tar nixlib-fb203a34c01d1df38bae24804f879b7ac013e88e.tar.gz nixlib-fb203a34c01d1df38bae24804f879b7ac013e88e.tar.bz2 nixlib-fb203a34c01d1df38bae24804f879b7ac013e88e.tar.lz nixlib-fb203a34c01d1df38bae24804f879b7ac013e88e.tar.xz nixlib-fb203a34c01d1df38bae24804f879b7ac013e88e.tar.zst nixlib-fb203a34c01d1df38bae24804f879b7ac013e88e.zip | |
nix.buildMachines: Don't require sshUser
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/misc/nix-daemon.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 6d25fef45768..a3473cdd91e5 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -296,7 +296,7 @@ in { enable = cfg.buildMachines != []; text = concatMapStrings (machine: - "${machine.sshUser}@${machine.hostName} " + "${if machine ? sshUser then "${machine.sshUser}@" else ""}${machine.hostName} " + (if machine ? system then machine.system else concatStringsSep "," machine.systems) + " ${machine.sshKey} ${toString machine.maxJobs} " + (if machine ? speedFactor then toString machine.speedFactor else "1" ) |