From 81fa1e392be44585fe83e26921ce3bd720891def Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Thu, 24 Jan 2019 12:58:33 +0900 Subject: 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 --- lib/tests/modules/alias-with-priority-can-override.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/tests/modules/alias-with-priority-can-override.nix') diff --git a/lib/tests/modules/alias-with-priority-can-override.nix b/lib/tests/modules/alias-with-priority-can-override.nix index a6b26895f3a8d..ccb70b779a06a 100644 --- a/lib/tests/modules/alias-with-priority-can-override.nix +++ b/lib/tests/modules/alias-with-priority-can-override.nix @@ -32,7 +32,7 @@ with lib; imports = [ # Create an alias for the "enable" option. - (mkAliasOptionModuleWithPriority [ "enableAlias" ] [ "enable" ]) + (mkAliasOptionModule [ "enableAlias" ] [ "enable" ]) # Disable the aliased option, but with a default (low) priority so it # should be able to be overridden by the next import. -- cgit 1.4.1