mirrors/nix-darwin
mirrors/nix-darwin
1
0
Fork 0
mirror of https://github.com/LnL7/nix-darwin.git synced 2025-03-13 20:30:02 +00:00
Code Activity

linux-builder: default pass through protocol to nix.buildMachines

Browse source 
This commit adds a protocol option for the `linux-builder` and defaults
it to `ssh-ng`.  I have observed it needing this with the following:

``` sh
$ nix store ping --store ssh://linux-builder
Store URL: ssh://linux-builder

$ nix store ping --store ssh-ng://linux-builder
Store URL: ssh-ng://linux-builder
Version: 2.18.1
Trusted: 0
```

This seems to make the difference on whether or not Nix picks up
`linux-builder` as an available builder.
This commit is contained in:
Logan Barnett 2024-02-20 13:10:24 -08:00
parent 0e6857fa1d
commit 61c5879b5a
No known key found for this signature in database
GPG key ID: 41E46FB1ACEA3EF0
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
modules/nix/linux-builder.nix
View file

@ -71,6 +71,20 @@ in
'';
};
protocol = mkOption {
type = types.str;
default = "ssh-ng";
example = "ssh";
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.
'';
};
supportedFeatures = mkOption {
type = types.listOf types.str;
default = [ "kvm" "benchmark" "big-parallel" ];
@ -141,7 +155,7 @@ in
sshKey = "/etc/nix/builder_ed25519";
system = "${stdenv.hostPlatform.uname.processor}-linux";
publicHostKey = "c3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSUpCV2N4Yi9CbGFxdDFhdU90RStGOFFVV3JVb3RpQzVxQkorVXVFV2RWQ2Igcm9vdEBuaXhvcwo=";
inherit (cfg) maxJobs supportedFeatures;
inherit (cfg) maxJobs protocol supportedFeatures;
}];
nix.settings.builders-use-substitutes = true;