From 5414b4018bf1161ad9bd0e98d0ffbde8aa435fe5 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 5 Dec 2019 03:29:51 +0100 Subject: lib/modules: Don't pack submodules specially This has the beneficial side effect of allowing paths to be used as modules in types.{submodule,submoduleWith} --- lib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/default.nix') diff --git a/lib/default.nix b/lib/default.nix index 8af53152586..e31edeaaf9e 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -102,7 +102,7 @@ let commitIdFromGitRepo cleanSourceWith pathHasContext canCleanSource; inherit (modules) evalModules closeModules unifyModuleSyntax - applyIfFunction unpackSubmodule packSubmodule mergeModules + applyIfFunction mergeModules mergeModules' mergeOptionDecls evalOptionValue mergeDefinitions pushDownProperties dischargeProperties filterOverrides sortProperties fixupOptionType mkIf mkAssert mkMerge mkOverride -- cgit 1.4.1