-
-
Notifications
You must be signed in to change notification settings - Fork 487
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
domenkozar
merged 8 commits into
LnL7:master
from
LoganBarnett:linux-builder-big-config
Feb 23, 2024
Merged
linux-builder additional options #878
domenkozar
merged 8 commits into
LnL7:master
from
LoganBarnett:linux-builder-big-config
Feb 23, 2024
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…dMachines.*.systems` option
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.
…builder-big-config-take-2
…o linux-builder-big-config-take-2
Thanks, looks good to me :) |
domenkozar
approved these changes
Feb 23, 2024
I think the link to 871 (an issue I created) is an accident. I don't think this pr is related to that. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This wrangles together changes in the following pull requests (no particular order):
nix.linux-builder.systems
option to set correspondingnix.buildMachines.*.systems
option #816 by @ethnt to addsystems
.mandatoryFeatures
andspeedFactor
.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
andliteralExpression
feedback from #816 to the other options.Thanks for taking the time to review!