nix.buildMachines: Fewer required fields

Changed files
+5 -5
nixos
modules
services
+5 -5
nixos/modules/services/misc/nix-daemon.nix
···
text =
concatMapStrings (machine:
"${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" )
+ " "
-
+ (if machine ? supportedFeatures then concatStringsSep "," machine.supportedFeatures else "" )
+ " "
-
+ (if machine ? mandatoryFeatures then concatStringsSep "," machine.mandatoryFeatures else "" )
+ "\n"
) cfg.buildMachines;
};
···
text =
concatMapStrings (machine:
"${if machine ? sshUser then "${machine.sshUser}@" else ""}${machine.hostName} "
+
+ machine.system or (concatStringsSep "," machine.systems)
+
+ " ${machine.sshKey or "-"} ${toString machine.maxJobs or 1} "
+
+ toString (machine.speedFactor or 1)
+ " "
+
+ concatStringsSep "," (machine.mandatoryFeatures or [] ++ machine.supportedFeatures or [])
+ " "
+
+ concatStringsSep "," machine.mandatoryFeatures or []
+ "\n"
) cfg.buildMachines;
};