public-inbox: 1.4.0 -> 1.5.0

1 files changed, 13 insertions, 11 deletions

diff --git a/nixpkgs/pkgs/servers/mail/public-inbox/default.nix b/nixpkgs/pkgs/servers/mail/public-inbox/default.nix
index e145bdc5282d..5edd841bc4d7 100644
--- a/nixpkgs/pkgs/servers/mail/public-inbox/default.nix
+++ b/nixpkgs/pkgs/servers/mail/public-inbox/default.nix
@@ -1,4 +1,4 @@
-{ buildPerlPackage, lib, fetchurl, makeWrapper
+{ buildPerlPackage, lib, fetchurl, fetchpatch, makeWrapper
 , DBDSQLite, EmailMIME, IOSocketSSL, IPCRun, Plack, PlackMiddlewareReverseProxy
 , SearchXapian, TimeDate, URI
 , git, highlight, openssl, sqlite, xapian
@@ -15,11 +15,6 @@ let
     # These tests were indentified with
     #     grep -r shared t/
     "convert-compact" "search" "v2writable" "www_listing"
-
-    # These tests use Email::MIME, and assume an older version than we
-    # have in Nixpkgs.  They can probably be re-enabled for
-    # public-inbox >= 1.5.0.
-    "filter_base" "filter_mirror" "mda"
   ];
 
   testConditions = with lib;
@@ -29,13 +24,20 @@ in
 
 buildPerlPackage rec {
   pname = "public-inbox";
-  version = "1.4.0";
+  version = "1.5.0";
 
   src = fetchurl {
     url = "https://public-inbox.org/public-inbox.git/snapshot/public-inbox-${version}.tar.gz";
-    sha256 = "0snl927v89ingp9fmvp23qmbi89ka6k5p2xzyz1aalpnj201nzlw";
+    sha256 = "11fvgcs4vj4jbvwij3fh3jilvmaz0qzv09jcbhxb2hkpzdymzywk";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://80x24.org/public-inbox.git/patch/?id=5c4874309c4dd7aa8b9acd6bb97bd512360ab08a";
+      sha256 = "0mh2qh8hxsqnsxqr42mkcz3sppnj1s6y28fl19x251phq3xx2c4q";
+    })
+  ];
+
   outputs = [ "out" "devdoc" "sa_config" ];
 
   postConfigure = ''
@@ -46,11 +48,11 @@ buildPerlPackage rec {
   nativeBuildInputs = [ makeWrapper ];
 
   buildInputs = [
-    DBDSQLite EmailMIME IOSocketSSL IPCRun Plack PlackMiddlewareReverseProxy
-    SearchXapian TimeDate URI highlight
+    DBDSQLite IOSocketSSL IPCRun Plack PlackMiddlewareReverseProxy SearchXapian
+    TimeDate URI highlight
   ];
 
-  checkInputs = [ git openssl sqlite xapian ];
+  checkInputs = [ EmailMIME git openssl sqlite xapian ];
   preCheck = ''
     perl certs/create-certs.perl
   '';