commit 6110a6009fc77348e9c47e0801a9b884dc76c730 · pyrox.dev/nixpkgs

+12 -1

lib/modules.nix

···

       284
       284
        
               if config._module.check && config._module.freeformType == null && merged.unmatchedDefns != [] then

     

       285
       285
        
                 let

     

       286
       286
        
                   firstDef = head merged.unmatchedDefns;

     

       287
       287
       -
                   baseMsg = "The option `${showOption (prefix ++ firstDef.prefix)}' does not exist. Definition values:${showDefs [ firstDef ]}";

     

       287
       287
       +
                   baseMsg =

     

       288
       288
       +
                     let

     

       289
       289
       +
                       optText = showOption (prefix ++ firstDef.prefix);

     

       290
       290
       +
                       defText =

     

       291
       291
       +
                         builtins.addErrorContext

     

       292
       292
       +
                           "while evaluating the error message for definitions for `${optText}', which is an option that does not exist"

     

       293
       293
       +
                           (builtins.addErrorContext

     

       294
       294
       +
                             "while evaluating a definition from `${firstDef.file}'"

     

       295
       295
       +
                             ( showDefs [ firstDef ])

     

       296
       296
       +
                           );

     

       297
       297
       +
                     in

     

       298
       298
       +
                       "The option `${optText}' does not exist. Definition values:${defText}";

     

       288
       299
        
                 in

     

       289
       300
        
                   if attrNames options == [ "_module" ]

     

       290
       301
        
                     then

+3

lib/tests/modules.sh

···

       64
       64
        
       # Check boolean option.

     

       65
       65
        
       checkConfigOutput '^false$' config.enable ./declare-enable.nix

     

       66
       66
        
       checkConfigError 'The option .* does not exist. Definition values:\n\s*- In .*: true' config.enable ./define-enable.nix

     

       67
       67
       +
       checkConfigError 'The option .* does not exist. Definition values:\n\s*- In .*' config.enable ./define-enable-throw.nix

     

       68
       68
       +
       checkConfigError 'while evaluating a definition from `.*/define-enable-abort.nix' config.enable ./define-enable-abort.nix

     

       69
       69
       +
       checkConfigError 'while evaluating the error message for definitions for .enable., which is an option that does not exist' config.enable ./define-enable-abort.nix

     

       67
       70
        
       

     

       68
       71
        
       checkConfigOutput '^1$' config.bare-submodule.nested ./declare-bare-submodule.nix ./declare-bare-submodule-nested-option.nix

     

       69
       72
        
       checkConfigOutput '^2$' config.bare-submodule.deep ./declare-bare-submodule.nix ./declare-bare-submodule-deep-option.nix

+3

lib/tests/modules/define-enable-abort.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         config.enable = abort "oops";

     

       3
       3
       +
       }

+3

lib/tests/modules/define-enable-throw.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         config.enable = throw "oops";

     

       3
       3
       +
       }