gnu: aerc: Update to 0.18.1.

* gnu/packages/mail.scm (aerc): Update to 0.18.1.
[arguments]: <#:phases>: Adjust 'patch-paths phase to replace all
occurrences of "sh" in all found *.go files.
[inputs]: Add notmuch.
[native-inputs]: Remove go-git-sr-ht-rockorager-tcell-term,
go-git-sr-ht-sircmpwn-getopt, go-github-com-creack-pty,
go-github-com-ddevault-go-libvterm, go-github-com-gdamore-tcell-v2,
go-github-com-google-shlex, go-github-com-imdario-mergo,
go-github-com-kyoh86-xdg, go-github-com-miolini-datacounter,
go-github-com-mitchellh-go-homedir, go-github-com-xo-terminfo, and
go-github-com-zenhack-go-notmuch; add go-git-sr-ht-rjarry-go-opt,
go-git-sr-ht-rockorager-go-jmap, go-git-sr-ht-rockorager-vaxis,
go-golang-org-x-image, go-golang-org-x-sys, and
go-golang-org-x-tools.

Change-Id: I4cd6de3fb90b33a1b421612c804ee2b01f6c8078

1 files changed, 14 insertions, 23 deletions

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index fff10a9ff8..acb8f3598b 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -5002,7 +5002,7 @@ remote SMTP server.")
 (define-public aerc
   (package
     (name "aerc")
-    (version "0.15.2")
+    (version "0.18.1")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -5011,7 +5011,7 @@ remote SMTP server.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1gbprx0i8d13q974n5hsys6lllav5cpll3cwrr1hfw6307hc001r"))))
+                "1gj8m8xvqaf0lsnk4h1n9d0qhwi8d3mm0w9zhw16v888n7rll9fb"))))
     (build-system go-build-system)
     (arguments
      (list #:import-path "git.sr.ht/~rjarry/aerc"
@@ -5029,14 +5029,10 @@ remote SMTP server.")
            #~(modify-phases %standard-phases
                (add-after 'unpack 'patch-paths
                  (lambda* (#:key import-path inputs #:allow-other-keys)
-                   (with-directory-excursion
-                       (string-append "src/" import-path)
-                     (substitute* (list "config/config.go"
-                                        "lib/templates/template.go"
-                                        "widgets/compose.go"
-                                        "widgets/msgviewer.go"
-                                        "worker/maildir/worker.go"
-                                        "worker/notmuch/worker.go")
+                   (with-directory-excursion (string-append "src/" import-path)
+                     (substitute* (find-files "." "\\.go$")
+                       ;; Patch all occurrences to "sh" with absolute path to
+                       ;; the shell available in Guix.
                        (("\"sh\"")
                         (string-append
                          "\"" (search-input-file inputs "bin/sh")
@@ -5069,18 +5065,19 @@ remote SMTP server.")
     (inputs
      (append
       (list gnupg
+            notmuch ; Failing to build without it.
             python
             python-vobject)
       (if (supported-package? zoxide)
           (list zoxide)
           '())))
     (native-inputs
-     (list go-git-sr-ht-rockorager-tcell-term
-           go-git-sr-ht-sircmpwn-getopt
+     (list go-git-sr-ht-rjarry-go-opt
+           go-git-sr-ht-rockorager-go-jmap
+           go-git-sr-ht-rockorager-vaxis
+           go-github-com-protonmail-go-crypto
            go-github-com-arran4-golang-ical
-           go-github-com-creack-pty
            go-github-com-danwakefield-fnmatch
-           go-github-com-ddevault-go-libvterm
            go-github-com-emersion-go-imap
            go-github-com-emersion-go-imap-sortthread
            go-github-com-emersion-go-maildir
@@ -5092,24 +5089,18 @@ remote SMTP server.")
            go-github-com-emersion-go-smtp
            go-github-com-fsnotify-fsnotify
            go-github-com-gatherstars-com-jwz
-           go-github-com-gdamore-tcell-v2
            go-github-com-go-ini-ini
-           go-github-com-google-shlex
-           go-github-com-imdario-mergo
-           go-github-com-kyoh86-xdg
            go-github-com-lithammer-fuzzysearch
            go-github-com-mattn-go-isatty
            go-github-com-mattn-go-runewidth
-           go-github-com-miolini-datacounter
-           go-github-com-mitchellh-go-homedir
            go-github-com-pkg-errors
-           go-github-com-protonmail-go-crypto
            go-github-com-riywo-loginshell
            go-github-com-stretchr-testify
            go-github-com-syndtr-goleveldb
-           go-github-com-xo-terminfo
-           go-github-com-zenhack-go-notmuch
+           go-golang-org-x-image
            go-golang-org-x-oauth2
+           go-golang-org-x-sys
+           go-golang-org-x-tools
            scdoc))
     (home-page "https://git.sr.ht/~rjarry/aerc")
     (synopsis "Email client for the terminal")