commit 05e8a48fb4af4c20134362c77ba6c5b4c6e49268 · pyrox.dev/nixpkgs

+17 -17

lib/modules.nix

···

       17
       17
        
            evalModules) and the less declarative the module set is. */

     

       18
       18
        
         evalModules = { modules

     

       19
       19
        
                       , prefix ? []

     

       20
       20
       -
                       , # !!! This can be specified modularly now, can we remove it?

     

       20
       20
       +
                       , # This would be remove in the future, Prefer _module.args option instead.

     

       21
       21
        
                         args ? {}

     

       22
       22
       -
                       , # !!! This can be specified modularly now, can we remove it?

     

       22
       22
       +
                       , # This would be remove in the future, Prefer _module.check option instead.

     

       23
       23
        
                         check ? true

     

       24
       24
        
                       }:

     

       25
       25
        
           let

     

       26
       26
       +
             # This internal module declare internal options under the `_module'

     

       27
       27
       +
             # attribute.  These options are fragile, as they are used by the

     

       28
       28
       +
             # module system to change the interpretation of modules.

     

       26
       29
        
             internalModule = rec {

     

       27
       30
        
               _file = ./modules.nix;

     

       28
       31
        
       

     

       29
       32
        
               key = _file;

     

       30
       33
        
       

     

       31
       34
        
               options = {

     

       32
       32
       -
                 __internal.args = mkOption {

     

       33
       33
       -
                   description = "Arguments passed to each module.";

     

       34
       34
       -
       

     

       35
       35
       -
                   # !!! Should this be types.uniq types.unspecified?

     

       35
       35
       +
                 _module.args = mkOption {

     

       36
       36
        
                   type = types.attrsOf types.unspecified;

     

       37
       37
       -
       

     

       38
       37
        
                   internal = true;

     

       38
       38
       +
                   description = "Arguments passed to each module.";

     

       39
       39
        
                 };

     

       40
       40
        
       

     

       41
       41
       -
                 __internal.check = mkOption {

     

       42
       42
       -
                   description = "Whether to check whether all option definitions have matching declarations.";

     

       43
       43
       -
       

     

       41
       41
       +
                 _module.check = mkOption {

     

       44
       42
        
                   type = types.uniq types.bool;

     

       45
       45
       -
       

     

       46
       43
        
                   internal = true;

     

       47
       47
       -
       

     

       48
       44
        
                   default = check;

     

       45
       45
       +
                   description = "Whether to check whether all option definitions have matching declarations.";

     

       49
       46
        
                 };

     

       50
       47
        
               };

     

       51
       48
        
       

     

       52
       49
        
               config = {

     

       53
       53
       -
                 __internal.args = args;

     

       50
       50
       +
                 _module.args = args;

     

       54
       51
        
               };

     

       55
       52
        
             };

     

       53
       53
       +
       

     

       56
       54
        
             closed = closeModules (modules ++ [ internalModule ]) { inherit config options; lib = import ./.; };

     

       55
       55
       +
       

     

       57
       56
        
             # Note: the list of modules is reversed to maintain backward

     

       58
       57
        
             # compatibility with the old module system.  Not sure if this is

     

       59
       58
        
             # the most sensible policy.

     

       60
       59
        
             options = mergeModules prefix (reverseList closed);

     

       60
       60
       +
       

     

       61
       61
        
             # Traverse options and extract the option values into the final

     

       62
       62
        
             # config set.  At the same time, check whether all option

     

       63
       63
        
             # definitions have matching declarations.

     

       64
       64
       -
             # !!! __internal.check's value can't depend on any other config values

     

       64
       64
       +
             # !!! _module.check's value can't depend on any other config values

     

       65
       65
        
             # without an infinite recursion. One way around this is to make the

     

       66
       66
        
             # 'config' passed around to the modules be unconditionally unchecked,

     

       67
       67
        
             # and only do the check in 'result'.

     
···

       71
       71
        
                 if isOption v then v.value

     

       72
       72
        
                 else yieldConfig (prefix ++ [n]) v) set) ["_definedNames"];

     

       73
       73
        
               in

     

       74
       74
       -
               if options.__internal.check.value && set ? _definedNames then

     

       74
       74
       +
               if options._module.check.value && set ? _definedNames then

     

       75
       75
        
                 fold (m: res:

     

       76
       76
        
                   fold (name: res:

     

       77
       77
        
                     if set ? ${name} then res else throw "The option `${showOption (prefix ++ [name])}' defined in `${m.file}' does not exist.")

     
···

       122
       122
        
           let

     

       123
       123
        
             # Module arguments are resolved in a strict manner when attribute set

     

       124
       124
        
             # deconstruction is used.  As the arguments are now defined with the

     

       125
       125
       -
             # config.__interanl.args option, the strictness used on the attribute

     

       125
       125
       +
             # config._module.args option, the strictness used on the attribute

     

       126
       126
        
             # set argument would cause an infinite loop, if the result of the

     

       127
       127
        
             # option is given as argument.

     

       128
       128
        
             #

     
···

       135
       135
        
             requiredArgs = builtins.attrNames (builtins.functionArgs f);

     

       136
       136
        
             extraArgs = builtins.listToAttrs (map (name: {

     

       137
       137
        
               inherit name;

     

       138
       138
       -
               value = config.__internal.args.${name};

     

       138
       138
       +
               value = config._module.args.${name};

     

       139
       139
        
             }) requiredArgs);

     

       140
       140
        
           in f (extraArgs // arg)

     

       141
       141
        
         else

-1

lib/types.nix

···

       200
       200
        
                   modules = opts' ++ map (def: { _file = def.file; imports = [(coerce def.value)]; }) defs;

     

       201
       201
        
                 in (evalModules {

     

       202
       202
        
                   inherit modules;

     

       203
       203
       -
                   # !!! See comment about args in lib/modules.nix

     

       204
       203
        
                   args.name = last loc;

     

       205
       204
        
                   prefix = loc;

     

       206
       205
        
                 }).config;

+2 -2

nixos/lib/eval-config.nix

···

       35
       35
        
           key = _file;

     

       36
       36
        
           config = {

     

       37
       37
        
             nixpkgs.system = lib.mkDefault system_;

     

       38
       38
       -
             __internal.args.pkgs = lib.mkIf (pkgs_ != null) (lib.mkForce pkgs_);

     

       38
       38
       +
             _module.args.pkgs = lib.mkIf (pkgs_ != null) (lib.mkForce pkgs_);

     

       39
       39
        
           };

     

       40
       40
        
         };

     

       41
       41
        
       

     
···

       60
       60
        
           inherit modules baseModules;

     

       61
       61
        
         };

     

       62
       62
        
       

     

       63
       63
       -
         inherit (config.__internal.args) pkgs;

     

       63
       63
       +
         inherit (config._module.args) pkgs;

     

       64
       64
        
       }

+1 -1

nixos/modules/misc/extra-arguments.nix

···

       1
       1
        
       { lib, pkgs, config, ... }:

     

       2
       2
        
       

     

       3
       3
        
       {

     

       4
       4
       -
         __internal.args = {

     

       4
       4
       +
         _module.args = {

     

       5
       5
        
           modulesPath = ../.;

     

       6
       6
        
       

     

       7
       7
        
           pkgs_i686 = import ../../lib/nixpkgs.nix {

+1 -1

nixos/modules/misc/nixpkgs.nix

···

       72
       72
        
         };

     

       73
       73
        
       

     

       74
       74
        
         config = {

     

       75
       75
       -
           __internal.args.pkgs = import ../../lib/nixpkgs.nix {

     

       75
       75
       +
           _module.args.pkgs = import ../../lib/nixpkgs.nix {

     

       76
       76
        
             system = config.nixpkgs.system;

     

       77
       77
        
       

     

       78
       78
        
             inherit (config.nixpkgs) config;

+1 -1

nixos/modules/rename.nix

···

       136
       136
        
       

     

       137
       137
        
       ++ obsolete [ "services" "mysql55" ] [ "services" "mysql" ]

     

       138
       138
        
       

     

       139
       139
       -
       ++ obsolete [ "environment" "checkConfigurationOptions" ] [ "__internal" "check" ]

     

       139
       139
       +
       ++ obsolete [ "environment" "checkConfigurationOptions" ] [ "_module" "check" ]

     

       140
       140
        
       

     

       141
       141
        
       # Options that are obsolete and have no replacement.

     

       142
       142
        
       ++ obsolete' [ "boot" "loader" "grub" "bootDevice" ]

+1 -1

nixos/modules/services/misc/nixos-manual.nix

···

       18
       18
        
       

     

       19
       19
        
         eval = evalModules {

     

       20
       20
        
           modules = [ versionModule ] ++ baseModules;

     

       21
       21
       -
           args = (config.__internal.args) // { modules = [ ]; };

     

       21
       21
       +
           args = (config._module.args) // { modules = [ ]; };

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         manual = import ../../../doc/manual {