commit 3bb8213531c88e3c7c65b7a1f804aa9057561123 · pyrox.dev/nixpkgs

+12 -18

pkgs/os-specific/linux/kernel/manual-config.nix

···

       32
       32
        
       

     

       33
       33
        
         readConfig =

     

       34
       34
        
           configfile:

     

       35
       35
       -
           lib.listToAttrs (

     

       36
       36
       -
             map

     

       37
       37
       -
               (

     

       38
       38
       -
                 line:

     

       39
       39
       -
                 let

     

       40
       40
       -
                   match = lib.match "(.*)=\"?(.*)\"?" line;

     

       41
       41
       -
                 in

     

       42
       42
       -
                 {

     

       43
       43
       -
                   name = lib.elemAt match 0;

     

       44
       44
       -
                   value = lib.elemAt match 1;

     

       45
       45
       -
                 }

     

       46
       46
       -
               )

     

       47
       47
       -
               (

     

       48
       48
       -
                 lib.filter (line: !(lib.hasPrefix "#" line || line == "")) (

     

       49
       49
       -
                   lib.splitString "\n" (builtins.readFile configfile)

     

       50
       50
       -
                 )

     

       51
       51
       -
               )

     

       52
       52
       -
           );

     

       35
       35
       +
           let

     

       36
       36
       +
             matchLine =

     

       37
       37
       +
               line:

     

       38
       38
       +
               let

     

       39
       39
       +
                 match = lib.match "(CONFIG_[^=]+)=([ym])" line;

     

       40
       40
       +
               in

     

       41
       41
       +
               lib.optional (match != null) {

     

       42
       42
       +
                 name = lib.elemAt match 0;

     

       43
       43
       +
                 value = lib.elemAt match 1;

     

       44
       44
       +
               };

     

       45
       45
       +
           in

     

       46
       46
       +
           lib.listToAttrs (lib.concatMap matchLine (lib.splitString "\n" (builtins.readFile configfile)));

     

       53
       47
        
       in

     

       54
       48
        
       lib.makeOverridable (

     

       55
       49
        
         {

+1 -1

pkgs/top-level/linux-kernels.nix

···

       819
       819
        
             src,

     

       820
       820
        
             modDirVersion ? lib.versions.pad 3 version,

     

       821
       821
        
             configfile,

     

       822
       822
       -
             allowImportFromDerivation ? true,

     

       822
       822
       +
             allowImportFromDerivation ? false,

     

       823
       823
        
           }:

     

       824
       824
        
           recurseIntoAttrs (

     

       825
       825
        
             packagesFor (manualConfig {