Add page size system features #12446
Open
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
2 tasks
RossComputerGuy
force-pushed
the
feat/page-size
branch
from
bcb4839 to
0fc68c3
Compare
github-actions
bot
added
the
with-tests
RossComputerGuy
force-pushed
the
feat/page-size
branch
from
1fe2463 to
18057a7
Compare
RossComputerGuy
requested review from
fricklerhandwerk and
edolstra
as code owners
roberth
reviewed
Feb 15, 2025
| @@ -370,6 +370,18 @@ Derivations can declare some infrequently used optional attributes. | |||
|
|
|||
| ensures that the derivation can only be built on a machine with the `kvm` feature. | |||
|
|
|||
| - [`rejectSystemFeatures`]{#adv-attr-rejectSystemFeatures}\ | |||
|
|
|||
| If a derivation has the `rejectSystemFeatures` attribute, then Nix will only build it on a machine that does not has the corresponding features set in its [`system-features` configuration](@docroot@/command-ref/conf-file.md#conf-system-features). | |||
There was a problem hiding this comment.
Suggested change
| If a derivation has the `rejectSystemFeatures` attribute, then Nix will only build it on a machine that does not has the corresponding features set in its [`system-features` configuration](@docroot@/command-ref/conf-file.md#conf-system-features). | |
| If a derivation has the `rejectSystemFeatures` attribute, then Nix will only build it on a machine that does not have the corresponding features set in its [`system-features` configuration](@docroot@/command-ref/conf-file.md#conf-system-features). |
There was a problem hiding this comment.
Thanks for catching that, it's fixed now.
| rejectSystemFeatures = [ "pages-16k" ]; | ||
| ``` | ||
|
|
||
| ensures that the derivation can only be built on a machine which do not have the `pages-16k` feature. |
There was a problem hiding this comment.
Suggested change
| ensures that the derivation can only be built on a machine which do not have the `pages-16k` feature. | |
| ensures that the derivation can only be built on a machine which does not have the `pages-16k` feature. |
| @@ -532,9 +532,10 @@ void LocalDerivationGoal::startBuilder() | |||
|
|
|||
| /* Right platform? */ | |||
| if (!parsedDrv->canBuildLocally(worker.store)) | |||
| throw Error("a '%s' with features {%s} is required to build '%s', but I am a '%s' with features {%s}", | |||
| throw Error("a '%s' with features {%s} & not {%s} is required to build '%s', but I am a '%s' with features {%s}", | |||
There was a problem hiding this comment.
Not pretty when empty, but that was already the case for required ones.
There was a problem hiding this comment.
Yeah, I'm curious how we should handle things when it's empty.
| @@ -70,6 +71,12 @@ echo "$output" | grepQuietInverse builder-build-remote-input-2.sh | |||
| echo "$output" | grepQuiet builder-build-remote-input-3.sh | |||
| unset output | |||
|
|
|||
| # Ensure that input4 was built on store4 due to the required feature. | |||
There was a problem hiding this comment.
This isn't obvious from the code below. Could you add assertions that simply check what you're saying here?
There was a problem hiding this comment.
I tried getting a test here which would reject builds in the proper way but I'm not confident with the testing framework so I might need guidance.
RossComputerGuy
force-pushed
the
feat/page-size
branch
from
92050c6 to
c4a6266
Compare
|
It seems that #12292 introduced a conflict. |
RossComputerGuy
force-pushed
the
feat/page-size
branch
2 times, most recently
from
75a730b to
0bcf588
Compare
RossComputerGuy
force-pushed
the
feat/page-size
branch
from
0bcf588 to
589fe7d
Compare
13 tasks
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.
Motivation
Fixes #12426
Context
Prevents issues like NixOS/nixpkgs#348660 from occurring by adding system features which describe the page size. This has the added benefit of systems with multiple builders of utilizing only compatible page sizes.
Testing this PR involves building this PR and running Nix to build any derivation inside this branch of nixpkgs: https://github.com/RossComputerGuy/nixpkgs/tree/feat/page-size
It should not fail with this error:
Add 👍 to pull requests you find important.
The Nix maintainer team uses a GitHub project board to schedule and track reviews.