diff options
| author | Silvan Mosberger <contact@infinisil.com> | 2019-12-05 03:29:51 +0100 |
|---|---|---|
| committer | Silvan Mosberger <contact@infinisil.com> | 2020-01-01 01:13:03 +0100 |
| commit | 5414b4018bf1161ad9bd0e98d0ffbde8aa435fe5 (patch) | |
| tree | 7272f147840b49cb2c36e500efc50f77ad847479 /lib/default.nix | |
| parent | 5002e6afbc70c6bf80efa5f997707b877cb59cdd (diff) | |
| download | nixpkgs-5414b4018bf1161ad9bd0e98d0ffbde8aa435fe5.tar nixpkgs-5414b4018bf1161ad9bd0e98d0ffbde8aa435fe5.tar.gz nixpkgs-5414b4018bf1161ad9bd0e98d0ffbde8aa435fe5.tar.bz2 nixpkgs-5414b4018bf1161ad9bd0e98d0ffbde8aa435fe5.tar.lz nixpkgs-5414b4018bf1161ad9bd0e98d0ffbde8aa435fe5.tar.xz nixpkgs-5414b4018bf1161ad9bd0e98d0ffbde8aa435fe5.tar.zst nixpkgs-5414b4018bf1161ad9bd0e98d0ffbde8aa435fe5.zip | |
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}
Diffstat (limited to 'lib/default.nix')
| -rw-r--r-- | lib/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
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 |