movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

public-inbox: 1.8.0 -> 1.9.0

Browse source 
Co-authored-by: Alyssa Ross <hi@alyssa.is>
This commit is contained in:
Julien Moutinho 2022-11-02 00:50:31 +01:00 • committed by Alyssa Ross
parent 4fdd015c76
commit 50301d73e9
2 changed files with 26 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
nixos/tests/public-inbox.nix
View file

@ -14,7 +14,7 @@ in
meta.maintainers = with pkgs.lib.maintainers; [ julm ]; meta.maintainers = with pkgs.lib.maintainers; [ julm ];
machine = { config, pkgs, nodes, ... }: let nodes.machine = { config, pkgs, nodes, ... }: let
inherit (config.services) gitolite public-inbox; inherit (config.services) gitolite public-inbox;
# Git repositories paths in Gitolite. # Git repositories paths in Gitolite.
# Only their baseNameOf is used for configuring public-inbox. # Only their baseNameOf is used for configuring public-inbox.
@ -221,7 +221,7 @@ in
# Delete a mail. # Delete a mail.
# Note that the use of an extension not listed in the addresses # Note that the use of an extension not listed in the addresses
# require to use --all # require to use --all
machine.succeed("curl -L https://machine.example.localdomain/inbox/repo1/repo1@root-1/raw | sudo -u public-inbox public-inbox-learn rm --all") machine.succeed("curl -L https://machine.${domain}/inbox/repo1/repo1@root-1/raw | sudo -u public-inbox public-inbox-learn rm --all")
machine.fail("curl -L https://machine.example.localdomain/inbox/repo1/repo1@root-1/T/#u | grep 'This is a testing mail.'") machine.fail("curl -L https://machine.${domain}/inbox/repo1/repo1@root-1/T/#u | grep 'This is a testing mail.'")
''; '';
}) })

35
pkgs/servers/mail/public-inbox/default.nix
View file

@ -18,30 +18,33 @@
, EmailAddressXS , EmailAddressXS
, EmailMIME , EmailMIME
, IOSocketSSL , IOSocketSSL
# FIXME: to be packaged
#, IOSocketSocks
, IPCRun , IPCRun
, Inline , Inline
, InlineC , InlineC
, LinuxInotify2 , LinuxInotify2
, MailIMAPClient , MailIMAPClient
# FIXME: to be packaged
#, NetNetrc
# FIXME: to be packaged
#, NetNNTP
, ParseRecDescent , ParseRecDescent
, Plack , Plack
, PlackMiddlewareReverseProxy , PlackMiddlewareReverseProxy
, PlackTestExternalServer
, SearchXapian , SearchXapian
, TestSimple13
, TimeDate , TimeDate
, URI , URI
, XMLTreePP
}: }:
let let
skippedTests = [ skippedTests = [
# These tests would fail, and produce "Operation not permitted" # fatal: Could not make /tmp/pi-search-9188-DGZM/a.git/branches/ writable by group
# errors from git, because they use git init --shared. This tries "search"
# 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"
# 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> 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> # Failed test 'got wide character by assuming utf-8'
# perl5.32.0-public-inbox> # at t/eml.t line 272. # perl5.32.0-public-inbox> # at t/eml.t line 272.
@ -68,6 +71,8 @@ let
# expected: anything else # expected: anything else
# waiting for child to reap grandchild... # waiting for child to reap grandchild...
"spawn" "spawn"
# Failed to connect to 127.0.0.1
"v2mirror"
]; ];
testConditions = with lib; testConditions = with lib;
@ -77,11 +82,11 @@ in
buildPerlPackage rec { buildPerlPackage rec {
pname = "public-inbox"; pname = "public-inbox";
version = "1.8.0"; version = "1.9.0";
src = fetchurl { src = fetchurl {
url = "https://public-inbox.org/public-inbox.git/snapshot/public-inbox-${version}.tar.gz"; 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" ]; outputs = [ "out" "devdoc" "sa_config" ];
@ -100,12 +105,15 @@ buildPerlPackage rec {
DBDSQLite DBDSQLite
DBI DBI
EmailAddressXS EmailAddressXS
EmailMIME
highlight highlight
IOSocketSSL IOSocketSSL
#IOSocketSocks
IPCRun IPCRun
Inline Inline
InlineC InlineC
MailIMAPClient
#NetNetrc
#NetNNTP
ParseRecDescent ParseRecDescent
Plack Plack
PlackMiddlewareReverseProxy PlackMiddlewareReverseProxy
@ -118,13 +126,16 @@ buildPerlPackage rec {
doCheck = !stdenv.isDarwin; doCheck = !stdenv.isDarwin;
nativeCheckInputs = [ nativeCheckInputs = [
MailIMAPClient
curl curl
git git
openssl openssl
pkg-config pkg-config
sqlite sqlite
xapian xapian
EmailMIME
PlackTestExternalServer
TestSimple13
XMLTreePP
] ++ lib.optionals stdenv.isLinux [ ] ++ lib.optionals stdenv.isLinux [
LinuxInotify2 LinuxInotify2
]; ];