diff options
| -rw-r--r-- | lib/modules.nix | 2 | ||||
| -rw-r--r-- | lib/types.nix | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/lib/modules.nix b/lib/modules.nix index bde89123cd9..540eba1dd3d 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -505,7 +505,7 @@ rec { firstOption = findFirst (m: isOption m.options) "" decls; firstNonOption = findFirst (m: !isOption m.options) "" decls; in - if firstOption.options.type?isSubmodule && firstOption.options.type.isSubmodule + if firstOption.options.type.name == "submodule" then let opt = fixupOptionType loc (mergeOptionDecls loc (map optionTreeToOption decls)); in { diff --git a/lib/types.nix b/lib/types.nix index 51046c2c31b..3fcac9c31b3 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -642,11 +642,6 @@ rec { else throw "A submoduleWith option is declared multiple times with conflicting shorthandOnlyDefinesConfig values"; }; }; - } // { - # Submodule-typed options get special treatment in order to facilitate - # certain migrations, such as the addition of freeformTypes onto - # existing option trees. - isSubmodule = true; }; # A value from a set of allowed ones. |