Skip to content

Commit

Permalink
lib.modules: configurationClass -> class
Browse files Browse the repository at this point in the history
This simplifies the documentation. `configuration` is implied by `_type`.
  • Loading branch information
roberth committed May 6, 2023
1 parent 89491be commit eab660d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions doc/module-system/module-system.chapter.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,6 @@ A portion of the configuration tree which is elided from `config`.

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

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

Equal to the [`class` parameter](#module-system-lib-evalModules-param-class).
The [`class` argument](#module-system-lib-evalModules-param-class).
2 changes: 1 addition & 1 deletion lib/modules.nix
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ let
config = checked (removeAttrs config [ "_module" ]);
_module = checked (config._module);
inherit extendModules type;
configurationClass = class;
class = class;
};
in result;

Expand Down
2 changes: 1 addition & 1 deletion lib/tests/modules.sh
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ checkConfigOutput '^1$' config.sub.specialisation.value ./extendModules-168767-i

# Class checks, evalModules
checkConfigOutput '^{ }$' config.ok.config ./class-check.nix
checkConfigOutput '"nixos"' config.ok.configurationClass ./class-check.nix
checkConfigOutput '"nixos"' config.ok.class ./class-check.nix
checkConfigError 'The module .*/module-class-is-darwin.nix was imported into nixos instead of darwin.' config.fail.config ./class-check.nix
checkConfigError 'The module foo.nix#darwinModules.default was imported into nixos instead of darwin.' config.fail-anon.config ./class-check.nix

Expand Down

0 comments on commit eab660d

Please sign in to comment.