commit 3c4a49f506575306f8b355e86d2b19cf02c84688 · pyrox.dev/nixpkgs

+2 -3

lib/modules.nix

···

       462
       462
        
                 config = addFreeformType (addMeta (m.config or {}));

     

       463
       463
        
               }

     

       464
       464
        
           else

     

       465
       465
       +
             lib.throwIfNot (isAttrs m) "module ${file} (${key}) does not look like a module."

     

       465
       466
        
             { _file = toString m._file or file;

     

       466
       467
        
               key = toString m.key or key;

     

       467
       468
        
               disabledModules = m.disabledModules or [];

     

       468
       469
        
               imports = m.require or [] ++ m.imports or [];

     

       469
       470
        
               options = {};

     

       470
       470
       -
               config =

     

       471
       471
       -
                 lib.throwIfNot (isAttrs m) "module ${file} (${key}) does not look like a module."

     

       472
       472
       -
                 addFreeformType (addMeta (removeAttrs m ["_file" "key" "disabledModules" "require" "imports" "freeformType"]));

     

       471
       471
       +
               config = addFreeformType (addMeta (removeAttrs m ["_file" "key" "disabledModules" "require" "imports" "freeformType"]));

     

       473
       472
        
             };

     

       474
       473
        
       

     

       475
       474
        
         applyModuleArgsIfFunction = key: f: args@{ config, options, lib, ... }: if isFunction f then

+1

lib/tests/modules.sh

···

       199
       199
        
       checkConfigOutput '"beta"' config.nodes.foo.settingsDict.c ./deferred-module.nix

     

       200
       200
        
       # errors from the default module are reported with accurate location

     

       201
       201
        
       checkConfigError 'In `the-file-that-contains-the-bad-config.nix, via option default'\'': "bogus"' config.nodes.foo.bottom ./deferred-module.nix

     

       202
       202
       +
       checkConfigError '.*lib/tests/modules/deferred-module-error.nix, via option deferred [(]:anon-1:anon-1:anon-1[)] does not look like a module.' config.result ./deferred-module-error.nix

     

       202
       203
        
       

     

       203
       204
        
       # Check the file location information is propagated into submodules

     

       204
       205
        
       checkConfigOutput the-file.nix config.submodule.internalFiles.0 ./submoduleFiles.nix

+20

lib/tests/modules/deferred-module-error.nix

···

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

     

       2
       2
       +
       let

     

       3
       3
       +
         inherit (lib) types mkOption setDefaultModuleLocation evalModules;

     

       4
       4
       +
         inherit (types) deferredModule lazyAttrsOf submodule str raw enum;

     

       5
       5
       +
       in

     

       6
       6
       +
       {

     

       7
       7
       +
         options = {

     

       8
       8
       +
           deferred = mkOption {

     

       9
       9
       +
             type = deferredModule;

     

       10
       10
       +
           };

     

       11
       11
       +
           result = mkOption {

     

       12
       12
       +
             default = (evalModules { modules = [ config.deferred ]; }).config.result;

     

       13
       13
       +
           };

     

       14
       14
       +
         };

     

       15
       15
       +
         config = {

     

       16
       16
       +
           deferred = { ... }:

     

       17
       17
       +
             # this should be an attrset, so this fails

     

       18
       18
       +
             true;

     

       19
       19
       +
         };

     

       20
       20
       +
       }