diff options
| author | Katharina Fey <kookie@spacekookie.de> | 2020-01-12 01:00:12 +0000 |
|---|---|---|
| committer | Katharina Fey <kookie@spacekookie.de> | 2020-01-12 01:00:12 +0000 |
| commit | eeaf5d25d5f6ae7ae1f5bf8a3dee4559693f8147 (patch) | |
| tree | afc41ca8dde96b41089ca324533084aef570322f /nixpkgs/lib/default.nix | |
| parent | 63c4c4dda49dc69e5812faa7ef8406180998f3ae (diff) | |
| parent | e4134747f5666bcab8680aff67fa3b63384f9a0f (diff) | |
Merge commit 'e4134747f5666bcab8680aff67fa3b63384f9a0f'
Diffstat (limited to 'nixpkgs/lib/default.nix')
| -rw-r--r-- | nixpkgs/lib/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixpkgs/lib/default.nix b/nixpkgs/lib/default.nix index 8af53152586..9f7a088d792 100644 --- a/nixpkgs/lib/default.nix +++ b/nixpkgs/lib/default.nix @@ -101,8 +101,8 @@ let cleanSource sourceByRegex sourceFilesBySuffices commitIdFromGitRepo cleanSourceWith pathHasContext canCleanSource; - inherit (modules) evalModules closeModules unifyModuleSyntax - applyIfFunction unpackSubmodule packSubmodule mergeModules + inherit (modules) evalModules unifyModuleSyntax + applyIfFunction mergeModules mergeModules' mergeOptionDecls evalOptionValue mergeDefinitions pushDownProperties dischargeProperties filterOverrides sortProperties fixupOptionType mkIf mkAssert mkMerge mkOverride @@ -110,7 +110,7 @@ let mkFixStrictness mkOrder mkBefore mkAfter mkAliasDefinitions mkAliasAndWrapDefinitions fixMergeModules mkRemovedOptionModule mkRenamedOptionModule mkMergedOptionModule mkChangedOptionModule - mkAliasOptionModule doRename filterModules; + mkAliasOptionModule doRename; inherit (options) isOption mkEnableOption mkSinkUndeclaredOptions mergeDefaultOption mergeOneOption mergeEqualOption getValues getFiles optionAttrSetToDocList optionAttrSetToDocList' |