Make system-features a store setting
#3924
Merged
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
This seems more correct. It also means one can specify the features a store should support with --store and remote-store=..., which is useful. I use this to clean up the build remotes test.
Ericson2314
commented
Aug 13, 2020
| nix build -L -v -f build-hook.nix -o $TEST_ROOT/result --max-jobs 0 \ | ||
| --arg busybox $busybox \ | ||
| --store $TEST_ROOT/machine0 \ | ||
| --builders "ssh://localhost?remote-store=$TEST_ROOT/machine1; $TEST_ROOT/machine2 - - 1 1 foo" \ | ||
| --system-features foo |
There was a problem hiding this comment.
No longer need this, because it's just on the chroot store we're using as a (not so remote) builder.
There was a problem hiding this comment.
Not sure how testing works in nix. But can we keep it to have the remote build test? Or would it not call the remote build code?
There was a problem hiding this comment.
Hmm? Now both builders are associated with their own unique feature, so it's more deterministic what would be used where. Do you mean you want to test that --system-features foo will still default the per-store stetting as intended?
Ericson2314
commented
Aug 13, 2020
| @@ -164,6 +164,10 @@ public: | |||
|
|
|||
| Setting<bool> wantMassQuery{this, false, "want-mass-query", "whether this substituter can be queried efficiently for path validity"}; | |||
|
|
|||
| Setting<StringSet> systemFeatures{this, settings.systemFeatures, | |||
There was a problem hiding this comment.
The old setting is still there for backwards compat. It just is used to default the store setting.
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 seems more correct. It also means one can specify the features a store should support with
--storeandremote-store=..., which is useful. I use this to clean up the build remotes test.