Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

linux-builder additional options #878

Merged
merged 8 commits into from
Feb 23, 2024

Conversation

LoganBarnett
Copy link
Contributor

This wrangles together changes in the following pull requests (no particular order):

  1. Add nix.linux-builder.systems option to set corresponding nix.buildMachines.*.systems option #816 by @ethnt to add systems.
  2. feat/recommendation: wrap launch agents and daemons in named files #871 by @stv0g to add mandatoryFeatures and speedFactor.
  3. linux-builder: default pass through protocol to nix.buildMachines #877 by myself to add protocol.

I've done my best to preserve the original commits and keep authors' credit/contributions. I did take liberty of sorting the added parameters lexicographically. Additionally I applied the defaultText and literalExpression feedback from #816 to the other options.

Thanks for taking the time to review!

ethnt and others added 8 commits November 22, 2023 20:43
This commit passes more options to  nix.buildMachines. Namely the mandatoryFeatures and speedFactor settings have been missing.
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.
@stv0g
Copy link
Contributor

stv0g commented Feb 22, 2024

Thanks, looks good to me :)

@domenkozar domenkozar merged commit 314a36d into LnL7:master Feb 23, 2024
6 checks passed
@LoganBarnett LoganBarnett deleted the linux-builder-big-config branch February 24, 2024 06:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants