commit 8f425c25adc365ccddab932cae96cdbed96c115b · pyrox.dev/nixpkgs

+9 -9

lib/tests/modules.sh

···

       542
       542
        
       

     

       543
       543
        
       # Declaration positions

     

       544
       544
        
       # Line should be present for direct options

     

       545
       545
       -
       checkConfigOutput '^10$' options.imported.line10.declarationPositions.0.line ./declaration-positions.nix

     

       546
       546
       -
       checkConfigOutput '/declaration-positions.nix"$' options.imported.line10.declarationPositions.0.file ./declaration-positions.nix

     

       545
       545
       +
       checkConfigOutput '^14$' options.imported.line14.declarationPositions.0.line ./declaration-positions.nix

     

       546
       546
       +
       checkConfigOutput '/declaration-positions.nix"$' options.imported.line14.declarationPositions.0.file ./declaration-positions.nix

     

       547
       547
        
       # Generated options may not have line numbers but they will at least get the

     

       548
       548
        
       # right file

     

       549
       549
       -
       checkConfigOutput '/declaration-positions.nix"$' options.generated.line18.declarationPositions.0.file ./declaration-positions.nix

     

       550
       550
       -
       checkConfigOutput '^null$' options.generated.line18.declarationPositions.0.line ./declaration-positions.nix

     

       549
       549
       +
       checkConfigOutput '/declaration-positions.nix"$' options.generated.line22.declarationPositions.0.file ./declaration-positions.nix

     

       550
       550
       +
       checkConfigOutput '^null$' options.generated.line22.declarationPositions.0.line ./declaration-positions.nix

     

       551
       551
        
       # Submodules don't break it

     

       552
       552
       -
       checkConfigOutput '^39$' config.submoduleLine34.submodDeclLine39.0.line ./declaration-positions.nix

     

       553
       553
       -
       checkConfigOutput '/declaration-positions.nix"$' config.submoduleLine34.submodDeclLine39.0.file ./declaration-positions.nix

     

       552
       552
       +
       checkConfigOutput '^45$' config.submoduleLine38.submodDeclLine45.0.line ./declaration-positions.nix

     

       553
       553
       +
       checkConfigOutput '/declaration-positions.nix"$' config.submoduleLine38.submodDeclLine45.0.file ./declaration-positions.nix

     

       554
       554
        
       # New options under freeform submodules get collected into the parent submodule

     

       555
       555
        
       # (consistent with .declarations behaviour, but weird; notably appears in system.build)

     

       556
       556
       -
       checkConfigOutput '^34|23$' options.submoduleLine34.declarationPositions.0.line ./declaration-positions.nix

     

       557
       557
       -
       checkConfigOutput '^34|23$' options.submoduleLine34.declarationPositions.1.line ./declaration-positions.nix

     

       556
       556
       +
       checkConfigOutput '^38|27$' options.submoduleLine38.declarationPositions.0.line ./declaration-positions.nix

     

       557
       557
       +
       checkConfigOutput '^38|27$' options.submoduleLine38.declarationPositions.1.line ./declaration-positions.nix

     

       558
       558
        
       # nested options work

     

       559
       559
       -
       checkConfigOutput '^30$' options.nested.nestedLine30.declarationPositions.0.line ./declaration-positions.nix

     

       559
       559
       +
       checkConfigOutput '^34$' options.nested.nestedLine34.declarationPositions.0.line ./declaration-positions.nix

     

       560
       560
        
       

     

       561
       561
        
       cat <<EOF

     

       562
       562
        
       ====== module tests ======

+19 -11

lib/tests/modules/declaration-positions.nix

···

       1
       1
        
       { lib, options, ... }:

     

       2
       2
       -
       let discardPositions = lib.mapAttrs (k: v: v);

     

       2
       2
       +
       let

     

       3
       3
       +
         discardPositions = lib.mapAttrs (k: v: v);

     

       3
       4
        
       in

     

       4
       5
        
       # unsafeGetAttrPos is unspecified best-effort behavior, so we only want to consider this test on an evaluator that satisfies some basic assumptions about this function.

     

       5
       6
        
       assert builtins.unsafeGetAttrPos "a" { a = true; } != null;

     

       6
       6
       -
       assert builtins.unsafeGetAttrPos "a" (discardPositions { a = true; }) == null;

     

       7
       7
       +
       assert

     

       8
       8
       +
         builtins.unsafeGetAttrPos "a" (discardPositions {

     

       9
       9
       +
           a = true;

     

       10
       10
       +
         }) == null;

     

       7
       11
        
       {

     

       8
       12
        
         imports = [

     

       9
       13
        
           {

     

       10
       10
       -
             options.imported.line10 = lib.mkOption {

     

       14
       14
       +
             options.imported.line14 = lib.mkOption {

     

       11
       15
        
               type = lib.types.int;

     

       12
       16
        
             };

     

       13
       17
        
       

     
···

       15
       19
        
             # programs.firefox.nativeMessagingHosts.ff2mpv. We don't expect to get

     

       16
       20
        
             # line numbers for these, but we can fall back on knowing the file.

     

       17
       21
        
             options.generated = discardPositions {

     

       18
       18
       -
               line18 = lib.mkOption {

     

       22
       22
       +
               line22 = lib.mkOption {

     

       19
       23
        
                 type = lib.types.int;

     

       20
       24
        
               };

     

       21
       25
        
             };

     

       22
       26
        
       

     

       23
       23
       -
             options.submoduleLine34.extraOptLine23 = lib.mkOption {

     

       27
       27
       +
             options.submoduleLine38.extraOptLine27 = lib.mkOption {

     

       24
       28
        
               default = 1;

     

       25
       29
        
               type = lib.types.int;

     

       26
       30
        
             };

     

       27
       31
        
           }

     

       28
       32
        
         ];

     

       29
       33
        
       

     

       30
       30
       -
         options.nested.nestedLine30 = lib.mkOption {

     

       34
       34
       +
         options.nested.nestedLine34 = lib.mkOption {

     

       31
       35
        
           type = lib.types.int;

     

       32
       36
        
         };

     

       33
       37
        
       

     

       34
       34
       -
         options.submoduleLine34 = lib.mkOption {

     

       38
       38
       +
         options.submoduleLine38 = lib.mkOption {

     

       35
       39
        
           default = { };

     

       36
       40
        
           type = lib.types.submoduleWith {

     

       37
       41
        
             modules = [

     

       38
       38
       -
               ({ options, ... }: {

     

       39
       39
       -
                 options.submodDeclLine39 = lib.mkOption { };

     

       40
       40
       -
               })

     

       42
       42
       +
               (

     

       43
       43
       +
                 { options, ... }:

     

       44
       44
       +
                 {

     

       45
       45
       +
                   options.submodDeclLine45 = lib.mkOption { };

     

       46
       46
       +
                 }

     

       47
       47
       +
               )

     

       41
       48
        
               { freeformType = with lib.types; lazyAttrsOf (uniq unspecified); }

     

       42
       49
        
             ];

     

       43
       50
        
           };

     

       44
       51
        
         };

     

       45
       52
        
       

     

       46
       53
        
         config = {

     

       47
       47
       -
           submoduleLine34.submodDeclLine39 = (options.submoduleLine34.type.getSubOptions [ ]).submodDeclLine39.declarationPositions;

     

       54
       54
       +
           submoduleLine38.submodDeclLine45 =

     

       55
       55
       +
             (options.submoduleLine38.type.getSubOptions [ ]).submodDeclLine45.declarationPositions;

     

       48
       56
        
         };

     

       49
       57
        
       }