Unverified Commit 4dbbfe8a authored by Jörg Thalheim's avatar Jörg Thalheim Committed by GitHub
Browse files

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

nixos/nix-daemon: support machine protocol
parents b43f6f58 a7a94811

nixos/modules/services/misc/nix-daemon.nix

+11 −1
Original line number Diff line number Diff line
@@ -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)