diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index fd3c1b10d81b..0399962418ad 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -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" ] diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index aede85d7eee8..968ce8c5cf84 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -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" ] diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index c56193cb4f83..bfa1b70bdfd7 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -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" ] diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index 8454910654bf..e261abe44450 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -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" diff --git a/nixos/modules/services/x11/picom.nix b/nixos/modules/services/x11/picom.nix index e75ec5c2019f..33d53930dff0 100644 --- a/nixos/modules/services/x11/picom.nix +++ b/nixos/modules/services/x11/picom.nix @@ -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.