diff --git a/nixos/modules/services/mail/postfix-tlspol.nix b/nixos/modules/services/mail/postfix-tlspol.nix index a44ccbdba652..755c56f24d00 100644 --- a/nixos/modules/services/mail/postfix-tlspol.nix +++ b/nixos/modules/services/mail/postfix-tlspol.nix @@ -8,6 +8,7 @@ let inherit (lib) hasPrefix + literalExpression mkEnableOption mkIf mkMerge @@ -23,6 +24,8 @@ let in { + meta.maintainers = pkgs.postfix-tlspol.meta.maintainers; + options.services.postfix-tlspol = { enable = mkEnableOption "postfix-tlspol"; @@ -92,7 +95,13 @@ in dns = { address = mkOption { type = types.str; - default = "127.0.0.1:53"; + default = if config.networking.resolvconf.useLocalResolver then "127.0.0.1:53" else null; + defaultText = literalExpression '' + if config.networking.resolvconf.useLocalResolver then + "127.0.0.1:53" + else + null + ''; description = '' IP and port to your DNS resolver diff --git a/pkgs/by-name/po/postfix-tlspol/package.nix b/pkgs/by-name/po/postfix-tlspol/package.nix index 69a89a8b8319..6a9ccca72fa6 100644 --- a/pkgs/by-name/po/postfix-tlspol/package.nix +++ b/pkgs/by-name/po/postfix-tlspol/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "postfix-tlspol"; - version = "1.8.11"; + version = "1.8.12"; src = fetchFromGitHub { owner = "Zuplu"; repo = "postfix-tlspol"; tag = "v${version}"; - hash = "sha256-hQSJ0bp3ghfi5chislf2zuCrvPhhoA0jjChRdGYHcFY="; + hash = "sha256-OBGBjbLnyDKz/UK5th1k/gfxHjBGxyWQKgiXuuJNf8Q="; }; vendorHash = null; @@ -28,10 +28,14 @@ buildGoModule rec { }; meta = { + changelog = "https://github.com/Zuplu/postfix-tlspol/releases/tag/${src.tag}"; description = "Lightweight MTA-STS + DANE/TLSA resolver and TLS policy server for Postfix, prioritizing DANE."; homepage = "https://github.com/Zuplu/postfix-tlspol"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ valodim ]; + maintainers = with lib.maintainers; [ + hexa + valodim + ]; mainProgram = "postfix-tlspol"; }; }