commit 11537c9c0239dc4ae52477faa78a4a0a7bdf206c · pyrox.dev/nixpkgs

+21 -3

lib/modules.nix

···

       9
       9
        
           catAttrs

     

       10
       10
        
           concatLists

     

       11
       11
        
           concatMap

     

       12
       12
       +
           concatStringsSep

     

       12
       13
        
           elem

     

       13
       14
        
           filter

     

       14
       15
        
           findFirst

     
···

       46
       47
        
           showOption

     

       47
       48
        
           unknownModule

     

       48
       49
        
           ;

     

       50
       50
       +
       

     

       51
       51
       +
         showDeclPrefix = loc: decl: prefix:

     

       52
       52
       +
           " - option(s) with prefix `${showOption (loc ++ [prefix])}' in module `${decl._file}'";

     

       53
       53
       +
         showRawDecls = loc: decls:

     

       54
       54
       +
           concatStringsSep "\n"

     

       55
       55
       +
             (sort (a: b: a < b)

     

       56
       56
       +
               (concatMap

     

       57
       57
       +
                 (decl: map

     

       58
       58
       +
                   (showDeclPrefix loc decl)

     

       59
       59
       +
                   (attrNames decl.options)

     

       60
       60
       +
                 )

     

       61
       61
       +
                 decls

     

       62
       62
       +
             ));

     

       63
       63
       +
       

     

       49
       64
        
       in

     

       50
       65
        
       

     

       51
       66
        
       rec {

     
···

       500
       515
        
                     unmatchedDefns = [];

     

       501
       516
        
                   }

     

       502
       517
        
                 else if optionDecls != [] then

     

       503
       503
       -
                     if (lib.head optionDecls).options.type.name == "submodule"

     

       518
       518
       +
                     if all (x: x.options.type.name == "submodule") optionDecls

     

       504
       519
        
                     # Raw options can only be merged into submodules. Merging into

     

       505
       520
        
                     # attrsets might be nice, but ambiguous. Suppose we have

     

       506
       521
        
                     # attrset as a `attrsOf submodule`. User declares option

     
···

       509
       524
        
                     #  b. option `foo.bar` is available in all `attrset.*`

     

       510
       525
        
                     #  c. reject and require "<name>" as a reminder that it behaves like (b).

     

       511
       526
        
                     #  d. magically combine (a) and (c).

     

       512
       512
       -
                     # All options are merely syntax sugar though.

     

       527
       527
       +
                     # All of the above are merely syntax sugar though.

     

       513
       528
        
                     then

     

       514
       529
        
                       let opt = fixupOptionType loc (mergeOptionDecls loc (map optionTreeToOption decls));

     

       515
       530
        
                       in {

     
···

       519
       534
        
                     else

     

       520
       535
        
                       let

     

       521
       536
        
                         firstNonOption = findFirst (m: !isOption m.options) "" decls;

     

       537
       537
       +
                         nonOptions = filter (m: !isOption m.options) decls;

     

       522
       538
        
                       in

     

       523
       523
       -
                       throw "The option `${showOption loc}' in `${(lib.head optionDecls)._file}' is a prefix of options in `${firstNonOption._file}'."

     

       539
       539
       +
                       throw "The option `${showOption loc}' in module `${(lib.head optionDecls)._file}' would be a parent of the following options, but its type `${(lib.head optionDecls).options.type.description or "<no description>"}' does not support nested options.\n${

     

       540
       540
       +
                         showRawDecls loc nonOptions

     

       541
       541
       +
                       }"

     

       524
       542
        
                 else

     

       525
       543
        
                   mergeModules' loc decls defns) declsByName;

     

       526
       544

lib/tests/modules.sh

···

       309
       309
        
       checkConfigError "The option .multiple. is defined multiple times" config.multiple ./raw.nix

     

       310
       310
        
       checkConfigOutput "bar" config.priorities ./raw.nix

     

       311
       311
        
       

     

       312
       312
       +
       ## Option collision

     

       313
       313
       +
       checkConfigError \

     

       314
       314
       +
         'The option .set. in module .*/declare-set.nix. would be a parent of the following options, but its type .attribute set of signed integers. does not support nested options.\n\s*- option[(]s[)] with prefix .set.enable. in module .*/declare-enable-nested.nix.' \

     

       315
       315
       +
         config.set \

     

       316
       316
       +
         ./declare-set.nix ./declare-enable-nested.nix

     

       317
       317
       +
       

     

       312
       318
        
       # Test that types.optionType merges types correctly

     

       313
       319
        
       checkConfigOutput '^10$' config.theOption.int ./optionTypeMerging.nix

     

       314
       320
        
       checkConfigOutput '^"hello"$' config.theOption.str ./optionTypeMerging.nix

+12

lib/tests/modules/declare-set.nix

···

       1
       1
       +
       { lib, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       {

     

       4
       4
       +
         options.set = lib.mkOption {

     

       5
       5
       +
           default = { };

     

       6
       6
       +
           example = { a = 1; };

     

       7
       7
       +
           type = lib.types.attrsOf lib.types.int;

     

       8
       8
       +
           description = ''

     

       9
       9
       +
             Some descriptive text

     

       10
       10
       +
           '';

     

       11
       11
       +
         };

     

       12
       12
       +
       }