commit 1ffa30b0559a05e810a3db663da5066953d4f05a · pyrox.dev/nixpkgs

+2 -1

lib/modules.nix

···

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

     

       441
       441
        
               }

     

       442
       442
        
           else

     

       443
       443
       +
             # shorthand syntax

     

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

     

       444
       445
        
             { _file = toString m._file or file;

     

       445
       446
        
               key = toString m.key or key;

     

       446
       447
        
               disabledModules = m.disabledModules or [];

     

       447
       448
        
               imports = m.require or [] ++ m.imports or [];

     

       448
       449
        
               options = {};

     

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

     

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

     

       450
       451
        
             };

     

       451
       452
        
       

     

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

+3

lib/tests/modules.sh

···

       58
       58
        
           fi

     

       59
       59
        
       }

     

       60
       60
        
       

     

       61
       61
       +
       # Shorthand meta attribute does not duplicate the config

     

       62
       62
       +
       checkConfigOutput '^"one two"$' config.result ./shorthand-meta.nix

     

       63
       63
       +
       

     

       61
       64
        
       # Check boolean option.

     

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

     

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

+19

lib/tests/modules/shorthand-meta.nix

···

       1
       1
       +
       { lib, ... }:

     

       2
       2
       +
       let

     

       3
       3
       +
         inherit (lib) types mkOption;

     

       4
       4
       +
       in

     

       5
       5
       +
       {

     

       6
       6
       +
         imports = [

     

       7
       7
       +
           ({ config, ... }: {

     

       8
       8
       +
             options = {

     

       9
       9
       +
               meta.foo = mkOption {

     

       10
       10
       +
                 type = types.listOf types.str;

     

       11
       11
       +
               };

     

       12
       12
       +
               result = mkOption { default = lib.concatStringsSep " " config.meta.foo; };

     

       13
       13
       +
             };

     

       14
       14
       +
           })

     

       15
       15
       +
           {

     

       16
       16
       +
             meta.foo = [ "one" "two" ];

     

       17
       17
       +
           }

     

       18
       18
       +
         ];

     

       19
       19
       +
       }