Merge pull request #157080: fix buildMachines eval

authored by

piegames and committed by
GitHub
ab14cf22 54cbee8d

+2 -2
+2 -2
nixos/modules/services/misc/nix-daemon.nix
··· 673 673 text = 674 674 concatMapStrings 675 675 (machine: 676 - (concatStringsSep " " [ 676 + (concatStringsSep " " ([ 677 677 "${optionalString (machine.sshUser != null) "${machine.sshUser}@"}${machine.hostName}" 678 678 (if machine.system != null then machine.system else if machine.systems != [ ] then concatStringsSep "," machine.systems else "-") 679 679 (if machine.sshKey != null then machine.sshKey else "-") ··· 682 682 (concatStringsSep "," machine.supportedFeatures) 683 683 (concatStringsSep "," machine.mandatoryFeatures) 684 684 ] 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 "-"))) 686 686 + "\n" 687 687 ) 688 688 cfg.buildMachines;