git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #157080: fix buildMachines eval
commitab14cf224f7f076ea92dae1519750178eb0dcecd authorpiegames <git@piegames.de> dateFri 28 Jan 2022, 02:22 (5 years ago) parent54cbee8268157d
1 file changed+2−2
nixos/modules/services/misc/nix-daemon.nix+2−2
nixos/modules/services/misc/nix-daemon.nix+2−2
@@ -673,7 +673,7 @@ in
673673 text =
674674 concatMapStrings
675675 (machine:
676− (concatStringsSep " " [
676+ (concatStringsSep " " ([
677677 "${optionalString (machine.sshUser != null) "${machine.sshUser}@"}${machine.hostName}"
678678 (if machine.system != null then machine.system else if machine.systems != [ ] then concatStringsSep "," machine.systems else "-")
679679 (if machine.sshKey != null then machine.sshKey else "-")
@@ -682,7 +682,7 @@ in
682682 (concatStringsSep "," machine.supportedFeatures)
683683 (concatStringsSep "," machine.mandatoryFeatures)
684684 ]
685− ++ optional (isNixAtLeast "2.4pre") (if machine.publicHostKey != null then machine.publicHostKey else "-"))
685+ ++ optional (isNixAtLeast "2.4pre") (if machine.publicHostKey != null then machine.publicHostKey else "-")))
686686 + "\n"
687687 )
688688 cfg.buildMachines;