From a18cef075407d5b9e9539e359294a8250806991c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 10 Jul 2025 17:28:55 +0200 Subject: [PATCH 1/3] postfix-tlspol: 1.8.11 -> 1.8.12 https://github.com/Zuplu/postfix-tlspol/releases/tag/v1.8.12 --- pkgs/by-name/po/postfix-tlspol/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/po/postfix-tlspol/package.nix b/pkgs/by-name/po/postfix-tlspol/package.nix index 69a89a8b8319..17622fcf2592 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,6 +28,7 @@ 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; From b2019639511ac305f6d79eeab74e41d76028a402 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 11 Jul 2025 03:08:18 +0200 Subject: [PATCH 2/3] nixos/postfix-tlspol: only preset dns resolver with useLocalResolver This is the best indicator we have about whether to use a local resolver. In the meantime I'm lobbying upstream to read /etc/resolv.conf. --- nixos/modules/services/mail/postfix-tlspol.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/mail/postfix-tlspol.nix b/nixos/modules/services/mail/postfix-tlspol.nix index a44ccbdba652..12423c50fd8b 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 @@ -92,7 +93,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 From e6445e42fa4e24b9a2d4657cb2b0a2ac15a3d01c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 11 Jul 2025 03:20:39 +0200 Subject: [PATCH 3/3] postfix-tlspol: adopt package and module --- nixos/modules/services/mail/postfix-tlspol.nix | 2 ++ pkgs/by-name/po/postfix-tlspol/package.nix | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/mail/postfix-tlspol.nix b/nixos/modules/services/mail/postfix-tlspol.nix index 12423c50fd8b..755c56f24d00 100644 --- a/nixos/modules/services/mail/postfix-tlspol.nix +++ b/nixos/modules/services/mail/postfix-tlspol.nix @@ -24,6 +24,8 @@ let in { + meta.maintainers = pkgs.postfix-tlspol.meta.maintainers; + options.services.postfix-tlspol = { enable = mkEnableOption "postfix-tlspol"; diff --git a/pkgs/by-name/po/postfix-tlspol/package.nix b/pkgs/by-name/po/postfix-tlspol/package.nix index 17622fcf2592..6a9ccca72fa6 100644 --- a/pkgs/by-name/po/postfix-tlspol/package.nix +++ b/pkgs/by-name/po/postfix-tlspol/package.nix @@ -32,7 +32,10 @@ buildGoModule rec { 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"; }; }