me
/
guix
Archived
1
0
Fork 0
Code

gnu: mu: Update to 1.6.2. 

* gnu/packages/mail.scm (mu): Update to 1.6.2.
[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.
Pierre Langlois 2021-07-27 21:09:49 +01:00
parent 1ac96992fb
commit b0a6b1f13c
No known key found for this signature in database
GPG Key ID: A8FC9E447F4F7D54
1 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
gnu/packages/mail.scm
View File

@ -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.2")
(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"))))
"0jlpkx1486ac8649jc2kxjklzsfaxj9qf2kji4kszy4axd0iwi1p"))))
(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