diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index ad2ea44c361a4..c383985760929 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -190,6 +190,9 @@ checkConfigOutput '^420$' config.bare-submodule.deep ./declare-bare-submodule.ni checkConfigOutput '^2$' config.bare-submodule.deep ./declare-bare-submodule.nix ./declare-bare-submodule-deep-option.nix ./define-shorthandOnlyDefinesConfig-true.nix checkConfigError 'The option .bare-submodule.deep. in .*/declare-bare-submodule-deep-option.nix. is already declared in .*/declare-bare-submodule-deep-option-duplicate.nix' config.bare-submodule.deep ./declare-bare-submodule.nix ./declare-bare-submodule-deep-option.nix ./declare-bare-submodule-deep-option-duplicate.nix +# Check that strMatching can be merged +checkConfigOutput '^"strMatching.*"$' options.sm.type.name ./strMatching-merge.nix + # Check integer types. # unsigned checkConfigOutput '^42$' config.value ./declare-int-unsigned-value.nix ./define-value-int-positive.nix diff --git a/lib/tests/modules/strMatching-merge.nix b/lib/tests/modules/strMatching-merge.nix new file mode 100644 index 0000000000000..2e043a5f97237 --- /dev/null +++ b/lib/tests/modules/strMatching-merge.nix @@ -0,0 +1,15 @@ +{ lib, ... }: +{ + imports = [ + { + options.sm = lib.mkOption { + type = lib.types.strMatching "\(.*\)"; + }; + } + { + options.sm = lib.mkOption { + type = lib.types.strMatching "\(.*\)"; + }; + } + ]; +}