mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 22:20:51 +00:00
Code Issues Wiki Activity

lib/types: Allow paths as submodule values

Browse source
This commit is contained in:
Silvan Mosberger 2020-01-03 05:22:11 +01:00
parent 228a7b173e
commit 6525da6321
No known key found for this signature in database
GPG key ID: E8F1E9EAD284E17D
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/tests/modules.sh
View file

@ -174,8 +174,7 @@ checkConfigOutput "true" config.submodule.inner ./declare-submoduleWith-modules.
checkConfigOutput "true" config.submodule.outer ./declare-submoduleWith-modules.nix checkConfigOutput "true" config.submodule.outer ./declare-submoduleWith-modules.nix
## Paths should be allowed as values and work as expected ## Paths should be allowed as values and work as expected
# Temporarily disabled until https://github.com/NixOS/nixpkgs/pull/76861 checkConfigOutput "true" config.submodule.enable ./declare-submoduleWith-path.nix
#checkConfigOutput "true" config.submodule.enable ./declare-submoduleWith-path.nix
cat <<EOF cat <<EOF
====== module tests ====== ====== module tests ======

4
lib/types.nix
View file

@ -392,14 +392,16 @@ rec {
else unify (if shorthandOnlyDefinesConfig then { config = value; } else value); else unify (if shorthandOnlyDefinesConfig then { config = value; } else value);
allModules = defs: modules ++ imap1 (n: { value, file }: allModules = defs: modules ++ imap1 (n: { value, file }:
if isAttrs value || isFunction value then
# Annotate the value with the location of its definition for better error messages # Annotate the value with the location of its definition for better error messages
coerce (lib.modules.unifyModuleSyntax file "${toString file}-${toString n}") value coerce (lib.modules.unifyModuleSyntax file "${toString file}-${toString n}") value
else value
) defs; ) defs;
in in
mkOptionType rec { mkOptionType rec {
name = "submodule"; name = "submodule";
check = x: isAttrs x || isFunction x; check = x: isAttrs x || isFunction x || path.check x;
merge = loc: defs: merge = loc: defs:
(evalModules { (evalModules {
modules = allModules defs; modules = allModules defs;

6
nixos/doc/manual/development/option-types.xml
View file

@ -257,9 +257,9 @@
<listitem> <listitem>
<para> <para>
A set of sub options <replaceable>o</replaceable>. A set of sub options <replaceable>o</replaceable>.
<replaceable>o</replaceable> can be an attribute set or a function <replaceable>o</replaceable> can be an attribute set, a function
returning an attribute set. Submodules are used in composed types to returning an attribute set, or a path to a file containing such a value. Submodules are used in
create modular options. This is equivalent to composed types to create modular options. This is equivalent to
<literal>types.submoduleWith { modules = toList o; shorthandOnlyDefinesConfig = true; }</literal>. <literal>types.submoduleWith { modules = toList o; shorthandOnlyDefinesConfig = true; }</literal>.
Submodules are detailed in Submodules are detailed in
<xref <xref