diff options
| author | Silvan Mosberger <contact@infinisil.com> | 2021-12-08 19:13:14 +0100 |
|---|---|---|
| committer | Silvan Mosberger <contact@infinisil.com> | 2022-03-01 19:31:02 +0100 |
| commit | 023fa7b9239e645f7dfcbbe3ee82ab0093f9978d (patch) | |
| tree | f665c6c625a270eba4d5aa7c4e12c1d60b53e29d /lib/modules.nix | |
| parent | 5cbeddfde486ca5524baeaf3da6e8944075cf463 (diff) | |
| download | nixpkgs-023fa7b9239e645f7dfcbbe3ee82ab0093f9978d.tar nixpkgs-023fa7b9239e645f7dfcbbe3ee82ab0093f9978d.tar.gz nixpkgs-023fa7b9239e645f7dfcbbe3ee82ab0093f9978d.tar.bz2 nixpkgs-023fa7b9239e645f7dfcbbe3ee82ab0093f9978d.tar.lz nixpkgs-023fa7b9239e645f7dfcbbe3ee82ab0093f9978d.tar.xz nixpkgs-023fa7b9239e645f7dfcbbe3ee82ab0093f9978d.tar.zst nixpkgs-023fa7b9239e645f7dfcbbe3ee82ab0093f9978d.zip | |
lib.modules: Use types.optionType for _module.freeformType
This ensures that the module file locations are propagated to the freeform type, which makes it so that submodules in freeform types now have their declaration location shown in the manual, fixing https://github.com/NixOS/nixpkgs/issues/132085. In addition, this also newly allows freeformTypes to be declared multiple times and all declarations being merged together according to normal option merging. This also removes some awkwardness regarding the type of `freeformType`
Diffstat (limited to 'lib/modules.nix')
| -rw-r--r-- | lib/modules.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/modules.nix b/lib/modules.nix index e9fc1007fc2..79d54e4a538 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -151,8 +151,7 @@ rec { }; _module.freeformType = mkOption { - # Disallow merging for now, but could be implemented nicely with a `types.optionType` - type = types.nullOr (types.uniq types.attrs); + type = types.nullOr types.optionType; internal = true; default = null; description = '' |