swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-29 16:40:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #191713 from SuperSandro2000/feat-remote-builder-protocol

Browse source 
nixos/nix-daemon: support machine protocol
This commit is contained in:
Jörg Thalheim 2022-09-18 02:08:30 +02:00 committed by GitHub
parent b43f6f58c9 a7a94811e3
commit 4dbbfe8ae4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show stats 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.
'';
};
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 {
type = types.nullOr types.str;
default = null;
@ -670,7 +680,7 @@ in
concatMapStrings
(machine:
(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.sshKey != null then machine.sshKey else "-")
(toString machine.maxJobs)