diff options
author | Maximilian Bosch <maximilian@mbosch.me> | 2020-03-22 15:27:24 +0100 |
---|---|---|
committer | Maximilian Bosch <maximilian@mbosch.me> | 2020-03-22 15:52:01 +0100 |
commit | fc316f7b319a40760a4a3a939c4ff840074eac4c (patch) | |
tree | a50843150415b90f1bc90f04c8056cafad285d4c | |
parent | ce12576dd0ccbec911cc03d86da9728192c4ba84 (diff) |
nixos/ssmtp: declare all option renames manually
While renaming `networking.defaultMailServer` directly to `services.ssmtp` is shorter and probably clearer, it causes eval errors due to the second rename (directDelivery -> enable) when using e.g. `lib.mkForce`. For instance, ``` nix { lib, ... }: { networking.defaultMailServer = { hostName = "localhost"; directDelivery = lib.mkForce true; domain = "example.org"; }; } ``` would break with the following (rather confusing) error: ``` error: The option value `services.ssmtp.enable' in `/home/ma27/Projects/nixpkgs/nixos/modules/programs/ssmtp.nix' is not of type `boolean'. (use '--show-trace' to show detailed location information) ```
-rw-r--r-- | nixos/modules/programs/ssmtp.nix | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/nixos/modules/programs/ssmtp.nix b/nixos/modules/programs/ssmtp.nix index f794eac8af00c..c7a947393496d 100644 --- a/nixos/modules/programs/ssmtp.nix +++ b/nixos/modules/programs/ssmtp.nix @@ -14,8 +14,16 @@ in { imports = [ - (mkRenamedOptionModule [ "networking" "defaultMailServer" ] [ "services" "ssmtp" ]) - (mkRenamedOptionModule [ "services" "ssmtp" "directDelivery" ] [ "services" "ssmtp" "enable" ]) + (mkRenamedOptionModule [ "networking" "defaultMailServer" "directDelivery" ] [ "services" "ssmtp" "enable" ]) + (mkRenamedOptionModule [ "networking" "defaultMailServer" "hostName" ] [ "services" "ssmtp" "hostName" ]) + (mkRenamedOptionModule [ "networking" "defaultMailServer" "domain" ] [ "services" "ssmtp" "domain" ]) + (mkRenamedOptionModule [ "networking" "defaultMailServer" "root" ] [ "services" "ssmtp" "root" ]) + (mkRenamedOptionModule [ "networking" "defaultMailServer" "useTLS" ] [ "services" "ssmtp" "useTLS" ]) + (mkRenamedOptionModule [ "networking" "defaultMailServer" "useSTARTTLS" ] [ "services" "ssmtp" "useSTARTTLS" ]) + (mkRenamedOptionModule [ "networking" "defaultMailServer" "authUser" ] [ "services" "ssmtp" "authUser" ]) + (mkRenamedOptionModule [ "networking" "defaultMailServer" "authPass" ] [ "services" "ssmtp" "authPass" ]) + (mkRenamedOptionModule [ "networking" "defaultMailServer" "authPassFile" ] [ "services" "ssmtp" "authPassFile" ]) + (mkRenamedOptionModule [ "networking" "defaultMailServer" "setSendmail" ] [ "services" "ssmtp" "setSendmail" ]) ]; options = { |