diff options
Diffstat (limited to 'pkgs/servers/mail/public-inbox/default.nix')
| -rw-r--r-- | pkgs/servers/mail/public-inbox/default.nix | 50 |
1 files changed, 32 insertions, 18 deletions
diff --git a/pkgs/servers/mail/public-inbox/default.nix b/pkgs/servers/mail/public-inbox/default.nix index a70ef432fc49b..02ab293c1af17 100644 --- a/pkgs/servers/mail/public-inbox/default.nix +++ b/pkgs/servers/mail/public-inbox/default.nix @@ -6,6 +6,7 @@ , gnumake , highlight , libgit2 +, libxcrypt , man , openssl , pkg-config @@ -17,30 +18,33 @@ , EmailAddressXS , EmailMIME , IOSocketSSL +# FIXME: to be packaged +#, IOSocketSocks , IPCRun , Inline , InlineC , LinuxInotify2 , MailIMAPClient +# FIXME: to be packaged +#, NetNetrc +# FIXME: to be packaged +#, NetNNTP , ParseRecDescent , Plack , PlackMiddlewareReverseProxy +, PlackTestExternalServer , SearchXapian +, TestSimple13 , TimeDate , URI +, XMLTreePP }: let skippedTests = [ - # These tests would fail, and produce "Operation not permitted" - # errors from git, because they use git init --shared. This tries - # to set the setgid bit, which isn't permitted inside build - # sandboxes. - # - # These tests were indentified with - # grep -r shared t/ - "convert-compact" "search" "v2writable" "www_listing" + # fatal: Could not make /tmp/pi-search-9188-DGZM/a.git/branches/ writable by group + "search" # perl5.32.0-public-inbox> t/eml.t ...................... 1/? Cannot parse parameter '=?ISO-8859-1?Q?=20charset=3D=1BOF?=' at t/eml.t line 270. # perl5.32.0-public-inbox> # Failed test 'got wide character by assuming utf-8' # perl5.32.0-public-inbox> # at t/eml.t line 272. @@ -67,6 +71,8 @@ let # expected: anything else # waiting for child to reap grandchild... "spawn" + # Failed to connect to 127.0.0.1 + "v2mirror" ]; testConditions = with lib; @@ -76,11 +82,11 @@ in buildPerlPackage rec { pname = "public-inbox"; - version = "1.8.0"; + version = "1.9.0"; src = fetchurl { url = "https://public-inbox.org/public-inbox.git/snapshot/public-inbox-${version}.tar.gz"; - sha256 = "sha256-laJOOCk5NecIGWesv4D30cLGfijQHVkeo55eNqNKzew="; + sha256 = "sha256-ENnT2YK7rpODII9TqiEYSCp5mpWOnxskeSuAf8Ilqro="; }; outputs = [ "out" "devdoc" "sa_config" ]; @@ -99,12 +105,15 @@ buildPerlPackage rec { DBDSQLite DBI EmailAddressXS - EmailMIME highlight IOSocketSSL + #IOSocketSocks IPCRun Inline InlineC + MailIMAPClient + #NetNetrc + #NetNNTP ParseRecDescent Plack PlackMiddlewareReverseProxy @@ -117,13 +126,16 @@ buildPerlPackage rec { doCheck = !stdenv.isDarwin; nativeCheckInputs = [ - MailIMAPClient curl git openssl pkg-config sqlite xapian + EmailMIME + PlackTestExternalServer + TestSimple13 + XMLTreePP ] ++ lib.optionals stdenv.isLinux [ LinuxInotify2 ]; @@ -137,12 +149,14 @@ buildPerlPackage rec { installTargets = [ "install" ]; postInstall = '' for prog in $out/bin/*; do - wrapProgram $prog --prefix PATH : ${lib.makeBinPath [ - git - /* for InlineC */ - gnumake - stdenv.cc.cc - ]} + wrapProgram $prog \ + --set NIX_CFLAGS_COMPILE_${stdenv.cc.suffixSalt} -I${lib.getDev libxcrypt}/include \ + --prefix PATH : ${lib.makeBinPath [ + git + /* for InlineC */ + gnumake + stdenv.cc + ]} done mv sa_config $sa_config |