buildLinux: Fix result derivation overriding with passthru via stdenv.mkDerivation instead of lib.extendDerivation#288154
Merged
infinisil merged 1 commit intoNixOS:masterfrom Feb 26, 2024
Conversation
Contributor
Author
|
Result of |
ofborg
bot
added
10.rebuild-darwin: 0
Contributor
Author
|
@ofborg build linux linux.tests |
infinisil
approved these changes
Feb 26, 2024
Member
infinisil
left a comment
infinisil
left a comment
There was a problem hiding this comment.
Tested this and it seems to be working well, nice job! And it's much nicer than by previous attempt 😄
For future reference, an example of what works now is testing kernel overrides like this:
(linuxPackages.kernel.overrideAttrs (old: {
# Some changes
})).tests
Contributor
Author
|
Thank you @infinisil for testing and merging! The fix utilize |
13 tasks
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Description of changes
The
buildLinuxbuild helper currently relies onlib.extendDerivationto attach passthru attributes to each outputs. Aslib.extendDerivationdoesn't handle overriders correctly (#288148), the passthru arguments will be lost when overriding the kernel packages.This PR fixes this issues by overriding the derivation returned by
manual-config.nixwith<pkg>.overrideAttrs, and updatepassthruto pass the attributes.Aside from fixing the attribute-lost-after-overriding issue, this changes also enable the
passthruattributes overriding with<pkg>.overrideAttrsand allowpassthru.teststest cases to referencefinalAttrs.passthru.tests.This PR would conflict with #287659, but such conflict is trivial to resolve, and I'll do the rebase once any one of them gets merged.
Fixes: #111504
Previous attempt: #149455
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.