mirror of
https://codeberg.org/guix/guix.git
synced 2026-05-13 06:53:44 +00:00
gnu: neomutt: Improve style.
* gnu/packages/mail.scm (neomutt)[arguments]: Update to modern style. Change-Id: Ic2a5e2dab7c2d87b0bd54e6988d8193d0788db2d Reviewed-by: Simon Tournier <zimon.toutoune@gmail.com>
This commit is contained in:
committed by
Nguyễn Gia Phong
parent
7d28d73461
commit
1601f1cf95
@@ -802,7 +802,6 @@ operating systems.")
|
||||
("docbook-xml" ,docbook-xml-4.2)
|
||||
("w3m" ,w3m)
|
||||
("tcl" ,tcl)
|
||||
|
||||
;; Test file data for the unit tests included in the neomutt source.
|
||||
("neomutt-test-files"
|
||||
,(let ((commit "8629adab700a75c54e8e28bf05ad092503a98f75"))
|
||||
@@ -816,10 +815,10 @@ operating systems.")
|
||||
(base32
|
||||
"1ci04nqkab9mh60zzm66sd6mhsr6lya8wp92njpbvafc86vvwdlr")))))))
|
||||
(arguments
|
||||
`(#:test-target "test"
|
||||
(list
|
||||
#:test-target "test"
|
||||
#:configure-flags
|
||||
(list "--gpgme"
|
||||
|
||||
#~(list "--gpgme"
|
||||
;; Database, implies header caching.
|
||||
"--disable-tokyocabinet"
|
||||
"--disable-qdbm"
|
||||
@@ -833,12 +832,12 @@ operating systems.")
|
||||
"--ssl=1"
|
||||
"--sasl"
|
||||
(string-append "--with-sasl="
|
||||
(assoc-ref %build-inputs "cyrus-sasl"))
|
||||
#$(this-package-input "cyrus-sasl"))
|
||||
|
||||
"--smime"
|
||||
"--notmuch"
|
||||
(string-append "--with-notmuch="
|
||||
(assoc-ref %build-inputs "notmuch"))
|
||||
#$(this-package-input "notmuch"))
|
||||
|
||||
"--idn2"
|
||||
|
||||
@@ -846,14 +845,12 @@ operating systems.")
|
||||
;; whether the path exists, which it does not
|
||||
;; in the chroot.
|
||||
"--with-mailpath=/var/mail"
|
||||
|
||||
(string-append "--with-ncurses="
|
||||
(assoc-ref %build-inputs "ncurses"))
|
||||
(string-append "--prefix="
|
||||
(assoc-ref %outputs "out"))
|
||||
#$(this-package-input "ncurses"))
|
||||
(string-append "--prefix=" #$output)
|
||||
"--zstd=1")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
#~(modify-phases %standard-phases
|
||||
;; TODO: autosetup is meant to be included in the source,
|
||||
;; but we should package autosetup and use our own version of it.
|
||||
(replace 'configure
|
||||
@@ -867,9 +864,12 @@ operating systems.")
|
||||
(string-append (getcwd) "/configure")
|
||||
flags))))
|
||||
(add-before 'check 'prepare-test-files
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(copy-recursively (assoc-ref inputs "neomutt-test-files") "tests")
|
||||
;; FIXME: investigate why tests are failing, Nix is also disabling one
|
||||
(lambda _
|
||||
(copy-recursively
|
||||
#$(this-package-native-input "neomutt-test-files")
|
||||
"tests")
|
||||
;; FIXME: investigate why tests are failing, Nix also disables
|
||||
;; (a different) one: test_expando_node_padding.
|
||||
(substitute* "test/main.c"
|
||||
(("NEOMUTT_TEST_ITEM\\(test_expando_filter\\)") "")
|
||||
(("NEOMUTT_TEST_ITEM\\(test_mutt_sig_exit_handler\\)") "")
|
||||
|
||||
Reference in New Issue
Block a user