[PATCH 0/4] Update mu and autoload mu4e.

[PATCH 0/4] Update mu and autoload mu4e.

[Alex Kost]

Hello, does anyone use mu4e (emacs interface for 'mu')?  If you do, may
I ask how?  By adding "~/.guix-profile/share/emacs/site-lisp/mu4e" to
'load-path' manually and requiring mu4e?

Our Emacs doesn't look in sub-directories of "share/emacs/site-lisp"
(only in "guix.d" subdir), so mu4e is not found automatically...
I've just thought that it would probably be better to look at site-lisp
subdirs and not to use a special "guix.d" directory, but it's for a
separate thread.

Returning to mu4e, I see that (require 'mu4e) is recommended¹, but IMO
requiring features in your ".emacs" is a bad practice.  I recommend to
avoid it if possible, because requiring big packages can significantly
reduce start-up time of your Emacs.  Instead you can wrap your settings
with 'with-eval-after-load' and use 'autoload' function if you need to
"pick" some command from a package.  Alternatively there is
'use-package' package².

After this patchset, "M-x mu4e" will be available right away (do not
require mu4e, as it will not be needed).

[PATCH 1/4] gnu: mu: Use 'modify-phases'.
[PATCH 2/4] gnu: mu: Install emacs files in a proper place.
[PATCH 3/4] gnu: mu: Install emacs autoloads.
[PATCH 4/4] gnu: mu: Update to 0.9.16.

¹ http://www.djcbsoftware.nl/code/mu/mu4e/Minimal-configuration.html#Minimal-configuration
² https://github.com/jwiegley/use-package

[PATCH 1/4] gnu: mu: Use 'modify-phases'.

[Alex Kost]

* gnu/packages/mail.scm (mu): Use 'modify-phases'.
---
 gnu/packages/mail.scm | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 17dd0ad..59ddd41 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -13,6 +13,7 @@
 ;;; Copyright © 2016 Al McElrath <hello@yrns.org>
 ;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org>
+;;; Copyright © 2016 Alex Kost <alezost@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -364,18 +365,18 @@ repository and Maildir/IMAP as LOCAL repository.")
        ("gmime" ,gmime)
        ("tzdata" ,tzdata)))             ;for mu/test/test-mu-query.c
     (arguments
-     '(#:phases (alist-cons-after
-                 'unpack 'autoreconf
-                 (lambda _
-                   (zero? (system* "autoreconf" "-vi")))
-                 (alist-cons-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")))
-                   %standard-phases))))
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'autoreconf
+           (lambda _
+             (zero? (system* "autoreconf" "-vi"))))
+         (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)))))
     (home-page "http://www.djcbsoftware.nl/code/mu/")
     (synopsis "Quickly find emails")
     (description
-- 
2.7.3

[PATCH 2/4] gnu: mu: Install emacs files in a proper place.

[Alex Kost]

* gnu/packages/mail.scm (mu)[arguments]: Add 'patch-configure.ac' phase
  to avoid adding "mu4e" sub-directory to 'lispdir' variable.
---
 gnu/packages/mail.scm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 59ddd41..48379f2 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -367,7 +367,16 @@ repository and Maildir/IMAP as LOCAL repository.")
     (arguments
      '(#:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'autoreconf
+         (add-after 'unpack 'patch-configure.ac
+           ;; By default, elisp code goes to "share/emacs/site-lisp/mu4e",
+           ;; so our Emacs package can't find it.  Setting "--with-lispdir"
+           ;; configure flag doesn't help because "mu4e" will be added to
+           ;; the lispdir anyway, so we have to modify "configure.ac".
+           (lambda _
+             (substitute* "configure.ac"
+               (("^ +lispdir=.*") ""))
+             #t))
+         (add-after 'patch-configure.ac 'autoreconf
            (lambda _
              (zero? (system* "autoreconf" "-vi"))))
          (add-before 'check 'check-tz-setup
-- 
2.7.3

[PATCH 3/4] gnu: mu: Install emacs autoloads.

[Alex Kost]

* gnu/packages/mail.scm (mu)[arguments]: Add 'install-emacs-autoloads'
  phase.  Use appropriate modules and imported-modules.
---
 gnu/packages/mail.scm | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 48379f2..8998fdb 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -365,7 +365,12 @@ repository and Maildir/IMAP as LOCAL repository.")
        ("gmime" ,gmime)
        ("tzdata" ,tzdata)))             ;for mu/test/test-mu-query.c
     (arguments
-     '(#:phases
+     `(#:modules ((guix build gnu-build-system)
+                  (guix build utils)
+                  (guix build emacs-utils))
+       #:imported-modules (,@%gnu-build-system-modules
+                           (guix build emacs-utils))
+       #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'patch-configure.ac
            ;; By default, elisp code goes to "share/emacs/site-lisp/mu4e",
@@ -385,6 +390,13 @@ repository and Maildir/IMAP as LOCAL repository.")
              (setenv "TZDIR"
                      (string-append (assoc-ref inputs "tzdata")
                                     "/share/zoneinfo"))
+             #t))
+         (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)))))
     (home-page "http://www.djcbsoftware.nl/code/mu/")
     (synopsis "Quickly find emails")
-- 
2.7.3

[PATCH 4/4] gnu: mu: Update to 0.9.16.

[Alex Kost]

* gnu/packages/mail.scm (%mu-gtester-patch): Remove.
(mu): Update to 0.9.16.
[source]: Remove 'patches'.
---
 gnu/packages/mail.scm | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 8998fdb..140993a 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -326,19 +326,10 @@ can read the same mailbox from multiple computers.  It supports IMAP as REMOTE
 repository and Maildir/IMAP as LOCAL repository.")
     (license gpl2+)))
 
-(define %mu-gtester-patch
-  ;; Ensure tests have unique names, to placate GLib 2.6's gtester.
-  (origin
-    (method url-fetch)
-    (uri "https://github.com/djcb/mu/commit/b44039ed.patch")
-    (sha256
-     (base32
-      "165hryqqhx3wah8a4f5jaq465azx1pm9r4jid7880pys9gd88qlv"))))
-
 (define-public mu
   (package
     (name "mu")
-    (version "0.9.13")
+    (version "0.9.16")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://github.com/djcb/mu/archive/v"
@@ -346,8 +337,7 @@ repository and Maildir/IMAP as LOCAL repository.")
               (file-name (string-append "mu-" version ".tar.gz"))
               (sha256
                (base32
-                "0wj33pma8xgjvn2akk7khzbycwn4c9sshxvzdph9dnpy7gyqxj51"))
-              (patches (list %mu-gtester-patch))))
+                "0p7hqri1r1x6750x138cc29mh81kdav2dcim26y58s8an206h25g"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
-- 
2.7.3

Re: [PATCH 0/4] Update mu and autoload mu4e.

[Leo Famulari]

On Sun, May 08, 2016 at 01:21:47PM +0300, Alex Kost wrote:
> [PATCH 1/4] gnu: mu: Use 'modify-phases'.
> [PATCH 2/4] gnu: mu: Install emacs files in a proper place.
> [PATCH 3/4] gnu: mu: Install emacs autoloads.
> [PATCH 4/4] gnu: mu: Update to 0.9.16.

As a regular user of mu but not mu4e, this change works for me.

Re: [PATCH 0/4] Update mu and autoload mu4e.

[Ludovic Courtès]

Alex Kost <alezost@gmail.com> skribis:

> Hello, does anyone use mu4e (emacs interface for 'mu')?  If you do, may
> I ask how?  By adding "~/.guix-profile/share/emacs/site-lisp/mu4e" to
> 'load-path' manually and requiring mu4e?

I don’t use it, but…

> Our Emacs doesn't look in sub-directories of "share/emacs/site-lisp"
> (only in "guix.d" subdir), so mu4e is not found automatically...
> I've just thought that it would probably be better to look at site-lisp
> subdirs and not to use a special "guix.d" directory, but it's for a
> separate thread.

… I would just move ‘mu4e’ under ‘guix.d’, no?

Ludo’.

Re: [PATCH 1/4] gnu: mu: Use 'modify-phases'.

[Ludovic Courtès]

Alex Kost <alezost@gmail.com> skribis:

> * gnu/packages/mail.scm (mu): Use 'modify-phases'.

OK!

Re: [PATCH 2/4] gnu: mu: Install emacs files in a proper place.

[Ludovic Courtès]

Alex Kost <alezost@gmail.com> skribis:

> * gnu/packages/mail.scm (mu)[arguments]: Add 'patch-configure.ac' phase
>   to avoid adding "mu4e" sub-directory to 'lispdir' variable.

[...]

> +           ;; By default, elisp code goes to "share/emacs/site-lisp/mu4e",
> +           ;; so our Emacs package can't find it.  Setting "--with-lispdir"

Should be “--lispdir”, I think.

Otherwise LGTM!

Re: [PATCH 3/4] gnu: mu: Install emacs autoloads.

[Ludovic Courtès]

Alex Kost <alezost@gmail.com> skribis:

> * gnu/packages/mail.scm (mu)[arguments]: Add 'install-emacs-autoloads'
>   phase.  Use appropriate modules and imported-modules.

LGTM!

Re: [PATCH 4/4] gnu: mu: Update to 0.9.16.

[Ludovic Courtès]

Alex Kost <alezost@gmail.com> skribis:

> * gnu/packages/mail.scm (%mu-gtester-patch): Remove.
> (mu): Update to 0.9.16.
> [source]: Remove 'patches'.

LGTM, thanks!

Ludo'.

Re: [PATCH 0/4] Update mu and autoload mu4e.

[Alex Kost]

Ludovic Courtès (2016-05-09 23:11 +0300) wrote:

> Alex Kost <alezost@gmail.com> skribis:
>
>> Hello, does anyone use mu4e (emacs interface for 'mu')?  If you do, may
>> I ask how?  By adding "~/.guix-profile/share/emacs/site-lisp/mu4e" to
>> 'load-path' manually and requiring mu4e?
>
> I don’t use it, but…
>
>> Our Emacs doesn't look in sub-directories of "share/emacs/site-lisp"
>> (only in "guix.d" subdir), so mu4e is not found automatically...
>> I've just thought that it would probably be better to look at site-lisp
>> subdirs and not to use a special "guix.d" directory, but it's for a
>> separate thread.
>
> … I would just move ‘mu4e’ under ‘guix.d’, no?

Why?  magit, geiser, paredit, emms, w3m, wget (and probably some others)
are all in 'site-lisp'.  Do you think they also should be moved into
sub-directories?  I don't mind but…

… as an opponent of the redundant "guix.d" part, I wouldn't put any
package inside "site-lisp/guix.d/<package>" by will (I think
"site-lisp/<package>" should be used instead!)

So I would rather leave the upstream untouched (i.e., let it put elisp
files in "share/emacs/site-lisp/mu4e"), and make our Emacs package
search for elisp files in "site-lisp" subdirs instead of
"site-lisp/guix.d" subdirs.

-- 
Alex

Re: [PATCH 2/4] gnu: mu: Install emacs files in a proper place.

[Alex Kost]

Ludovic Courtès (2016-05-09 23:16 +0300) wrote:

> Alex Kost <alezost@gmail.com> skribis:
>
>> * gnu/packages/mail.scm (mu)[arguments]: Add 'patch-configure.ac' phase
>>   to avoid adding "mu4e" sub-directory to 'lispdir' variable.
>
> [...]
>
>> +           ;; By default, elisp code goes to "share/emacs/site-lisp/mu4e",
>> +           ;; so our Emacs package can't find it.  Setting "--with-lispdir"
>
> Should be “--lispdir”, I think.

No, it is literally called “--with-lispdir”.  Look at AM_PATH_LISPDIR in
(info "(automake) Public Macros")

-- 
Alex

Re: [PATCH 0/4] Update mu and autoload mu4e.

[Ludovic Courtès]

Alex Kost <alezost@gmail.com> skribis:

> Ludovic Courtès (2016-05-09 23:11 +0300) wrote:
>
>> Alex Kost <alezost@gmail.com> skribis:
>>
>>> Hello, does anyone use mu4e (emacs interface for 'mu')?  If you do, may
>>> I ask how?  By adding "~/.guix-profile/share/emacs/site-lisp/mu4e" to
>>> 'load-path' manually and requiring mu4e?
>>
>> I don’t use it, but…
>>
>>> Our Emacs doesn't look in sub-directories of "share/emacs/site-lisp"
>>> (only in "guix.d" subdir), so mu4e is not found automatically...
>>> I've just thought that it would probably be better to look at site-lisp
>>> subdirs and not to use a special "guix.d" directory, but it's for a
>>> separate thread.
>>
>> … I would just move ‘mu4e’ under ‘guix.d’, no?
>
> Why?  magit, geiser, paredit, emms, w3m, wget (and probably some others)
> are all in 'site-lisp'.  Do you think they also should be moved into
> sub-directories?  I don't mind but…

Ah no, you’re right.  Then at least “mv mu4e/*.el .”?

The main problem seems to be this mu4e/ sub-directory.

Ludo’.

Re: [PATCH 2/4] gnu: mu: Install emacs files in a proper place.

[Ludovic Courtès]

Alex Kost <alezost@gmail.com> skribis:

> Ludovic Courtès (2016-05-09 23:16 +0300) wrote:
>
>> Alex Kost <alezost@gmail.com> skribis:
>>
>>> * gnu/packages/mail.scm (mu)[arguments]: Add 'patch-configure.ac' phase
>>>   to avoid adding "mu4e" sub-directory to 'lispdir' variable.
>>
>> [...]
>>
>>> +           ;; By default, elisp code goes to "share/emacs/site-lisp/mu4e",
>>> +           ;; so our Emacs package can't find it.  Setting "--with-lispdir"
>>
>> Should be “--lispdir”, I think.
>
> No, it is literally called “--with-lispdir”.  Look at AM_PATH_LISPDIR in
> (info "(automake) Public Macros")

Indeed, I stand corrected!  :-)

Ludo’.

Re: [PATCH 0/4] Update mu and autoload mu4e.

[Alex Kost]

Ludovic Courtès (2016-05-10 16:23 +0300) wrote:

> Alex Kost <alezost@gmail.com> skribis:
>
>> Ludovic Courtès (2016-05-09 23:11 +0300) wrote:
>>
>>> Alex Kost <alezost@gmail.com> skribis:
>>>
>>>> Hello, does anyone use mu4e (emacs interface for 'mu')?  If you do, may
>>>> I ask how?  By adding "~/.guix-profile/share/emacs/site-lisp/mu4e" to
>>>> 'load-path' manually and requiring mu4e?
>>>
>>> I don’t use it, but…
>>>
>>>> Our Emacs doesn't look in sub-directories of "share/emacs/site-lisp"
>>>> (only in "guix.d" subdir), so mu4e is not found automatically...
>>>> I've just thought that it would probably be better to look at site-lisp
>>>> subdirs and not to use a special "guix.d" directory, but it's for a
>>>> separate thread.
>>>
>>> … I would just move ‘mu4e’ under ‘guix.d’, no?
>>
>> Why?  magit, geiser, paredit, emms, w3m, wget (and probably some others)
>> are all in 'site-lisp'.  Do you think they also should be moved into
>> sub-directories?  I don't mind but…
>
> Ah no, you’re right.  Then at least “mv mu4e/*.el .”?

Sorry, what do you mean?  My patch already puts elisp files in
"site-lisp" directory.

> The main problem seems to be this mu4e/ sub-directory.

Yes, and it is fixed with PATCH 2.  Currently *.el[c] files go to
"site-lisp/mu4e" directory so our emacs doesn't find them.  To fix it I
add a phase to patch "configure.ac" and the elisp files will go to
"site-lisp", as the GNU Build System originally wants.

To clear it all up, this package modifies 'lispdir' automake variable,
so if you do this:

  ./configure --with-lispdir=/tmp/mu4e-elisp-files

The elisp files will go to "/tmp/mu4e-elisp-files/mu4e" directory.  I
just removed this violent modification, so *.el files go where they
should (without additional "mu4e" level).

-- 
Alex

Re: [PATCH 0/4] Update mu and autoload mu4e.

[Ludovic Courtès]

Alex Kost <alezost@gmail.com> skribis:

> Ludovic Courtès (2016-05-10 16:23 +0300) wrote:
>
>> Alex Kost <alezost@gmail.com> skribis:
>>
>>> Ludovic Courtès (2016-05-09 23:11 +0300) wrote:
>>>
>>>> Alex Kost <alezost@gmail.com> skribis:
>>>>
>>>>> Hello, does anyone use mu4e (emacs interface for 'mu')?  If you do, may
>>>>> I ask how?  By adding "~/.guix-profile/share/emacs/site-lisp/mu4e" to
>>>>> 'load-path' manually and requiring mu4e?
>>>>
>>>> I don’t use it, but…
>>>>
>>>>> Our Emacs doesn't look in sub-directories of "share/emacs/site-lisp"
>>>>> (only in "guix.d" subdir), so mu4e is not found automatically...
>>>>> I've just thought that it would probably be better to look at site-lisp
>>>>> subdirs and not to use a special "guix.d" directory, but it's for a
>>>>> separate thread.
>>>>
>>>> … I would just move ‘mu4e’ under ‘guix.d’, no?
>>>
>>> Why?  magit, geiser, paredit, emms, w3m, wget (and probably some others)
>>> are all in 'site-lisp'.  Do you think they also should be moved into
>>> sub-directories?  I don't mind but…
>>
>> Ah no, you’re right.  Then at least “mv mu4e/*.el .”?
>
> Sorry, what do you mean?  My patch already puts elisp files in
> "site-lisp" directory.

Right, sorry.  So everything is fine with patch #2 applied from my POV.
:-)

Thanks,
Ludo’.

Re: [PATCH 0/4] Update mu and autoload mu4e.

[Alex Kost]

Ludovic Courtès (2016-05-11 19:00 +0300) wrote:

> Alex Kost <alezost@gmail.com> skribis:
>
>> Ludovic Courtès (2016-05-10 16:23 +0300) wrote:
>>
>>> Alex Kost <alezost@gmail.com> skribis:
>>>
>>>> Ludovic Courtès (2016-05-09 23:11 +0300) wrote:
>>>>
>>>>> Alex Kost <alezost@gmail.com> skribis:
>>>>>
>>>>>> Hello, does anyone use mu4e (emacs interface for 'mu')?  If you do, may
>>>>>> I ask how?  By adding "~/.guix-profile/share/emacs/site-lisp/mu4e" to
>>>>>> 'load-path' manually and requiring mu4e?
>>>>>
>>>>> I don’t use it, but…
>>>>>
>>>>>> Our Emacs doesn't look in sub-directories of "share/emacs/site-lisp"
>>>>>> (only in "guix.d" subdir), so mu4e is not found automatically...
>>>>>> I've just thought that it would probably be better to look at site-lisp
>>>>>> subdirs and not to use a special "guix.d" directory, but it's for a
>>>>>> separate thread.
>>>>>
>>>>> … I would just move ‘mu4e’ under ‘guix.d’, no?
>>>>
>>>> Why?  magit, geiser, paredit, emms, w3m, wget (and probably some others)
>>>> are all in 'site-lisp'.  Do you think they also should be moved into
>>>> sub-directories?  I don't mind but…
>>>
>>> Ah no, you’re right.  Then at least “mv mu4e/*.el .”?
>>
>> Sorry, what do you mean?  My patch already puts elisp files in
>> "site-lisp" directory.
>
> Right, sorry.  So everything is fine with patch #2 applied from my POV.
> :-)

Great, I will commit this 'mu' patchset when git.savannah will be up,
thanks for the comments!

-- 
Alex