commit dccb264578d8a86d01c913895cc8f767702e9385 · pyrox.dev/nixpkgs

+1 -1

doc/packages/linux.section.md

···

       25
       25
        
         ignoreConfigErrors = true;

     

       26
       26
        
         autoModules = false;

     

       27
       27
        
         kernelPreferBuiltin = true;

     

       28
       28
       -
         extraStructuredConfig = with lib.kernel; {

     

       28
       28
       +
         structuredExtraConfig = with lib.kernel; {

     

       29
       29
        
           DEBUG_KERNEL = yes;

     

       30
       30
        
           FRAME_POINTER = yes;

     

       31
       31
        
           KGDB = yes;

+3 -3

nixos/modules/system/boot/kernel.nix

···

       102
       102
        
                 {

     

       103
       103
        
                   name = "foo";

     

       104
       104
        
                   patch = ./foo.patch;

     

       105
       105
       -
                   extraStructuredConfig.FOO = lib.kernel.yes;

     

       105
       105
       +
                   structuredExtraConfig.FOO = lib.kernel.yes;

     

       106
       106
        
                   features.foo = true;

     

       107
       107
        
                 }

     

       108
       108
        
                 {

     
···

       127
       127
        
                                               # (required, but can be null if only config changes

     

       128
       128
        
                                               # are needed)

     

       129
       129
        
       

     

       130
       130
       -
                 extraStructuredConfig = {     # attrset of extra configuration parameters without the CONFIG_ prefix

     

       130
       130
       +
                 structuredExtraConfig = {     # attrset of extra configuration parameters without the CONFIG_ prefix

     

       131
       131
        
                   FOO = lib.kernel.yes;       # (optional)

     

       132
       132
        
                 };                            # values should generally be lib.kernel.yes,

     

       133
       133
        
                                               # lib.kernel.no or lib.kernel.module

     
···

       138
       138
        
       

     

       139
       139
        
                 extraConfig = "FOO y";        # extra configuration options in string form without the CONFIG_ prefix

     

       140
       140
        
                                               # (optional, multiple lines allowed to specify multiple options)

     

       141
       141
       -
                                               # (deprecated, use extraStructuredConfig instead)

     

       141
       141
       +
                                               # (deprecated, use structuredExtraConfig instead)

     

       142
       142
        
               }

     

       143
       143
        
               ```

     

       144
       144

+11 -4

pkgs/os-specific/linux/kernel/generic.nix

···

       141
       141
        
               {

     

       142
       142
        
                 structuredExtraConfig ? { },

     

       143
       143
        
                 ...

     

       144
       144
       -
               }:

     

       145
       145
       -
               {

     

       146
       146
       -
                 settings = structuredExtraConfig;

     

       147
       147
       -
               }

     

       144
       144
       +
               }@args:

     

       145
       145
       +
               if args ? extraStructuredConfig then

     

       146
       146
       +
                 throw ''

     

       147
       147
       +
                   Passing `extraStructuredConfig` to the Linux kernel (e.g.

     

       148
       148
       +
                   via `boot.kernelPatches` in NixOS) is not supported anymore. Use

     

       149
       149
       +
                   `structuredExtraConfig` instead.

     

       150
       150
       +
                 ''

     

       151
       151
       +
               else

     

       152
       152
       +
                 {

     

       153
       153
       +
                   settings = structuredExtraConfig;

     

       154
       154
       +
                 }

     

       148
       155
        
             ) kernelPatches;

     

       149
       156
        
       

     

       150
       157
        
             # appends kernel patches extraConfig