(address . guix-patches@gnu.org)
87tv1fzu6h.fsf@gmx.com
Hello Guix!
A new mu was just released! If you're using it, make sure to read the
NEWS, some manual intervention is required to upgrade the database:
Thanks,
Pierre
From 87d99246e91cd9a0c197dfed21ff75a6e87ce72b Mon Sep 17 00:00:00 2001
From: Pierre Langlois <pierre.langlois@gmx.com>
Date: Sat, 18 Apr 2020 16:19:39 +0200
Subject: [PATCH] gnu: mu: Update 1.4.
* gnu/packages/mail.scm (mu): Update to 1.4.
[arguments]: Remove 'fix-date-tests phase. Add 'patch-bin-sh-in-tests phase.
---
gnu/packages/mail.scm | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
Toggle diff (43 lines)
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 365989f609..c5333b206b 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -715,7 +715,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.")
(define-public mu
(package
(name "mu")
- (version "1.2.0")
+ (version "1.4")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/djcb/mu/releases/"
@@ -723,7 +723,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.")
"mu-" version ".tar.xz"))
(sha256
(base32
- "0fh5bxvhjqv1p9z783lym8y1k3p4jcc3wg6wf7zl8s6w8krcfd7n"))))
+ "1ay68rhlngnp2zm6wdmzgr1fsal3spz61swcxlaz5y215qvgjfpy"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
@@ -758,13 +758,14 @@ security functionality including PGP, S/MIME, SSH, and SSL.")
"guile/mu/Makefile.in")
(("share/guile/site/2.0/") "share/guile/site/2.2/"))
#t))
- (add-after 'patch-configure 'fix-date-tests
- ;; Loosen test tolerances to prevent failures caused by daylight
- ;; saving time (DST). See: https://github.com/djcb/mu/issues/1214.
+ (add-after 'unpack 'patch-bin-sh-in-tests
(lambda _
- (substitute* "lib/parser/test-utils.cc"
- (("\\* 60 \\* 60, 1 },")
- "* 60 * 60, 3600 + 1 },"))
+ (substitute* '("guile/tests/test-mu-guile.c"
+ "mu/test-mu-cmd.c"
+ "mu/test-mu-cmd-cfind.c"
+ "mu/test-mu-query.c"
+ "mu/test-mu-threads.c")
+ (("/bin/sh") (which "sh")))
#t))
(add-before 'install 'fix-ffi
(lambda* (#:key outputs #:allow-other-keys)
--
2.26.1