From c7ade6844f4cb4691ad02065e9395b18b3addcda Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 3 Jan 2020 05:17:13 +0100 Subject: [PATCH] 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. --- lib/types.nix | 8 +++----- nixos/doc/manual/development/option-types.xml | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/lib/types.nix b/lib/types.nix index 847a4e902ca..de3c4f0d603 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -376,16 +376,14 @@ rec { else unify (if shorthandOnlyDefinesConfig then { config = value; } else value); 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 - coerce (lib.modules.unifyModuleSyntax file "${toString file}-${toString n}") value - else value + # Annotate the value with the location of its definition for better error messages + coerce (lib.modules.unifyModuleSyntax file "${toString file}-${toString n}") value ) defs; in mkOptionType rec { name = "submodule"; - check = x: isAttrs x || isFunction x || path.check x; + check = x: isAttrs x || isFunction x; merge = loc: defs: (evalModules { modules = allModules defs; 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 @@ A set of sub options o. - o 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 + o 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 types.submoduleWith { modules = toList o; shorthandOnlyDefinesConfig = true; }. Submodules are detailed in