From eed14baec3db43df7294d3b549045c7298044eb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 2 Sep 2017 09:50:21 +0200 Subject: [PATCH] nixos/postfix: undo deprecation of extraConfig, extraMasterConf I realize that advanced users like to configure services with Nix attrsets, but I don't think we should remove the option to use the (configuration) language provided by upstream. --- nixos/modules/services/mail/postfix.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index 01ae49d49090..d88a38def82c 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -836,11 +836,5 @@ in (mkIf (cfg.dnsBlacklists != []) { services.postfix.mapFiles."client_access" = checkClientAccessFile; }) - (mkIf (cfg.extraConfig != "") { - warnings = [ "The services.postfix.extraConfig option was deprecated. Please use services.postfix.config instead." ]; - }) - (mkIf (cfg.extraMasterConf != "") { - warnings = [ "The services.postfix.extraMasterConf option was deprecated. Please use services.postfix.masterConfig instead." ]; - }) ]); }