linux: remove mentions of extraStructuredConfig & throw error (#432497)

This commit is contained in:
K900
2025-08-10 15:16:42 +03:00
committed by GitHub
3 changed files with 15 additions and 8 deletions
+1 -1
View File
@@ -25,7 +25,7 @@ pkgs.linux_latest.override {
ignoreConfigErrors = true;
autoModules = false;
kernelPreferBuiltin = true;
extraStructuredConfig = with lib.kernel; {
structuredExtraConfig = with lib.kernel; {
DEBUG_KERNEL = yes;
FRAME_POINTER = yes;
KGDB = yes;
+3 -3
View File
@@ -102,7 +102,7 @@ in
{
name = "foo";
patch = ./foo.patch;
extraStructuredConfig.FOO = lib.kernel.yes;
structuredExtraConfig.FOO = lib.kernel.yes;
features.foo = true;
}
{
@@ -127,7 +127,7 @@ in
# (required, but can be null if only config changes
# are needed)
extraStructuredConfig = { # attrset of extra configuration parameters without the CONFIG_ prefix
structuredExtraConfig = { # attrset of extra configuration parameters without the CONFIG_ prefix
FOO = lib.kernel.yes; # (optional)
}; # values should generally be lib.kernel.yes,
# lib.kernel.no or lib.kernel.module
@@ -138,7 +138,7 @@ in
extraConfig = "FOO y"; # extra configuration options in string form without the CONFIG_ prefix
# (optional, multiple lines allowed to specify multiple options)
# (deprecated, use extraStructuredConfig instead)
# (deprecated, use structuredExtraConfig instead)
}
```
+11 -4
View File
@@ -141,10 +141,17 @@ let
{
structuredExtraConfig ? { },
...
}:
{
settings = structuredExtraConfig;
}
}@args:
if args ? extraStructuredConfig then
throw ''
Passing `extraStructuredConfig` to the Linux kernel (e.g.
via `boot.kernelPatches` in NixOS) is not supported anymore. Use
`structuredExtraConfig` instead.
''
else
{
settings = structuredExtraConfig;
}
) kernelPatches;
# appends kernel patches extraConfig