gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/nix-daemon: support machine protocol

Browse Source 
Make ssh-ng:// users happier.

@moduon MT-904
This commit is contained in:
Jairo Llopis
2022-07-27 08:51:05 +01:00
committed by Sandro Jäckel
parent 6560d311d5
commit a7a94811e3
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
nixos/modules/services/misc/nix-daemon.nix
View File

@@ -227,6 +227,16 @@ in
The hostname of the build machine. The hostname of the build machine.
''; '';
}; };
protocol = mkOption {
type = types.enum [ "ssh" "ssh-ng" ];
default = "ssh";
example = "ssh-ng";
description = lib.mdDoc ''
The protocol used for communicating with the build machine.
Use `ssh-ng` if your remote builder and your
local Nix version support that improved protocol.
'';
};
system = mkOption { system = mkOption {
type = types.nullOr types.str; type = types.nullOr types.str;
default = null; default = null;
@@ -670,7 +680,7 @@ in
concatMapStrings concatMapStrings
(machine: (machine:
(concatStringsSep " " ([ (concatStringsSep " " ([
"${optionalString (machine.sshUser != null) "${machine.sshUser}@"}${machine.hostName}" "${machine.protocol}://${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 "-")
(toString machine.maxJobs) (toString machine.maxJobs)