diff options
author | Silvan Mosberger <contact@infinisil.com> | 2020-01-03 05:17:13 +0100 |
---|---|---|
committer | Silvan Mosberger <contact@infinisil.com> | 2020-01-03 05:21:01 +0100 |
commit | c7ade6844f4cb4691ad02065e9395b18b3addcda (patch) | |
tree | acd08e2636350c97d19b2b192ffb6475921153d3 /nixos/doc | |
parent | 804678f9ea5222bb8a6c011639b0735ca9b8d64c (diff) | |
download | nixpkgs-c7ade6844f4cb4691ad02065e9395b18b3addcda.tar nixpkgs-c7ade6844f4cb4691ad02065e9395b18b3addcda.tar.gz nixpkgs-c7ade6844f4cb4691ad02065e9395b18b3addcda.tar.bz2 nixpkgs-c7ade6844f4cb4691ad02065e9395b18b3addcda.tar.lz nixpkgs-c7ade6844f4cb4691ad02065e9395b18b3addcda.tar.xz nixpkgs-c7ade6844f4cb4691ad02065e9395b18b3addcda.tar.zst nixpkgs-c7ade6844f4cb4691ad02065e9395b18b3addcda.zip |
Revert "lib/types: Allow paths as submodule values"
This reverts commit eec83d41e3e7d9ad5bc1086198d972d55bab1203. This broke hydra evaluation because with this commit submodule values are allowed to be paths, however the certmgr module uses `either (submodule ...) path` in its type, meaning it already used paths for something else which would now be interpreted as a submodule.
Diffstat (limited to 'nixos/doc')
-rw-r--r-- | nixos/doc/manual/development/option-types.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml index 173fdfcbbc8..1ec7e3efad7 100644 --- a/nixos/doc/manual/development/option-types.xml +++ b/nixos/doc/manual/development/option-types.xml @@ -257,9 +257,9 @@ <listitem> <para> A set of sub options <replaceable>o</replaceable>. - <replaceable>o</replaceable> can be an attribute set, a function - returning an attribute set, or a path to a file containing such a value. Submodules are used in - composed types to create modular options. This is equivalent to + <replaceable>o</replaceable> can be an attribute set or a function + returning an attribute set. Submodules are used in composed types to + create modular options. This is equivalent to <literal>types.submoduleWith { modules = toList o; shorthandOnlyDefinesConfig = true; }</literal>. Submodules are detailed in <xref |