diff options
| author | Silvan Mosberger <contact@infinisil.com> | 2020-01-02 22:09:31 +0100 |
|---|---|---|
| committer | Silvan Mosberger <contact@infinisil.com> | 2020-01-09 17:26:05 +0100 |
| commit | de5f73d434dda62048f67282804e9f417bb893d1 (patch) | |
| tree | 09a408e586f3a4d41d8d8a1d67c3c85e7a0bdf3b /lib/default.nix | |
| parent | 845e92835d90d300142157c6bae9ca5b7831e2bd (diff) | |
| download | nixpkgs-de5f73d434dda62048f67282804e9f417bb893d1.tar nixpkgs-de5f73d434dda62048f67282804e9f417bb893d1.tar.gz nixpkgs-de5f73d434dda62048f67282804e9f417bb893d1.tar.bz2 nixpkgs-de5f73d434dda62048f67282804e9f417bb893d1.tar.lz nixpkgs-de5f73d434dda62048f67282804e9f417bb893d1.tar.xz nixpkgs-de5f73d434dda62048f67282804e9f417bb893d1.tar.zst nixpkgs-de5f73d434dda62048f67282804e9f417bb893d1.zip | |
lib/modules: Recursive disabledModules
With this change, disabledModules applies recursively, meaning if you
have a module "foo.nix" with
imports = [ ./bar.nix ];
then setting
disabledModules = [ "foo.nix" ];
will disable both "foo.nix" and "bar.nix", whereas previously only
"foo.nix" would be disabled.
This change along with https://github.com/NixOS/nixpkgs/pull/61570 allows
modules to be fully disabled even when they have some `mkRenamedOption`
imports.
Diffstat (limited to 'lib/default.nix')
| -rw-r--r-- | lib/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/default.nix b/lib/default.nix index e31edeaaf9e..9f7a088d792 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -101,7 +101,7 @@ let cleanSource sourceByRegex sourceFilesBySuffices commitIdFromGitRepo cleanSourceWith pathHasContext canCleanSource; - inherit (modules) evalModules closeModules unifyModuleSyntax + inherit (modules) evalModules unifyModuleSyntax applyIfFunction mergeModules mergeModules' mergeOptionDecls evalOptionValue mergeDefinitions pushDownProperties dischargeProperties filterOverrides @@ -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' |