public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nix.buildMachines: Fewer required fields

Browse Source
This commit is contained in:
Eelco Dolstra 2015-06-30 00:50:01 +02:00
parent 03dbba9757
commit a9b3d75e9e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nixos/modules/services/misc/nix-daemon.nix
View File

@ -329,13 +329,13 @@ in
text = text =
concatMapStrings (machine: concatMapStrings (machine:
"${if machine ? sshUser then "${machine.sshUser}@" else ""}${machine.hostName} " "${if machine ? sshUser then "${machine.sshUser}@" else ""}${machine.hostName} "
+ (if machine ? system then machine.system else concatStringsSep "," machine.systems) + machine.system or (concatStringsSep "," machine.systems)
+ " ${machine.sshKey} ${toString machine.maxJobs} " + " ${machine.sshKey or "-"} ${toString machine.maxJobs or 1} "
+ (if machine ? speedFactor then toString machine.speedFactor else "1" ) + toString (machine.speedFactor or 1)
+ " " + " "
+ (if machine ? supportedFeatures then concatStringsSep "," machine.supportedFeatures else "" ) + concatStringsSep "," (machine.mandatoryFeatures or [] ++ machine.supportedFeatures or [])
+ " " + " "
+ (if machine ? mandatoryFeatures then concatStringsSep "," machine.mandatoryFeatures else "" ) + concatStringsSep "," machine.mandatoryFeatures or []
+ "\n" + "\n"
) cfg.buildMachines; ) cfg.buildMachines;
}; };