From 0b48da2e88346e8691c68f9cd31c995f238668c5 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 25 Jun 2023 13:35:32 +0000 Subject: [PATCH] spamassassin: switch back to Perl-bundled ExtUtils::MakeMaker It's past the required minimum version now, so we can drop this comment and the explicit dependency. --- pkgs/servers/mail/spamassassin/default.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/servers/mail/spamassassin/default.nix index 996db226e0d1..fd8acd7d9a6c 100644 --- a/pkgs/servers/mail/spamassassin/default.nix +++ b/pkgs/servers/mail/spamassassin/default.nix @@ -9,14 +9,7 @@ perlPackages.buildPerlPackage rec { hash = "sha256-5aoXBQowvHK6qGr9xgSMrepNHsLsxh14dxegWbgxnog="; }; - # ExtUtil::MakeMaker is bundled with Perl, but the bundled version - # causes build errors for aarch64-darwin, so we override it with the - # latest version. We can drop the dependency to go back to the - # bundled version when the version that comes with Perl is ≥7.57_02. - # - # Check the version bundled with Perl like this: - # perl -e 'use ExtUtils::MakeMaker qw($VERSION); print "$VERSION\n"' - nativeBuildInputs = [ makeWrapper perlPackages.ExtUtilsMakeMaker ]; + nativeBuildInputs = [ makeWrapper ]; buildInputs = (with perlPackages; [ HTMLParser NetCIDRLite NetDNS NetAddrIP DBFile HTTPDate MailDKIM LWP LWPProtocolHttps IOSocketSSL DBI EncodeDetect IPCountry NetIdent