GNU bug report logs - #49751
[PATCH] gnu: mu: Update to 1.6.0.

Previous Next

Package: guix-patches;

Reported by: Pierre Langlois <pierre.langlois <at> gmx.com>

Date: Tue, 27 Jul 2021 21:15:01 UTC

Severity: normal

Tags: patch

Done: Pierre Langlois <pierre.langlois <at> gmx.com>

Bug is archived. No further changes may be made.

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

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

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to guix-patches <at> gnu.org:
bug#49751; Package guix-patches. (Tue, 27 Jul 2021 21:15:01 GMT) Full text and rfc822 format available.

Acknowledgement sent to Pierre Langlois <pierre.langlois <at> gmx.com>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Tue, 27 Jul 2021 21:15:02 GMT) Full text and rfc822 format available.

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

From: Pierre Langlois <pierre.langlois <at> gmx.com>
To: Guix-patches <guix-patches <at> gnu.org>
Subject: [PATCH] gnu: mu: Update to 1.6.0.
Date: Tue, 27 Jul 2021 22:12:07 +0100
[Message part 1 (text/plain, inline)]
Hi Guix!

I just noticed a new version of Mu was just released so here's a patch!
OK to apply?  Sent from mu4e 1.6 :-)

Thanks,
Pierre

[signature.asc (application/pgp-signature, inline)]
[0001-gnu-mu-Update-to-1.6.0.patch (text/x-patch, inline)]
From 4558260f728199f6a1f0d13a6515b595dd5f61bd Mon Sep 17 00:00:00 2001
From: Pierre Langlois <pierre.langlois <at> gmx.com>
Date: Tue, 27 Jul 2021 21:09:49 +0100
Subject: [PATCH] gnu: mu: Update to 1.6.0.

* gnu/packages/mail.scm (mu): Update to 1.6.0.
[inputs]: Use guile-3.0.
[arguments]: Remove autotools substitutions for guile-2.2.  Update
'patch-bin-sh-in-tests phase to new tests.  Do not return #t in the remaining
phases.
---
 gnu/packages/mail.scm | 35 ++++++++++++-----------------------
 1 file changed, 12 insertions(+), 23 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index c207d363cf..d0b3198479 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -1146,7 +1146,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.")
 (define-public mu
   (package
     (name "mu")
-    (version "1.4.15")
+    (version "1.6.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://github.com/djcb/mu/releases/"
@@ -1154,7 +1154,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.")
                                   "mu-" version ".tar.xz"))
               (sha256
                (base32
-                "0ailz0k5fdgq6gdl5m7jxy315b7qn5ckj6xwd49hsiq9vqblwlpp"))))
+                "0rb47mkhdp5gzzk7w6680hj887cxanwr3vi6fbplh696pr5ghpyj"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
@@ -1163,7 +1163,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.")
        ("tzdata" ,tzdata-for-tests)))   ; for mu/test/test-mu-query.c
     (inputs
      `(("xapian" ,xapian)
-       ("guile" ,guile-2.2)
+       ("guile" ,guile-3.0)
        ("glib" ,glib)
        ("gmime" ,gmime)))
     (arguments
@@ -1181,43 +1181,32 @@ security functionality including PGP, S/MIME, SSH, and SSL.")
            ;; the lispdir anyway, so we have to modify "configure.ac".
            (lambda _
              (substitute* "configure"
-               (("^ +lispdir=\"\\$\\{lispdir\\}/mu4e/\".*") "")
-               ;; Use latest Guile
-               (("guile-2.0") "guile-2.2"))
-             (substitute* '("guile/Makefile.in"
-                            "guile/mu/Makefile.in")
-               (("share/guile/site/2.0/") "share/guile/site/2.2/"))
-             #t))
+               (("^ +lispdir=\"\\$\\{lispdir\\}/mu4e/\".*") ""))))
          (add-after 'unpack 'patch-bin-sh-in-tests
            (lambda _
-             (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))
+             (substitute* '("guile/tests/test-mu-guile.cc"
+                            "mu/test-mu-cmd.cc"
+                            "mu/test-mu-cmd-cfind.cc"
+                            "mu/test-mu-query.cc")
+               (("/bin/sh") (which "sh")))))
          (add-before 'install 'fix-ffi
            (lambda* (#:key outputs #:allow-other-keys)
              (substitute* "guile/mu.scm"
                (("\"libguile-mu\"")
                 (format #f "\"~a/lib/libguile-mu\""
-                        (assoc-ref outputs "out"))))
-             #t))
+                        (assoc-ref outputs "out"))))))
          (add-before 'check 'check-tz-setup
            (lambda* (#:key inputs #:allow-other-keys)
              ;; For mu/test/test-mu-query.c
              (setenv "TZDIR"
                      (string-append (assoc-ref inputs "tzdata")
-                                    "/share/zoneinfo"))
-             #t))
+                                    "/share/zoneinfo"))))
          (add-after 'install 'install-emacs-autoloads
            (lambda* (#:key outputs #:allow-other-keys)
              (emacs-generate-autoloads
               "mu4e"
               (string-append (assoc-ref outputs "out")
-                             "/share/emacs/site-lisp"))
-             #t)))))
+                             "/share/emacs/site-lisp")))))))
     (home-page "https://www.djcbsoftware.nl/code/mu/")
     (synopsis "Quickly find emails")
     (description
--
2.32.0


Information forwarded to guix-patches <at> gnu.org:
bug#49751; Package guix-patches. (Tue, 27 Jul 2021 23:14:01 GMT) Full text and rfc822 format available.

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

From: Pierre Langlois <pierre.langlois <at> gmx.com>
To: Pierre Langlois <pierre.langlois <at> gmx.com>
Cc: 49751 <at> debbugs.gnu.org, guix-patches <at> gnu.org
Subject: Re: [bug#49751] [PATCH] gnu: mu: Update to 1.6.0.
Date: Wed, 28 Jul 2021 00:13:04 +0100
[Message part 1 (text/plain, inline)]
Pierre Langlois writes:

> Hi Guix!
>
> I just noticed a new version of Mu was just released so here's a patch!
> OK to apply?  Sent from mu4e 1.6 :-)

I just realised the emacs UI isn't showing me new unread mail after
updating so I had to revert back :-/. Will have to do a bit of digging
before pushing this.

Pierre
[signature.asc (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#49751; Package guix-patches. (Tue, 27 Jul 2021 23:14:02 GMT) Full text and rfc822 format available.

Information forwarded to guix-patches <at> gnu.org:
bug#49751; Package guix-patches. (Wed, 28 Jul 2021 14:43:02 GMT) Full text and rfc822 format available.

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

From: Pierre Langlois <pierre.langlois <at> gmx.com>
To: Pierre Langlois <pierre.langlois <at> gmx.com>
Cc: 49751 <at> debbugs.gnu.org, guix-patches <at> gnu.org
Subject: Re: [bug#49751] [PATCH] gnu: mu: Update to 1.6.0.
Date: Wed, 28 Jul 2021 15:38:26 +0100
[Message part 1 (text/plain, inline)]
Pierre Langlois <pierre.langlois <at> gmx.com> writes:

> [[PGP Signed Part:Undecided]]
>
> Pierre Langlois writes:
>
>> Hi Guix!
>>
>> I just noticed a new version of Mu was just released so here's a patch!
>> OK to apply?  Sent from mu4e 1.6 :-)
>
> I just realised the emacs UI isn't showing me new unread mail after
> updating so I had to revert back :-/. Will have to do a bit of digging
> before pushing this.

Turns out we need to remove the xapian database (deleting .cache/mu and
regenerating it) https://github.com/djcb/mu/issues/2058

That worked for me, although it's a shame that there are no warnings,
the issue also mentions another potential problem, so we might want to
wait a little bit before updating in case upstream releases a point
release with a smoother transition.

Thanks,
Pierre
[signature.asc (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#49751; Package guix-patches. (Wed, 28 Jul 2021 14:43:02 GMT) Full text and rfc822 format available.

Information forwarded to guix-patches <at> gnu.org:
bug#49751; Package guix-patches. (Sat, 31 Jul 2021 11:06:01 GMT) Full text and rfc822 format available.

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

From: Pierre Langlois <pierre.langlois <at> gmx.com>
To: Pierre Langlois <pierre.langlois <at> gmx.com>
Cc: 49751 <at> debbugs.gnu.org, guix-patches <at> gnu.org
Subject: Re: [bug#49751] [PATCH] gnu: mu: Update to 1.6.1.
Date: Sat, 31 Jul 2021 12:02:22 +0100
[Message part 1 (text/plain, inline)]
Hi,

Pierre Langlois <pierre.langlois <at> gmx.com> writes:

> [[PGP Signed Part:Undecided]]
>
> Pierre Langlois <pierre.langlois <at> gmx.com> writes:
>
>> [[PGP Signed Part:Undecided]]
>>
>> Pierre Langlois writes:
>>
>>> Hi Guix!
>>>
>>> I just noticed a new version of Mu was just released so here's a patch!
>>> OK to apply?  Sent from mu4e 1.6 :-)
>>
>> I just realised the emacs UI isn't showing me new unread mail after
>> updating so I had to revert back :-/. Will have to do a bit of digging
>> before pushing this.
>
> Turns out we need to remove the xapian database (deleting .cache/mu and
> regenerating it) https://github.com/djcb/mu/issues/2058
>
> That worked for me, although it's a shame that there are no warnings,
> the issue also mentions another potential problem, so we might want to
> wait a little bit before updating in case upstream releases a point
> release with a smoother transition.

1.6.1 was just released, users should get a warning that they need to
run `mu init' https://github.com/djcb/mu/releases/tag/1.6.1

Ok to apply?

Thanks,
Pierre

[signature.asc (application/pgp-signature, inline)]
[0001-gnu-mu-Update-to-1.6.1.patch (text/x-patch, inline)]
From 176a8cc7f8309bc0a13250ff3cf817e042f17d7c Mon Sep 17 00:00:00 2001
From: Pierre Langlois <pierre.langlois <at> gmx.com>
Date: Tue, 27 Jul 2021 21:09:49 +0100
Subject: [PATCH] gnu: mu: Update to 1.6.1.

* gnu/packages/mail.scm (mu): Update to 1.6.1.
[inputs]: Use guile-3.0.
[arguments]: Remove autotools substitutions for guile-2.2.  Update
'patch-bin-sh-in-tests phase to new tests.  Do not return #t in the remaining
phases.
---
 gnu/packages/mail.scm | 35 ++++++++++++-----------------------
 1 file changed, 12 insertions(+), 23 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index c207d363cf..5199d0b02e 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -1146,7 +1146,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.")
 (define-public mu
   (package
     (name "mu")
-    (version "1.4.15")
+    (version "1.6.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://github.com/djcb/mu/releases/"
@@ -1154,7 +1154,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.")
                                   "mu-" version ".tar.xz"))
               (sha256
                (base32
-                "0ailz0k5fdgq6gdl5m7jxy315b7qn5ckj6xwd49hsiq9vqblwlpp"))))
+                "1167sxh49v8wgvvgsgchnybz59q6s816qk59bb0qgw7ia0nad70w"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
@@ -1163,7 +1163,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.")
        ("tzdata" ,tzdata-for-tests)))   ; for mu/test/test-mu-query.c
     (inputs
      `(("xapian" ,xapian)
-       ("guile" ,guile-2.2)
+       ("guile" ,guile-3.0)
        ("glib" ,glib)
        ("gmime" ,gmime)))
     (arguments
@@ -1181,43 +1181,32 @@ security functionality including PGP, S/MIME, SSH, and SSL.")
            ;; the lispdir anyway, so we have to modify "configure.ac".
            (lambda _
              (substitute* "configure"
-               (("^ +lispdir=\"\\$\\{lispdir\\}/mu4e/\".*") "")
-               ;; Use latest Guile
-               (("guile-2.0") "guile-2.2"))
-             (substitute* '("guile/Makefile.in"
-                            "guile/mu/Makefile.in")
-               (("share/guile/site/2.0/") "share/guile/site/2.2/"))
-             #t))
+               (("^ +lispdir=\"\\$\\{lispdir\\}/mu4e/\".*") ""))))
          (add-after 'unpack 'patch-bin-sh-in-tests
            (lambda _
-             (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))
+             (substitute* '("guile/tests/test-mu-guile.cc"
+                            "mu/test-mu-cmd.cc"
+                            "mu/test-mu-cmd-cfind.cc"
+                            "mu/test-mu-query.cc")
+               (("/bin/sh") (which "sh")))))
          (add-before 'install 'fix-ffi
            (lambda* (#:key outputs #:allow-other-keys)
              (substitute* "guile/mu.scm"
                (("\"libguile-mu\"")
                 (format #f "\"~a/lib/libguile-mu\""
-                        (assoc-ref outputs "out"))))
-             #t))
+                        (assoc-ref outputs "out"))))))
          (add-before 'check 'check-tz-setup
            (lambda* (#:key inputs #:allow-other-keys)
              ;; For mu/test/test-mu-query.c
              (setenv "TZDIR"
                      (string-append (assoc-ref inputs "tzdata")
-                                    "/share/zoneinfo"))
-             #t))
+                                    "/share/zoneinfo"))))
          (add-after 'install 'install-emacs-autoloads
            (lambda* (#:key outputs #:allow-other-keys)
              (emacs-generate-autoloads
               "mu4e"
               (string-append (assoc-ref outputs "out")
-                             "/share/emacs/site-lisp"))
-             #t)))))
+                             "/share/emacs/site-lisp")))))))
     (home-page "https://www.djcbsoftware.nl/code/mu/")
     (synopsis "Quickly find emails")
     (description
--
2.32.0


Information forwarded to guix-patches <at> gnu.org:
bug#49751; Package guix-patches. (Sat, 31 Jul 2021 11:06:01 GMT) Full text and rfc822 format available.

Information forwarded to guix-patches <at> gnu.org:
bug#49751; Package guix-patches. (Tue, 10 Aug 2021 13:41:01 GMT) Full text and rfc822 format available.

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

From: Ludovic Courtès <ludo <at> gnu.org>
To: Pierre Langlois <pierre.langlois <at> gmx.com>
Cc: 49751 <at> debbugs.gnu.org
Subject: Re: bug#49751: [PATCH] gnu: mu: Update to 1.6.0.
Date: Tue, 10 Aug 2021 15:40:46 +0200
Hi Pierre,

Looks like this fell through the cracks!

Pierre Langlois <pierre.langlois <at> gmx.com> skribis:

[...]

>> Turns out we need to remove the xapian database (deleting .cache/mu and
>> regenerating it) https://github.com/djcb/mu/issues/2058
>>
>> That worked for me, although it's a shame that there are no warnings,
>> the issue also mentions another potential problem, so we might want to
>> wait a little bit before updating in case upstream releases a point
>> release with a smoother transition.
>
> 1.6.1 was just released, users should get a warning that they need to
> run `mu init' https://github.com/djcb/mu/releases/tag/1.6.1
>
> Ok to apply?

In general, if it works according to your testing and nobody has
anything to say, you can feel free to go ahead, as per:

  https://guix.gnu.org/manual/devel/en/html_node/Commit-Access.html#Commit-Policy

Thanks!

Ludo’.




Reply sent to Pierre Langlois <pierre.langlois <at> gmx.com>:
You have taken responsibility. (Tue, 10 Aug 2021 14:00:02 GMT) Full text and rfc822 format available.

Notification sent to Pierre Langlois <pierre.langlois <at> gmx.com>:
bug acknowledged by developer. (Tue, 10 Aug 2021 14:00:02 GMT) Full text and rfc822 format available.

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

From: Pierre Langlois <pierre.langlois <at> gmx.com>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: Pierre Langlois <pierre.langlois <at> gmx.com>, 49751-done <at> debbugs.gnu.org
Subject: Re: bug#49751: [PATCH] gnu: mu: Update to 1.6.0.
Date: Tue, 10 Aug 2021 14:56:16 +0100
[Message part 1 (text/plain, inline)]
Hi Ludo,

Ludovic Courtès <ludo <at> gnu.org> writes:

> Hi Pierre,
>
> Looks like this fell through the cracks!
>
> Pierre Langlois <pierre.langlois <at> gmx.com> skribis:
>
> [...]
>
>>> Turns out we need to remove the xapian database (deleting .cache/mu and
>>> regenerating it) https://github.com/djcb/mu/issues/2058
>>>
>>> That worked for me, although it's a shame that there are no warnings,
>>> the issue also mentions another potential problem, so we might want to
>>> wait a little bit before updating in case upstream releases a point
>>> release with a smoother transition.
>>
>> 1.6.1 was just released, users should get a warning that they need to
>> run `mu init' https://github.com/djcb/mu/releases/tag/1.6.1
>>
>> Ok to apply?
>
> In general, if it works according to your testing and nobody has
> anything to say, you can feel free to go ahead, as per:
>
>   https://guix.gnu.org/manual/devel/en/html_node/Commit-Access.html#Commit-Policy

Sounds good!  Pushed as b0a6b1f13ce17ec37600f5e8404e0c8c43302fe5, with
version 1.6.2 actually.

Thanks,
Pierre
[signature.asc (application/pgp-signature, inline)]

bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Wed, 08 Sep 2021 11:24:07 GMT) Full text and rfc822 format available.

This bug report was last modified 2 years and 224 days ago.

Previous Next


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