MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 23:36:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #157080: fix buildMachines eval

Browse source
This commit is contained in:
piegames 2022-01-28 02:22:37 +01:00 committed by GitHub
commit ab14cf224f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixos/modules/services/misc/nix-daemon.nix
View file

@ -673,7 +673,7 @@ in
text = text =
concatMapStrings concatMapStrings
(machine: (machine:
(concatStringsSep " " [ (concatStringsSep " " ([
"${optionalString (machine.sshUser != null) "${machine.sshUser}@"}${machine.hostName}" "${optionalString (machine.sshUser != null) "${machine.sshUser}@"}${machine.hostName}"
(if machine.system != null then machine.system else if machine.systems != [ ] then concatStringsSep "," machine.systems else "-") (if machine.system != null then machine.system else if machine.systems != [ ] then concatStringsSep "," machine.systems else "-")
(if machine.sshKey != null then machine.sshKey else "-") (if machine.sshKey != null then machine.sshKey else "-")
@ -682,7 +682,7 @@ in
(concatStringsSep "," machine.supportedFeatures) (concatStringsSep "," machine.supportedFeatures)
(concatStringsSep "," machine.mandatoryFeatures) (concatStringsSep "," machine.mandatoryFeatures)
] ]
++ optional (isNixAtLeast "2.4pre") (if machine.publicHostKey != null then machine.publicHostKey else "-")) ++ optional (isNixAtLeast "2.4pre") (if machine.publicHostKey != null then machine.publicHostKey else "-")))
+ "\n" + "\n"
) )
cfg.buildMachines; cfg.buildMachines;