diff options
| author | (cdep)illabout <cdep.illabout@gmail.com> | 2019-01-24 12:58:33 +0900 |
|---|---|---|
| committer | (cdep)illabout <cdep.illabout@gmail.com> | 2019-01-24 13:02:16 +0900 |
| commit | 81fa1e392be44585fe83e26921ce3bd720891def (patch) | |
| tree | 7c551320ca703cc7684fa7d2e0f85d0f364d2053 /lib/default.nix | |
| parent | 0abf1810668ec8df0321156b0675519610513100 (diff) | |
| download | nixpkgs-81fa1e392be44585fe83e26921ce3bd720891def.tar nixpkgs-81fa1e392be44585fe83e26921ce3bd720891def.tar.gz nixpkgs-81fa1e392be44585fe83e26921ce3bd720891def.tar.bz2 nixpkgs-81fa1e392be44585fe83e26921ce3bd720891def.tar.lz nixpkgs-81fa1e392be44585fe83e26921ce3bd720891def.tar.xz nixpkgs-81fa1e392be44585fe83e26921ce3bd720891def.tar.zst nixpkgs-81fa1e392be44585fe83e26921ce3bd720891def.zip | |
lib/modules: Change mkAliasOptionModule to use the priority for the alias.
This commit changes the `mkAliasOptionModule` function to make sure that the priority for the aliased option is propagated to the non-aliased option. This also affects the `mkRenamedOptionModule` function in a similar fashion. This also removes the `mkAliasOptionModuleWithPriority` function, since its functionality is now subsumed by `mkAliasOptionModule`. This change was recommended by @nbp: https://github.com/NixOS/nixpkgs/pull/53397#discussion_r245487432
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 d400907ebb0..dbb90081b2c 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -109,7 +109,7 @@ let mkFixStrictness mkOrder mkBefore mkAfter mkAliasDefinitions mkAliasAndWrapDefinitions fixMergeModules mkRemovedOptionModule mkRenamedOptionModule mkMergedOptionModule mkChangedOptionModule - mkAliasOptionModule mkAliasOptionModuleWithPriority doRename filterModules; + mkAliasOptionModule doRename filterModules; inherit (options) isOption mkEnableOption mkSinkUndeclaredOptions mergeDefaultOption mergeOneOption mergeEqualOption getValues getFiles optionAttrSetToDocList optionAttrSetToDocList' |