Unverified Commit f28be96f authored by Aliaksandr's avatar Aliaksandr
Browse files

treewide: mkAliasOptionModuleMD -> mkAliasOptionModule

parent 8c375248

nixos/modules/config/users-groups.nix

+3 −3
Original line number Diff line number Diff line
@@ -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" ]

nixos/modules/rename.nix

+2 −2
Original line number Diff line number Diff line
@@ -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" ]

nixos/modules/services/networking/ssh/sshd.nix

+2 −2
Original line number Diff line number Diff line
@@ -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" ]

nixos/modules/services/torrent/transmission.nix

+2 −3
Original line number Diff line number Diff line
@@ -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"

nixos/modules/services/x11/picom.nix

+1 −1
Original line number Diff line number Diff line
@@ -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.