Merge pull request #245271 from sternenseemann/module-system-merge-no-type

lib/modules: handle typeless options in mergeModules
This commit is contained in:
Robert Hensing 2023-07-27 10:55:08 +02:00 committed by GitHub
commit 19f1d7da06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 1 deletions

View File

@ -639,7 +639,7 @@ let
unmatchedDefns = []; unmatchedDefns = [];
} }
else if optionDecls != [] then else if optionDecls != [] then
if all (x: x.options.type.name == "submodule") optionDecls if all (x: x.options.type.name or null == "submodule") optionDecls
# Raw options can only be merged into submodules. Merging into # Raw options can only be merged into submodules. Merging into
# attrsets might be nice, but ambiguous. Suppose we have # attrsets might be nice, but ambiguous. Suppose we have
# attrset as a `attrsOf submodule`. User declares option # attrset as a `attrsOf submodule`. User declares option

View File

@ -371,6 +371,9 @@ checkConfigError \
config.set \ config.set \
./declare-set.nix ./declare-enable-nested.nix ./declare-set.nix ./declare-enable-nested.nix
# Check that that merging of option collisions doesn't depend on type being set
checkConfigError 'The option .group..*would be a parent of the following options, but its type .<no description>. does not support nested options.\n\s*- option.s. with prefix .group.enable..*' config.group.enable ./merge-typeless-option.nix
# Test that types.optionType merges types correctly # Test that types.optionType merges types correctly
checkConfigOutput '^10$' config.theOption.int ./optionTypeMerging.nix checkConfigOutput '^10$' config.theOption.int ./optionTypeMerging.nix
checkConfigOutput '^"hello"$' config.theOption.str ./optionTypeMerging.nix checkConfigOutput '^"hello"$' config.theOption.str ./optionTypeMerging.nix

View File

@ -0,0 +1,25 @@
{ lib, ... }:
let
typeless =
{ lib, ... }:
{
options.group = lib.mkOption { };
};
childOfTypeless =
{ lib, ... }:
{
options.group.enable = lib.mkEnableOption "nothing";
};
in
{
imports = [
typeless
childOfTypeless
];
config.group.enable = false;
}