···

       
299
       
299
       
 
       
      # a module will resolve strictly the attributes used as argument but

     

       
300
       
300
       
 
       
      # not their values.  The values are forwarding the result of the

     

       
301
       
301
       
 
       
      # evaluation of the option.

     

       
302
       
302
       
-
       
      requiredArgs = builtins.attrNames (lib.functionArgs f);

     

       
303
       
302
       
 
       
      context = name: ''while evaluating the module argument `${name}' in "${key}":'';

     

       
304
       
304
       
-
       
      extraArgs = builtins.listToAttrs (map (name: {

     

       
305
       
305
       
-
       
        inherit name;

     

       
306
       
306
       
-
       
        value = builtins.addErrorContext (context name)

     

       
307
       
307
       
-
       
          (args.${name} or config._module.args.${name});

     

       
308
       
308
       
-
       
      }) requiredArgs);

     

       
303
       
303
       
+
       
      extraArgs = builtins.mapAttrs (name: _:

     

       
304
       
304
       
+
       
        builtins.addErrorContext (context name)

     

       
305
       
305
       
+
       
          (args.${name} or config._module.args.${name})

     

       
306
       
306
       
+
       
      ) (lib.functionArgs f);

     

       
309
       
307
       
 
       


     

       
310
       
308
       
 
       
      # Note: we append in the opposite order such that we can add an error

     

       
311
       
309
       
 
       
      # context on the explicited arguments of "args" too. This update