GNU bug report logs - #68590
[PATCH] gnu: notmuch: update to version 0.38.2

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 68590 in the body.
You can then email your comments to 68590 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Oscar Najera <hi <at> oscarnajera.com>
To: guix-patches <at> gnu.org
Cc: Oscar Najera <hi <at> oscarnajera.com>
Subject: [PATCH] gnu: notmuch: update to version 0.38.2
Date: Fri, 19 Jan 2024 15:32:53 +0100

Change-Id: Ic0037d6307a2beda2d81bd6747b136398f63df31
---
 gnu/packages/mail.scm                         |  8 +-
 .../patches/notmuch-emacs-test-output.patch   | 89 -------------------
 2 files changed, 3 insertions(+), 94 deletions(-)
 delete mode 100644 gnu/packages/patches/notmuch-emacs-test-output.patch

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 4466e5e6d9..b941979a7b 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -54,6 +54,7 @@
 ;;; Copyright © 2023 Timo Wilken <guix <at> twilken.net>
 ;;; Copyright © 2023 Arjan Adriaanse <arjan <at> adriaan.se>
 ;;; Copyright © 2023 Wilko Meyer <w <at> wmeyer.eu>
+;;; Copyright © 2023 Oscar Najera <hi <at> oscarnajera.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1373,17 +1374,14 @@ (define-public notifymuch
 (define-public notmuch
   (package
     (name "notmuch")
-    (version "0.37")
+    (version "0.38.2")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://notmuchmail.org/releases/notmuch-"
                            version ".tar.xz"))
        (sha256
-        (base32 "1xl64xh0ijfkx265lcj9cqv1wkzha8gsn9jn4fw4xgvqigr6sxhf"))
-       (patches
-        ;; Output for some tests varies slightly in Emacs 29.
-        (search-patches "notmuch-emacs-test-output.patch"))))
+        (base32 "0zll3s39s065pl9228xpklkjklllkyb3bf1szh0fw0rbfkjfp0jj"))))
     (build-system gnu-build-system)
     (arguments
      (list
diff --git a/gnu/packages/patches/notmuch-emacs-test-output.patch b/gnu/packages/patches/notmuch-emacs-test-output.patch
deleted file mode 100644
index 3c6d472d6b..0000000000
--- a/gnu/packages/patches/notmuch-emacs-test-output.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From e9e779ead4d703ad423e46c23abd0c9afd7d5ed2 Mon Sep 17 00:00:00 2001
-From: Arjan Adriaanse <arjan <at> adriaan.se>
-Date: Tue, 15 Aug 2023 00:00:05 +0200
-Subject: [PATCH] test: fix expected output for Emacs 29
-
----
- test/T453-emacs-reply.sh                                 | 1 -
- test/T454-emacs-dont-reply-names.sh                      | 9 +++------
- .../notmuch-reply-duplicate-4                            | 1 -
- 3 files changed, 3 insertions(+), 8 deletions(-)
-
-diff --git a/test/T453-emacs-reply.sh b/test/T453-emacs-reply.sh
-index 0a27d066..de400b85 100755
---- a/test/T453-emacs-reply.sh
-+++ b/test/T453-emacs-reply.sh
-@@ -17,7 +17,6 @@ cat <<EOF > EXPECTED
- From: Notmuch Test Suite <test_suite <at> notmuchmail.org>
- To: Antoine Beaupré <anarcat <at> orangeseeds.org>
- Subject: Re: bug: "no top level messages" crash on Zen email loops
--In-Reply-To: <874llc2bkp.fsf <at> curie.anarc.at>
- Fcc: MAIL_DIR/sent
- --text follows this line--
- Antoine Beaupré <anarcat <at> orangeseeds.org> writes:
-diff --git a/test/T454-emacs-dont-reply-names.sh b/test/T454-emacs-dont-reply-names.sh
-index 3a770177..9ed4f18b 100755
---- a/test/T454-emacs-dont-reply-names.sh
-+++ b/test/T454-emacs-dont-reply-names.sh
-@@ -17,13 +17,12 @@ test_emacs '(let ((message-dont-reply-to-names "notmuchmail\\|noreply\\|harvard"
- 	      (test-visible-output "OUTPUT-FULL.raw"))'
- 
- notmuch_dir_sanitize < OUTPUT-FULL.raw > OUTPUT-FULL
--head -6 OUTPUT-FULL > OUTPUT
-+head -5 OUTPUT-FULL > OUTPUT
- 
- cat <<EOF > EXPECTED
- From: Notmuch Test Suite <test_suite <at> notmuchmail.org>
- To: Mikhail Gusarov <dottedmag <at> dottedmag.net>
- Subject: Re: [notmuch] Working with Maildir storage?
--In-Reply-To: <20091117203301.GV3165 <at> dottiness.seas.harvard.edu>
- Fcc: MAIL_DIR/sent
- --text follows this line--
- EOF
-@@ -38,14 +37,13 @@ test_emacs '(let ((message-dont-reply-to-names
- 	      (test-visible-output "OUTPUT-FULL-PRED.raw"))'
- 
- notmuch_dir_sanitize < OUTPUT-FULL-PRED.raw > OUTPUT-FULL-PRED
--head -7 OUTPUT-FULL-PRED > OUTPUT-PRED
-+head -6 OUTPUT-FULL-PRED > OUTPUT-PRED
- 
- cat <<EOF > EXPECTED-PRED
- From: Notmuch Test Suite <test_suite <at> notmuchmail.org>
- To: Lars Kellogg-Stedman <lars <at> seas.harvard.edu>
- Cc: notmuch <at> notmuchmail.org
- Subject: Re: [notmuch] Working with Maildir storage?
--In-Reply-To: <20091117203301.GV3165 <at> dottiness.seas.harvard.edu>
- Fcc: MAIL_DIR/sent
- --text follows this line--
- EOF
-@@ -59,14 +57,13 @@ test_emacs '(let ((message-dont-reply-to-names nil))
- 	      (test-visible-output "OUTPUT-FULL-NIL.raw"))'
- 
- notmuch_dir_sanitize < OUTPUT-FULL-NIL.raw > OUTPUT-FULL-NIL
--head -7 OUTPUT-FULL-NIL > OUTPUT-NIL
-+head -6 OUTPUT-FULL-NIL > OUTPUT-NIL
- 
- cat <<EOF > EXPECTED-NIL
- From: Notmuch Test Suite <test_suite <at> notmuchmail.org>
- To: Lars Kellogg-Stedman <lars <at> seas.harvard.edu>, Mikhail Gusarov <dottedmag <at> dottedmag.net>
- Cc: notmuch <at> notmuchmail.org
- Subject: Re: [notmuch] Working with Maildir storage?
--In-Reply-To: <20091117203301.GV3165 <at> dottiness.seas.harvard.edu>
- Fcc: MAIL_DIR/sent
- --text follows this line--
- EOF
-diff --git a/test/emacs-reply.expected-output/notmuch-reply-duplicate-4 b/test/emacs-reply.expected-output/notmuch-reply-duplicate-4
-index 836f77b1..44b8c7a6 100644
---- a/test/emacs-reply.expected-output/notmuch-reply-duplicate-4
-+++ b/test/emacs-reply.expected-output/notmuch-reply-duplicate-4
-@@ -1,7 +1,6 @@
- From: Notmuch Test Suite <test_suite <at> notmuchmail.org>
- To: Sean Whitton <spwhitton <at> spwhitton.name>, 916811 <at> bugs.debian.org, 916805 <at> bugs.debian.org, 916807 <at> bugs.debian.org, 916808 <at> bugs.debian.org, 916809 <at> bugs.debian.org, 916811 <at> bugs.debian.org, 916867 <at> bugs.debian.org, 916869 <at> bugs.debian.org, 916872 <at> bugs.debian.org, 916875 <at> bugs.debian.org, 916876 <at> bugs.debian.org
- Subject: Re: [Pkg-emacsen-addons] Bug#916811: Increase severity to 'serious'
--In-Reply-To: <87r2ecrr6x.fsf <at> zephyr.silentflame.com>
- Fcc: MAIL_DIR/sent
- --text follows this line--
- Sean Whitton <spwhitton <at> spwhitton.name> writes:
--- 
-2.41.0
-

base-commit: 0eadd486484fcf9a234758842f74ba28361640db
-- 
2.43.0

Message #10 received at 68590-done <at> debbugs.gnu.org (full text, mbox):

From: Andreas Enge <andreas <at> enge.fr>
To: 68590-done <at> debbugs.gnu.org
Subject: Close for duplication
Date: Fri, 9 Feb 2024 14:31:12 +0100

Hello Oscar,

thanks for your patch!

The package update appears also in commit
   9b65b60b976c215ccf4e619c90b90e907ff82bf4
so apparently someone else has made the effort independently;
I am closing this bug.

Andreas

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.