public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mailutils: clean up and fix last test

Browse Source
This commit is contained in:
Robin Gloster 2017-07-26 13:12:37 +02:00
parent 100107a3cd
commit 4a787b292a
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pkgs/tools/networking/mailutils/default.nix
View File

@ -18,7 +18,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
autoreconfHook gettext libtool pkgconfig autoreconfHook gettext libtool pkgconfig
] ++ stdenv.lib.optional doCheck dejagnu; ] ++ stdenv.lib.optional doCheck dejagnu;
buildInputs = [ buildInputs = [
gdbm pam readline ncurses gnutls guile texinfo gnum4 sasl fribidi nettools gdbm pam readline ncurses gnutls guile texinfo gnum4 sasl fribidi nettools
gss mysql.lib gss mysql.lib
@ -26,7 +25,8 @@ stdenv.mkDerivation rec {
patches = [ patches = [
(fetchpatch { (fetchpatch {
url = "${p}/mailutils-3.2-fix-build.patch"; url = "https://git.savannah.gnu.org/cgit/mailutils.git/patch/?id=afbb33cf9ff";
excludes = [ "NEWS" ];
sha256 = "0yzkfx3j1zkkb43fhchjqphw4xznbclj39bjzjggv32gppy6d1db"; sha256 = "0yzkfx3j1zkkb43fhchjqphw4xznbclj39bjzjggv32gppy6d1db";
}) })
./fix-build-mb-len-max.patch ./fix-build-mb-len-max.patch
@ -34,6 +34,16 @@ stdenv.mkDerivation rec {
./path-to-cat.patch ./path-to-cat.patch
]; ];
doCheck = true;
enableParallelBuilding = true;
hardeningDisable = [ "format" ];
configureFlags = [
"--with-gssapi"
"--with-gsasl"
"--with-mysql"
];
readmsg-tests = stdenv.lib.optionals doCheck [ readmsg-tests = stdenv.lib.optionals doCheck [
(fetchurl { url = "${p}/hdr.at"; sha256 = "0phpkqyhs26chn63wjns6ydx9468ng3ssbjbfhcvza8h78jlsd98"; }) (fetchurl { url = "${p}/hdr.at"; sha256 = "0phpkqyhs26chn63wjns6ydx9468ng3ssbjbfhcvza8h78jlsd98"; })
(fetchurl { url = "${p}/nohdr.at"; sha256 = "1vkbkfkbqj6ml62s1am8i286hxwnpsmbhbnq0i2i0j1i7iwkk4b7"; }) (fetchurl { url = "${p}/nohdr.at"; sha256 = "1vkbkfkbqj6ml62s1am8i286hxwnpsmbhbnq0i2i0j1i7iwkk4b7"; })
@ -48,11 +58,6 @@ stdenv.mkDerivation rec {
*/Makefile{.in,.am} */Makefile{.in,.am}
''; '';
configureFlags = [
"--with-gssapi"
"--with-mysql"
];
preCheck = '' preCheck = ''
# Add missing files. # Add missing files.
cp ${builtins.toString readmsg-tests} readmsg/tests/ cp ${builtins.toString readmsg-tests} readmsg/tests/
@ -61,16 +66,16 @@ stdenv.mkDerivation rec {
done done
# Disable comsat tests that fail without tty in the sandbox. # Disable comsat tests that fail without tty in the sandbox.
tty -s || echo > comsat/tests/testsuite.at tty -s || echo > comsat/tests/testsuite.at
# Disable lmtp tests that require root spool.
echo > maidag/tests/lmtp.at
# Disable mda tests that require /etc/passwd to contain root. # Disable mda tests that require /etc/passwd to contain root.
grep -qo '^root:' /etc/passwd || echo > maidag/tests/mda.at grep -qo '^root:' /etc/passwd || echo > maidag/tests/mda.at
# Provide libraries for mhn. # Provide libraries for mhn.
export LD_LIBRARY_PATH=$(pwd)/lib/.libs export LD_LIBRARY_PATH=$(pwd)/lib/.libs
''; '';
postCheck = "unset LD_LIBRARY_PATH"; postCheck = ''
unset LD_LIBRARY_PATH
doCheck = true; '';
enableParallelBuilding = true;
hardeningDisable = [ "format" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Rich and powerful protocol-independent mail framework"; description = "Rich and powerful protocol-independent mail framework";