From a9b3d75e9ea16e546621cd0821584c784acf0591 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 30 Jun 2015 00:50:01 +0200 Subject: nix.buildMachines: Fewer required fields --- nixos/modules/services/misc/nix-daemon.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index e5948e223d56..b79a69e2ba8f 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -329,13 +329,13 @@ in 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" ) + + machine.system or (concatStringsSep "," machine.systems) + + " ${machine.sshKey or "-"} ${toString machine.maxJobs or 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" ) cfg.buildMachines; }; -- cgit 1.4.1