linuxPackagesFor: fix overriding kernel attribute#111845
Merged
veprbl merged 2 commits intoNixOS:masterfrom Feb 4, 2021
Merged
linuxPackagesFor: fix overriding kernel attribute#111845veprbl merged 2 commits intoNixOS:masterfrom
veprbl merged 2 commits intoNixOS:masterfrom
Conversation
This reverts commit 78f915a.
The "kernel" argument to linuxPackagesFor was taking precedence over the "self.kernel" attribute brought into scope by the "with self;" statement. This prevented the makeExtensible machinery from working correctly when "kernel" was overridden.
10 tasks
ofborg
bot
added
6.topic: nixos
veprbl
approved these changes
Feb 4, 2021
eadwu
approved these changes
Feb 4, 2021
Member
eadwu
left a comment
eadwu
left a comment
There was a problem hiding this comment.
Doesn't seem to be causing a kernel rebuild on my end so this is probably good.
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
3 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.
Motivation for this change
The
kernelargument tolinuxPackagesForwas taking precedence over theself.kernelattribute brought into scope by thewith self;statement. This prevented themakeExtensiblemachinery from working correctly whenkernelwas overridden.#87856 worked around this by not using
.extends, but this significantly changed the semantics of theboot.kernelPackagesoption and broke one of the my machine configurations. I have reverted that PR here.cc @eadwu @veprbl
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)