From 2970778928eafb70e5ee15c3a4e55f133c964803 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 26 Sep 2022 11:50:19 +0200 Subject: [PATCH] nixos/nix-daemon: allow removing protocol for hydra --- nixos/modules/services/misc/nix-daemon.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index bd599144895..d380bfc4c4f 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)