[-- Attachment #1.1: Type: text/plain, Size: 136 bytes --] 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 [-- Attachment #1.2: signature.asc --] [-- Type: application/pgp-signature, Size: 519 bytes --] [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: 0001-gnu-mu-Update-to-1.6.0.patch --] [-- Type: text/x-patch, Size: 4372 bytes --] From 4558260f728199f6a1f0d13a6515b595dd5f61bd Mon Sep 17 00:00:00 2001 From: Pierre Langlois <pierre.langlois@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
[-- Attachment #1: Type: text/plain, Size: 321 bytes --] 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 [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 519 bytes --]
[-- Attachment #1: Type: text/plain, Size: 803 bytes --] Pierre Langlois <pierre.langlois@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 [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 519 bytes --]
[-- Attachment #1.1: Type: text/plain, Size: 1067 bytes --] Hi, Pierre Langlois <pierre.langlois@gmx.com> writes: > [[PGP Signed Part:Undecided]] > > Pierre Langlois <pierre.langlois@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 [-- Attachment #1.2: signature.asc --] [-- Type: application/pgp-signature, Size: 519 bytes --] [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: 0001-gnu-mu-Update-to-1.6.1.patch --] [-- Type: text/x-patch, Size: 4372 bytes --] From 176a8cc7f8309bc0a13250ff3cf817e042f17d7c Mon Sep 17 00:00:00 2001 From: Pierre Langlois <pierre.langlois@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
Hi Pierre, Looks like this fell through the cracks! Pierre Langlois <pierre.langlois@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’.
[-- Attachment #1: Type: text/plain, Size: 1095 bytes --] Hi Ludo, Ludovic Courtès <ludo@gnu.org> writes: > Hi Pierre, > > Looks like this fell through the cracks! > > Pierre Langlois <pierre.langlois@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 [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 519 bytes --]