pyrox.dev / nixpkgs
lol
fork atom

lib/tests: Make sure the submodule type description can be evaluated

In 2d45a62899d47c109a0b8ce4ca9d33265b8a1a37, the submodule type
description was amended with the freeformType description. This causes
all the modules passed to the submodule to be evaluated once on their
own, without any extra definitions from the config section. This means
that the specified modules need to be valid on their own, without any
undeclared options.

This commit adds a test that evaluates a submodules option description,
which would trigger the above problem for one of the tests, if it were
not fixed by this commit as well.

This is done because the next commit makes option evaluation a bit more
strict, which would also trigger this test failure, even though it's not
related to the change at all.

Silvan Mosberger ce5e3113 68955fe6

options
unified split
Changed files
+4 -3
lib
tests
modules
declare-submoduleWith-modules.nix
modules.sh
+3
lib/tests/modules.sh 
···

       
175

       
175

       
 

       
## submoduleWith should merge all modules in one swoop


     

       
176

       
176

       
 

       
checkConfigOutput "true" config.submodule.inner ./declare-submoduleWith-modules.nix


     

       
177

       
177

       
 

       
checkConfigOutput "true" config.submodule.outer ./declare-submoduleWith-modules.nix


     

       

       
178

       
+

       
# Should also be able to evaluate the type name (which evaluates freeformType,


     

       

       
179

       
+

       
# which evaluates all the modules defined by the type)


     

       

       
180

       
+

       
checkConfigOutput "submodule" options.submodule.type.description ./declare-submoduleWith-modules.nix


     

       
178

       
181

       
 

       



     

       
179

       
182

       
 

       
## Paths should be allowed as values and work as expected


     

       
180

       
183

       
 

       
checkConfigOutput "true" config.submodule.enable ./declare-submoduleWith-path.nix
+1 -3
lib/tests/modules/declare-submoduleWith-modules.nix 
···

       
8

       
8

       
 

       
            default = false;


     

       
9

       
9

       
 

       
          };


     

       
10

       
10

       
 

       
        }


     

       
11

       

       
-

       
        {


     

       
12

       

       
-

       
          outer = true;


     

       
13

       

       
-

       
        }


     

       
14

       
11

       
 

       
      ];


     

       
15

       
12

       
 

       
    };


     

       
16

       
13

       
 

       
    default = {};


     
···

       
25

       
22

       
 

       
    })


     

       
26

       
23

       
 

       
    {


     

       
27

       
24

       
 

       
      inner = true;


     

       

       
25

       
+

       
      outer = true;


     

       
28

       
26

       
 

       
    }


     

       
29

       
27

       
 

       
  ];


     

       
30

       
28

       
 

       
}