diff options
| -rw-r--r-- | lib/modules.nix | 25 | ||||
| -rw-r--r-- | nixos/modules/rename.nix | 4 |
2 files changed, 27 insertions, 2 deletions
diff --git a/lib/modules.nix b/lib/modules.nix index fdee8824493d..d0b8f90e5ce6 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -356,6 +356,31 @@ rec { mkBefore = mkOrder 500; mkAfter = mkOrder 1500; + # Convenient property used to transfer all definitions and their + # properties from one option to another. This property is useful for + # renaming options, and also for including properties from another module + # system, including sub-modules. + # + # { config, options, ... }: + # + # { + # # 'bar' might not always be defined in the current module-set. + # config.foo.enable = mkAliasDefinitions (options.bar.enable or {}); + # + # # 'barbaz' has to be defined in the current module-set. + # config.foobar.paths = mkAliasDefinitions options.barbaz.paths; + # } + # + # Note, this is different than taking the value of the option and using it + # as a definition, as the new definition will not keep the mkOverride / + # mkDefault properties of the previous option. + # + mkAliasDefinitions = mkAliasAndWrapDefinitions id; + mkAliasAndWrapDefinitions = wrap: option: + mkMerge + (optional (isOption option && option.isDefined) + (wrap (mkMerge option.definitions))); + /* Compatibility. */ fixMergeModules = modules: args: evalModules { inherit modules args; check = false; }; diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index cb1b92e78d62..20fd76855d96 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -55,8 +55,8 @@ let apply = x: use (toOf config); inherit visible; }); - } - { config = setTo (mkMerge (if (fromOf options).isDefined then [ (define (mkMerge (fromOf options).definitions)) ] else [])); + + config = setTo (mkAliasAndWrapDefinitions define (fromOf options)); } ]; |