me
/
guix
Archived
1
0
Fork 0
Code

gnu: mu: Update to 1.8.7. 

* gnu/packages/mail.scm (mu): Update to 1.8.7.
[source]: Fetch from git.
[build-system]: Use meson-build-system.
[native-inputs]: Remove glib:bin and tzdata; add gnupg and texinfo; use new
style.
[inputs]: Remove guile.
[arguments]: Remove obsolete 'patch-configure, 'fix-ffi, and
'check-tz-setup phases.  Rename 'patch-bin-sh-in-tests
to 'patch-bin-references and update it.

Signed-off-by: Ricardo Wurmus <rekado@elephly.net>
muradm 2022-08-01 16:11:59 +03:00 committed by Ricardo Wurmus
parent c454cf6343
commit 7e3234cb70
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
1 changed files with 26 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
gnu/packages/mail.scm
View File

@ -48,6 +48,7 @@
;;; Copyright © 2022 Justin Veilleux <terramorpha@cock.li> ;;; Copyright © 2022 Justin Veilleux <terramorpha@cock.li>
;;; Copyright © 2022 Thiago Jung Bauermann <bauermann@kolabnow.com> ;;; Copyright © 2022 Thiago Jung Bauermann <bauermann@kolabnow.com>
;;; Copyright © 2022 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2022 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2022 muradm <mail@muradm.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -1161,57 +1162,42 @@ security functionality including PGP, S/MIME, SSH, and SSL.")
(define-public mu (define-public mu
(package (package
(name "mu") (name "mu")
(version "1.6.11") (version "1.8.7")
(source (origin (source (origin
(method url-fetch) (method git-fetch)
(uri (string-append "https://github.com/djcb/mu/releases/" (uri (git-reference
"download/" version "/" (url "https://github.com/djcb/mu")
"mu-" version ".tar.xz")) (commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"13gchks9znyw0axw1wlks7f7h4442rfagmj7kx0jm3qhvi0b5sk0")))) "0yfbw234yqnqfnsn5bj1hqwpy78pkxn05vl18z8nvsqdmpzal4gx"))))
(build-system gnu-build-system) (build-system meson-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) (list pkg-config
("glib" ,glib "bin") ; for gtester emacs-minimal
("emacs" ,emacs-minimal) gnupg ; for tests
("tzdata" ,tzdata-for-tests))) ; for mu/test/test-mu-query.c texinfo))
(inputs (inputs
(list xapian guile-3.0 glib gmime)) (list glib gmime xapian))
(arguments (arguments
`(#:modules ((guix build gnu-build-system) `(#:modules ((guix build meson-build-system)
(guix build utils) (guix build emacs-utils)
(guix build emacs-utils)) (guix build utils))
#:imported-modules (,@%gnu-build-system-modules #:imported-modules (,@%meson-build-system-modules
(guix build emacs-utils)) (guix build emacs-utils))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'patch-configure (add-after 'unpack 'patch-bin-references
;; 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"
(("^ +lispdir=\"\\$\\{lispdir\\}/mu4e/\".*") ""))))
(add-after 'unpack 'patch-bin-sh-in-tests
(lambda _ (lambda _
(substitute* '("guile/tests/test-mu-guile.cc" (substitute* '("guile/tests/test-mu-guile.cc"
"mu/test-mu-cmd.cc" "mu/tests/test-mu-cmd.cc"
"mu/test-mu-cmd-cfind.cc" "mu/tests/test-mu-cmd-cfind.cc"
"mu/test-mu-query.cc") "mu/tests/test-mu-query.cc")
(("/bin/sh") (which "sh"))))) (("/bin/sh") (which "sh")))
(add-before 'install 'fix-ffi (substitute* '("lib/tests/bench-indexer.cc"
(lambda* (#:key outputs #:allow-other-keys) "lib/utils/mu-utils.cc")
(substitute* "guile/mu.scm" (("/bin/rm") (which "rm")))))
(("\"libguile-mu\"")
(format #f "\"~a/lib/libguile-mu\""
(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"
(search-input-directory inputs "share/zoneinfo"))))
(add-after 'install 'install-emacs-autoloads (add-after 'install 'install-emacs-autoloads
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(emacs-generate-autoloads (emacs-generate-autoloads