commit eab660d91e5d7a2796bc6e4b94b5939ed593db29 · pyrox.dev/nixpkgs

+2 -2

doc/module-system/module-system.chapter.md

···

       100
        
       

     

       101
        
       A nominal type marker, always `"configuration"`.

     

       102
        
       

     

       103
       -
       #### `configurationClass` {#module-system-lib-evalModules-return-value-_configurationClass}

     

       104
        
       

     

       105
       -
       Equal to the [`class` parameter](#module-system-lib-evalModules-param-class).

···

       100
        
       

     

       101
        
       A nominal type marker, always `"configuration"`.

     

       102
        
       

     

       103
       +
       #### `class` {#module-system-lib-evalModules-return-value-_configurationClass}

     

       104
        
       

     

       105
       +
       The [`class` argument](#module-system-lib-evalModules-param-class).

+1 -1

lib/modules.nix

···

       326
        
               config = checked (removeAttrs config [ "_module" ]);

     

       327
        
               _module = checked (config._module);

     

       328
        
               inherit extendModules type;

     

       329
       -
               configurationClass = class;

     

       330
        
             };

     

       331
        
           in result;

     

       332

···

       326
        
               config = checked (removeAttrs config [ "_module" ]);

     

       327
        
               _module = checked (config._module);

     

       328
        
               inherit extendModules type;

     

       329
       +
               class = class;

     

       330
        
             };

     

       331
        
           in result;

     

       332

+1 -1

lib/tests/modules.sh

···

       364
        
       

     

       365
        
       # Class checks, evalModules

     

       366
        
       checkConfigOutput '^{ }$' config.ok.config ./class-check.nix

     

       367
       -
       checkConfigOutput '"nixos"' config.ok.configurationClass ./class-check.nix

     

       368
        
       checkConfigError 'The module .*/module-class-is-darwin.nix was imported into nixos instead of darwin.' config.fail.config ./class-check.nix

     

       369
        
       checkConfigError 'The module foo.nix#darwinModules.default was imported into nixos instead of darwin.' config.fail-anon.config ./class-check.nix

     

       370

···

       364
        
       

     

       365
        
       # Class checks, evalModules

     

       366
        
       checkConfigOutput '^{ }$' config.ok.config ./class-check.nix

     

       367
       +
       checkConfigOutput '"nixos"' config.ok.class ./class-check.nix

     

       368
        
       checkConfigError 'The module .*/module-class-is-darwin.nix was imported into nixos instead of darwin.' config.fail.config ./class-check.nix

     

       369
        
       checkConfigError 'The module foo.nix#darwinModules.default was imported into nixos instead of darwin.' config.fail-anon.config ./class-check.nix

     

       370