uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
50
pkgs/servers/mail/spamassassin/default.nix
Normal file
50
pkgs/servers/mail/spamassassin/default.nix
Normal file
|
|
@ -0,0 +1,50 @@
|
|||
{ lib, fetchurl, perlPackages, makeWrapper, gnupg, re2c, gcc, gnumake }:
|
||||
|
||||
perlPackages.buildPerlPackage rec {
|
||||
pname = "SpamAssassin";
|
||||
version = "3.4.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/spamassassin/source/Mail-${pname}-${version}.tar.bz2";
|
||||
sha256 = "044ng2aazqy8g0m17q0a4939ck1ca4x230q2q7q7jndvwkrpaj5w";
|
||||
};
|
||||
|
||||
# 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 ];
|
||||
buildInputs = (with perlPackages; [
|
||||
HTMLParser NetCIDRLite NetDNS NetAddrIP DBFile HTTPDate MailDKIM LWP
|
||||
LWPProtocolHttps IOSocketSSL DBI EncodeDetect IPCountry NetIdent
|
||||
Razor2ClientAgent MailSPF NetDNSResolverProgrammable Socket6
|
||||
]);
|
||||
|
||||
# Enabling 'taint' mode is desirable, but that flag disables support
|
||||
# for the PERL5LIB environment variable. Needs further investigation.
|
||||
makeFlags = [ "PERL_BIN=${perlPackages.perl}/bin/perl" "PERL_TAINT=no" ];
|
||||
|
||||
makeMakerFlags = [ "SYSCONFDIR=/etc LOCALSTATEDIR=/var/lib/spamassassin" ];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/spamassassin
|
||||
mv "rules/"* $out/share/spamassassin/
|
||||
|
||||
for n in "$out/bin/"*; do
|
||||
wrapProgram "$n" --prefix PERL5LIB : "$PERL5LIB" --prefix PATH : ${lib.makeBinPath [ gnupg re2c gcc gnumake ]}
|
||||
done
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://spamassassin.apache.org/";
|
||||
description = "Open-Source Spam Filter";
|
||||
license = lib.licenses.asl20;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ qknight qyliss ];
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,44 @@
|
|||
From 60abf3ee8864980a95b32e2d6cf60e26b49654c0 Mon Sep 17 00:00:00 2001
|
||||
From: joachim schiele <js@lastlog.de>
|
||||
Date: Wed, 7 Jun 2017 22:15:39 +0200
|
||||
Subject: [PATCH 2/2] Adding --siteconfigpath to not be forced to use global /etc/spamasassin configuration directory but to provide an alternative location.
|
||||
|
||||
---
|
||||
sa-update.raw | 5 +++++
|
||||
lib/Mail/SpamAssassin/PerMsgStatus.pm | 2 +
|
||||
2 file changed, 7 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/sa-update.raw b/sa-update.raw
|
||||
index bb7396d..39f681f 100755
|
||||
--- a/sa-update.raw
|
||||
+++ b/sa-update.raw
|
||||
@@ -196,6 +196,7 @@ GetOptions(
|
||||
'gpgkeyfile=s' => \$opt{'gpgkeyfile'},
|
||||
'channelfile=s' => \$opt{'channelfile'},
|
||||
'updatedir=s' => \$opt{'updatedir'},
|
||||
+ 'siteconfigpath=s' => \$opt{'siteconfigpath'},
|
||||
'gpg!' => \$GPG_ENABLED,
|
||||
|
||||
'4' => sub { $opt{'force_pf'} = 'inet' },
|
||||
@@ -267,6 +268,9 @@ else {
|
||||
$opt{'updatedir'} = $SA->sed_path('__local_state_dir__/__version__');
|
||||
}
|
||||
|
||||
+if (defined $opt{'siteconfigpath'}) {
|
||||
+ $LOCAL_RULES_DIR = untaint_file_path($opt{'siteconfigpath'});
|
||||
+}
|
||||
|
||||
# check only disabled gpg
|
||||
# https://issues.apache.org/SpamAssassin/show_bug.cgi?id=5854
|
||||
@@ -1808,7 +1812,7 @@ Options:
|
||||
--updatedir path Directory to place updates, defaults to the
|
||||
SpamAssassin site rules directory
|
||||
(default: @@LOCAL_STATE_DIR@@/@@VERSION@@)
|
||||
+ --siteconfigpath=path Path for site configs
|
||||
--refreshmirrors Force the MIRRORED.BY file to be updated
|
||||
-D, --debug [area=n,...] Print debugging messages
|
||||
-v, --verbose Be verbose, like print updated channel names;
|
||||
--
|
||||
|
||||
2.12.2
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue