kernel: Fix overriding #149455
Closed
kernel: Fix overriding #149455
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 was reported in NixOS#111504 but further complicated in NixOS#121518 This should clean it up
infinisil
commented
Dec 7, 2021
| overridableKernel = finalKernel // { | ||
| override = args: | ||
| lib.warn ( | ||
| "override is stubbed for NixOS kernel tests, not applying changes these arguments: " |
There was a problem hiding this comment.
But also, I don't know why this is done, there's no reasoning for it in the original PR
There was a problem hiding this comment.
https://github.com/NixOS/nixpkgs/pull/121518/files#r663978966
Will take a look tomorrow.
|
I think you're looking for @samueldr I'm afraid I'm no help here! |
ofborg
bot
added
10.rebuild-darwin: 0
Atemu
requested changes
Dec 10, 2021
There was a problem hiding this comment.
nix-build -A linux.passthru.tests
error: attribute 'override' missing
at /home/atemu/Projects/nixpkgs/nixos/modules/system/boot/kernel.nix:41:18:
40| apply = kernelPackages: kernelPackages.extend (self: super: {
41| kernel = super.kernel.override (originalArgs: {
| ^
42| inherit randstructSeed;
(use '--show-trace' to show detailed location information)
.override previously didn't exist on kernels because the result from `callPackage` (which contains a `.override`) was a function which was then called with some more arguments. This commit fixes this by passing all arguments in one go via callPackage
infinisil
force-pushed
the
kernel-overriding
branch
from
b53d181
to
d47b1cc
Compare
|
@Atemu Ah good catch, I'm surprised ofborg didn't run this. I fixed it with the latest commit. |
|
You're a wizard. ofBorg seems to be catching something else now though... |
|
Closing for now. Hard to get motivation to fix this, it's really hard to wrap your head around this issue |
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 for this change
This was reported in #111504 but further complicated in #121518
This should clean it up, though I haven't tested it more than just a basic
linuxPackages.kernelevaluation, as I'm not familiar with how it's all used.I'd ideally like
@samuela@samueldr, @kira-bruneau, @Atemu and @NeQuissimus to take a look at this, as they've been involved in the above two linked issuesThings done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)nixos/doc/manual/md-to-db.shto update generated release notes