commit 023fa7b9239e645f7dfcbbe3ee82ab0093f9978d · pyrox.dev/nixpkgs

+1 -2

lib/modules.nix

···

       151
       151
        
                 };

     

       152
       152
        
       

     

       153
       153
        
                 _module.freeformType = mkOption {

     

       154
       154
       -
                   # Disallow merging for now, but could be implemented nicely with a `types.optionType`

     

       155
       155
       -
                   type = types.nullOr (types.uniq types.attrs);

     

       154
       154
       +
                   type = types.nullOr types.optionType;

     

       156
       155
        
                   internal = true;

     

       157
       156
        
                   default = null;

     

       158
       157
        
                   description = ''

+5

lib/tests/modules.sh

···

       240
       240
        
       checkConfigError 'infinite recursion encountered' config.foo ./freeform-attrsOf.nix ./freeform-unstr-dep-str.nix

     

       241
       241
        
       checkConfigError 'The option .* is used but not defined' config.foo ./freeform-lazyAttrsOf.nix ./freeform-unstr-dep-str.nix

     

       242
       242
        
       checkConfigOutput '^"24"$' config.foo ./freeform-lazyAttrsOf.nix ./freeform-unstr-dep-str.nix ./define-value-string.nix

     

       243
       243
       +
       # submodules in freeformTypes should have their locations annotated

     

       244
       244
       +
       checkConfigOutput '/freeform-submodules.nix"$' config.fooDeclarations.0 ./freeform-submodules.nix

     

       245
       245
       +
       # freeformTypes can get merged using `types.type`, including submodules

     

       246
       246
       +
       checkConfigOutput '^10$' config.free.xxx.foo ./freeform-submodules.nix

     

       247
       247
       +
       checkConfigOutput '^10$' config.free.yyy.bar ./freeform-submodules.nix

     

       243
       248
        
       

     

       244
       249
        
       ## types.anything

     

       245
       250
        
       # Check that attribute sets are merged recursively

+22

lib/tests/modules/freeform-submodules.nix

···

       1
       1
       +
       { lib, options, ... }: with lib.types; {

     

       2
       2
       +
       

     

       3
       3
       +
         options.fooDeclarations = lib.mkOption {

     

       4
       4
       +
           default = (options.free.type.getSubOptions [])._freeformOptions.foo.declarations;

     

       5
       5
       +
         };

     

       6
       6
       +
       

     

       7
       7
       +
         options.free = lib.mkOption {

     

       8
       8
       +
           type = submodule {

     

       9
       9
       +
             config._module.freeformType = lib.mkMerge [

     

       10
       10
       +
               (attrsOf (submodule {

     

       11
       11
       +
                 options.foo = lib.mkOption {};

     

       12
       12
       +
               }))

     

       13
       13
       +
               (attrsOf (submodule {

     

       14
       14
       +
                 options.bar = lib.mkOption {};

     

       15
       15
       +
               }))

     

       16
       16
       +
             ];

     

       17
       17
       +
           };

     

       18
       18
       +
         };

     

       19
       19
       +
       

     

       20
       20
       +
         config.free.xxx.foo = 10;

     

       21
       21
       +
         config.free.yyy.bar = 10;

     

       22
       22
       +
       }