commit 3115addf4c47fe6ca572188ec271ca567d505507 · pyrox.dev/nixpkgs

lib/modules.nix

···

       160
       160
        
             value = (opt.apply or id) merged;

     

       161
       161
        
           in opt //

     

       162
       162
        
             { value = addErrorContext "while evaluating the option `${showOption loc}':" value;

     

       163
       163
       +
               files = map (def: def.file) defs;

     

       163
       164
        
               definitions = map (def: def.value) defsFinal;

     

       164
       165
        
               isDefined = defsFinal != [];

     

       165
       166
        
             };

+3 -3

nixos/default.nix

···

       9
       9
        
           modules = [ configuration ];

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
       -
         inherit (eval) config pkgs;

     

       12
       12
       +
         inherit (eval) pkgs;

     

       13
       13
        
       

     

       14
       14
        
         # This is for `nixos-rebuild build-vm'.

     

       15
       15
        
         vmConfig = (import ./lib/eval-config.nix {

     
···

       30
       30
        
       in

     

       31
       31
        
       

     

       32
       32
        
       {

     

       33
       33
       -
         inherit eval config;

     

       33
       33
       +
         inherit (eval) config options;

     

       34
       34
        
       

     

       35
       35
       -
         system = config.system.build.toplevel;

     

       35
       35
       +
         system = eval.config.system.build.toplevel;

     

       36
       36
        
       

     

       37
       37
        
         vm = vmConfig.system.build.vm;

     

       38
       38

+5 -8

nixos/lib/eval-config.nix

···

       16
       16
        
       

     

       17
       17
        
         # Merge the option definitions in all modules, forming the full

     

       18
       18
        
         # system configuration.

     

       19
       19
       -
         systemModule =

     

       20
       20
       -
           pkgs.lib.evalModules {

     

       21
       21
       -
             modules = modules ++ baseModules;

     

       22
       22
       -
             args = extraArgs;

     

       23
       23
       -
             inherit check;

     

       24
       24
       -
           };

     

       25
       25
       -
       

     

       26
       26
       -
         config = systemModule.config;

     

       19
       19
       +
         inherit (pkgs.lib.evalModules {

     

       20
       20
       +
           modules = modules ++ baseModules;

     

       21
       21
       +
           args = extraArgs;

     

       22
       22
       +
           inherit check;

     

       23
       23
       +
         }) config options;

     

       27
       24
        
       

     

       28
       25
        
         # These are the extra arguments passed to every module.  In

     

       29
       26
        
         # particular, Nixpkgs is passed through the "pkgs" argument.

+13 -10

nixos/modules/installer/tools/nixos-option.sh

···

       1
       1
        
       #! @shell@ -e

     

       2
       2
        
       

     

       3
       3
       +
       # FIXME: rewrite this in a more suitable language.

     

       4
       4
       +
       

     

       3
       5
        
       usage () {

     

       4
       6
        
           exec man nixos-option

     

       5
       7
        
           exit 1

     
···

       90
       92
        
       }

     

       91
       93
        
       

     

       92
       94
        
       evalAttr(){

     

       93
       93
       -
         local prefix=$1

     

       94
       94
       -
         local suffix=$2

     

       95
       95
       -
         local strict=$3

     

       95
       95
       +
         local prefix="$1"

     

       96
       96
       +
         local strict="$2"

     

       97
       97
       +
         local suffix="$3"

     

       96
       98
        
         echo "(import <nixos> {}).$prefix${option:+.$option}${suffix:+.$suffix}" |

     

       97
       99
        
           evalNix ${strict:+--strict}

     

       98
       100
        
       }

     

       99
       101
        
       

     

       100
       102
        
       evalOpt(){

     

       101
       101
       -
         evalAttr "eval.options" "$@"

     

       103
       103
       +
         evalAttr "options" "" "$@"

     

       102
       104
        
       }

     

       103
       105
        
       

     

       104
       106
        
       evalCfg(){

     

       105
       105
       -
         evalAttr "config" "$@"

     

       107
       107
       +
         local strict="$1"

     

       108
       108
       +
         evalAttr "config" "$strict"

     

       106
       109
        
       }

     

       107
       110
        
       

     

       108
       111
        
       findSources(){

     

       109
       112
        
         local suffix=$1

     

       110
       110
       -
         echo "builtins.map (f: f.source) (import <nixos> {}).eval.options${option:+.$option}.$suffix" |

     

       113
       113
       +
         echo "(import <nixos> {}).options${option:+.$option}.$suffix" |

     

       111
       114
        
           evalNix --strict

     

       112
       115
        
       }

     

       113
       116
        
       

     
···

       143
       146
        
         nixos = import <nixos> {};

     

       144
       147
        
         nixpkgs = import <nixpkgs> {};

     

       145
       148
        
         sources = builtins.map (f: f.source);

     

       146
       146
       -
         opt = reach nixos.eval.options;

     

       149
       149
       +
         opt = reach nixos.options;

     

       147
       150
        
         cfg = reach nixos.config;

     

       148
       151
        
       in

     

       149
       152
        
       

     
···

       186
       189
        
       fi

     

       187
       190
        
       

     

       188
       191
        
       if test "$(evalOpt "_type" 2> /dev/null)" = '"option"'; then

     

       189
       189
       -
         $value && evalCfg;

     

       192
       192
       +
         $value && evalCfg 1

     

       190
       193
        
       

     

       191
       194
        
         if $desc; then

     

       192
       195
        
           $value && echo;

     
···

       212
       215
        
           nixMap printPath "$(findSources "declarations")"

     

       213
       216
        
           echo ""

     

       214
       217
        
           echo "Defined by:"

     

       215
       215
       -
           nixMap printPath "$(findSources "definitions")"

     

       218
       218
       +
           nixMap printPath "$(findSources "files")"

     

       216
       219
        
           echo ""

     

       217
       220
        
         fi

     

       218
       221
        
       

     

       219
       222
        
       else

     

       220
       223
        
         # echo 1>&2 "Warning: This value is not an option."

     

       221
       224
        
       

     

       222
       222
       -
         result=$(evalCfg)

     

       225
       225
       +
         result=$(evalCfg "")

     

       223
       226
        
         if names=$(attrNames "$result" 2> /dev/null); then

     

       224
       227
        
           echo 1>&2 "This attribute set contains:"

     

       225
       228
        
           escapeQuotes () { eval echo "$1"; }