treewide: mkAliasOptionModuleMD -> mkAliasOptionModule

This commit is contained in:
Aliaksandr 2025-10-21 15:42:47 +03:00
parent 8c3752488b
commit f28be96fda
No known key found for this signature in database
GPG key ID: CACB28BA93CE71A2
5 changed files with 10 additions and 11 deletions

View file

@ -30,7 +30,7 @@ let
mapAttrs'
mapAttrsToList
match
mkAliasOptionModuleMD
mkAliasOptionModule
mkDefault
mkIf
mkMerge
@ -666,8 +666,8 @@ let
in
{
imports = [
(mkAliasOptionModuleMD [ "users" "extraUsers" ] [ "users" "users" ])
(mkAliasOptionModuleMD [ "users" "extraGroups" ] [ "users" "groups" ])
(mkAliasOptionModule [ "users" "extraUsers" ] [ "users" "users" ])
(mkAliasOptionModule [ "users" "extraGroups" ] [ "users" "groups" ])
(mkRenamedOptionModule
[ "security" "initialRootPassword" ]
[ "users" "users" "root" "initialHashedPassword" ]

View file

@ -2,7 +2,7 @@
let
inherit (lib)
mkAliasOptionModuleMD
mkAliasOptionModule
mkRemovedOptionModule
;
in
@ -18,7 +18,7 @@ in
# This alias module can't be where _module.check is defined because it would
# be added to submodules as well there
(mkAliasOptionModuleMD [ "environment" "checkConfigurationOptions" ] [ "_module" "check" ])
(mkAliasOptionModule [ "environment" "checkConfigurationOptions" ] [ "_module" "check" ])
# Completely removed modules
(mkRemovedOptionModule [ "boot" "loader" "raspberryPi" ]

View file

@ -177,8 +177,8 @@ in
{
imports = [
(lib.mkAliasOptionModuleMD [ "services" "sshd" "enable" ] [ "services" "openssh" "enable" ])
(lib.mkAliasOptionModuleMD [ "services" "openssh" "knownHosts" ] [ "programs" "ssh" "knownHosts" ])
(lib.mkAliasOptionModule [ "services" "sshd" "enable" ] [ "services" "openssh" "enable" ])
(lib.mkAliasOptionModule [ "services" "openssh" "knownHosts" ] [ "programs" "ssh" "knownHosts" ])
(lib.mkRenamedOptionModule
[ "services" "openssh" "challengeResponseAuthentication" ]
[ "services" "openssh" "kbdInteractiveAuthentication" ]

View file

@ -9,7 +9,7 @@
let
inherit (lib)
mkRenamedOptionModule
mkAliasOptionModuleMD
mkAliasOptionModule
mkEnableOption
mkOption
types
@ -26,7 +26,6 @@ let
cfg = config.services.transmission;
opt = options.services.transmission;
inherit (config.environment) etc;
apparmor = config.security.apparmor;
rootDir = "/run/transmission";
settingsDir = ".config/transmission-daemon";
@ -51,7 +50,7 @@ in
"rpc-port"
]
)
(mkAliasOptionModuleMD
(mkAliasOptionModule
[
"services"
"transmission"

View file

@ -62,7 +62,7 @@ in
{
imports = [
(mkAliasOptionModuleMD [ "services" "compton" ] [ "services" "picom" ])
(mkAliasOptionModule [ "services" "compton" ] [ "services" "picom" ])
(mkRemovedOptionModule [ "services" "picom" "refreshRate" ] ''
This option corresponds to `refresh-rate`, which has been unused
since picom v6 and was subsequently removed by upstream.