diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-30 00:50:01 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-30 00:51:07 +0200 |
| commit | a9b3d75e9ea16e546621cd0821584c784acf0591 (patch) | |
| tree | 9504738f187edc20b47babdb13324f91bcb22a35 /nixos/modules/services/misc/nix-daemon.nix | |
| parent | 03dbba975706c03f41600b174f1a50f072712d02 (diff) | |
| download | nixpkgs-a9b3d75e9ea16e546621cd0821584c784acf0591.tar nixpkgs-a9b3d75e9ea16e546621cd0821584c784acf0591.tar.gz nixpkgs-a9b3d75e9ea16e546621cd0821584c784acf0591.tar.bz2 nixpkgs-a9b3d75e9ea16e546621cd0821584c784acf0591.tar.lz nixpkgs-a9b3d75e9ea16e546621cd0821584c784acf0591.tar.xz nixpkgs-a9b3d75e9ea16e546621cd0821584c784acf0591.tar.zst nixpkgs-a9b3d75e9ea16e546621cd0821584c784acf0591.zip | |
nix.buildMachines: Fewer required fields
Diffstat (limited to 'nixos/modules/services/misc/nix-daemon.nix')
| -rw-r--r-- | nixos/modules/services/misc/nix-daemon.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index e5948e223d5..b79a69e2ba8 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; }; |