diff mbox series

[bug#57013] Acknowledgement ([PATCH] Fix mu4e in mu 1.8.7.)

Message ID 86mtc0yeuz.fsf@163.com
State Accepted
Headers show
Series [bug#57013] Acknowledgement ([PATCH] Fix mu4e in mu 1.8.7.) | expand

Checks

Context Check Description
cbaines/applying patch fail View Laminar job
cbaines/issue success View issue

Commit Message

Zhu Zihao Aug. 19, 2022, 5:35 a.m. UTC 
Rebase on master.

Comments

Tobias Geerinckx-Rice Aug. 19, 2022, 5:59 p.m. UTC | #1 
Zhu Zihao 写道：
> Rebase on master.
> Subject: [PATCH 1/2] gnu: mu: Fix autoloads generation.
> Subject: [PATCH 2/2] gnu: mu: Use G-expressions.

Pushed as 03e7df49c429e08ce6ce46cf913bcc303a9541e0 et al.

Thanks!

T G-R
diff mbox series

Patch

From 10c6a67905d784da4173a05c7ea6d331cf8fd88d Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last@163.com>
Date: Fri, 19 Aug 2022 13:33:20 +0800
Subject: [PATCH 2/2] gnu: mu: Use G-expressions.

* gnu/packages/mail.scm (mu)[arguments]: Use G-expressions.
---
 gnu/packages/mail.scm | 41 +++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 530cd29f4d..646902b4db 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -1179,29 +1179,30 @@  (define-public mu
     (inputs
      (list glib gmime xapian))
     (arguments
-     `(#:modules ((guix build meson-build-system)
+     (list
+      #:modules '((guix build meson-build-system)
                   (guix build emacs-utils)
                   (guix build utils))
-       #:imported-modules (,@%meson-build-system-modules
+      #:imported-modules `(,@%meson-build-system-modules
                            (guix build emacs-utils))
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch-bin-references
-           (lambda _
-             (substitute* '("guile/tests/test-mu-guile.cc"
-                            "mu/tests/test-mu-cmd.cc"
-                            "mu/tests/test-mu-cmd-cfind.cc"
-                            "mu/tests/test-mu-query.cc")
-               (("/bin/sh") (which "sh")))
-             (substitute* '("lib/tests/bench-indexer.cc"
-                            "lib/utils/mu-test-utils.cc")
-               (("/bin/rm") (which "rm")))))
-         (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/mu4e")))))))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch-bin-references
+            (lambda _
+              (substitute* '("guile/tests/test-mu-guile.cc"
+                             "mu/tests/test-mu-cmd.cc"
+                             "mu/tests/test-mu-cmd-cfind.cc"
+                             "mu/tests/test-mu-query.cc")
+                (("/bin/sh") (which "sh")))
+              (substitute* '("lib/tests/bench-indexer.cc"
+                             "lib/utils/mu-test-utils.cc")
+                (("/bin/rm") (which "rm")))))
+          (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/mu4e")))))))
     (home-page "https://www.djcbsoftware.nl/code/mu/")
     (synopsis "Quickly find emails")
     (description
-- 
2.37.1