From 787e060e7c0873e8081c5aa3f4224e33557af12c Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 4 Jan 2024 21:30:38 +0100 Subject: [PATCH] pfixtools: migrate to gperf 3.1 --- pkgs/servers/mail/postfix/pfixtools.nix | 3 +++ pkgs/top-level/all-packages.nix | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mail/postfix/pfixtools.nix b/pkgs/servers/mail/postfix/pfixtools.nix index d57aaa4ef29d..0775df7e092e 100644 --- a/pkgs/servers/mail/postfix/pfixtools.nix +++ b/pkgs/servers/mail/postfix/pfixtools.nix @@ -40,6 +40,9 @@ stdenv.mkDerivation { postPatch = '' substituteInPlace postlicyd/policy_tokens.sh \ --replace /bin/bash ${bash}/bin/bash; + + substituteInPlace postlicyd/*_tokens.sh \ + --replace "unsigned int" "size_t" ''; env.NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=nonnull-compare -Wno-error=format-truncation"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 939ef3b0819e..586f03e89fe8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26848,9 +26848,8 @@ with pkgs; rspamd = callPackage ../servers/mail/rspamd { }; - pfixtools = callPackage ../servers/mail/postfix/pfixtools.nix { - gperf = gperf_3_0; - }; + pfixtools = callPackage ../servers/mail/postfix/pfixtools.nix { }; + pflogsumm = callPackage ../servers/mail/postfix/pflogsumm.nix { }; pomerium = callPackage ../servers/http/pomerium { };