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/modules.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'lib/modules.nix') diff --git a/lib/modules.nix b/lib/modules.nix index 9f8e196ee0f..a599f5f4d77 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -609,6 +609,9 @@ rec { forwards any definitions of boot.copyKernels to boot.loader.grub.copyKernels while printing a warning. + + This also copies over the priority from the aliased option to the + non-aliased option. */ mkRenamedOptionModule = from: to: doRename { inherit from to; @@ -703,16 +706,7 @@ rec { use = id; }; - /* Like ‘mkAliasOptionModule’, but copy over the priority of the option as well. */ - mkAliasOptionModuleWithPriority = from: to: doRename { - inherit from to; - visible = true; - warn = false; - use = id; - withPriority = true; - }; - - doRename = { from, to, visible, warn, use, withPriority ? false }: + doRename = { from, to, visible, warn, use, withPriority ? true }: { config, options, ... }: let fromOpt = getAttrFromPath from options; -- cgit 1.4.1