diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-09-29 23:38:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-29 23:38:05 +0200 |
| commit | 00b86b69f0b2b0a0c99372afbcb8797f857df2fd (patch) | |
| tree | 360c655ae8471f64e9abc6f078c087f851482238 /nixos | |
| parent | 7049dd3d470e3b81f870b64f503f647f08b09e63 (diff) | |
| parent | 2970778928eafb70e5ee15c3a4e55f133c964803 (diff) | |
Merge pull request #193009 from SuperSandro2000/nix-daemon-localhost
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/misc/nix-daemon.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 4b199aa22b50..ba3ea4c47ac1 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -228,13 +228,16 @@ in ''; }; protocol = mkOption { - type = types.enum [ "ssh" "ssh-ng" ]; + type = types.enum [ null "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. + + Use `null` when trying to change the special localhost builder + without a protocol which is for example used by hydra. ''; }; system = mkOption { @@ -680,7 +683,7 @@ in concatMapStrings (machine: (concatStringsSep " " ([ - "${machine.protocol}://${optionalString (machine.sshUser != null) "${machine.sshUser}@"}${machine.hostName}" + "${optionalString (machine.protocol != null) "${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) |