;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net>
;;; Copyright © 2014 Sou Bunnbu <iyzsong@gmail.com>
;;; Copyright © 2014 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
-;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
+;;; Copyright © 2015, 2016 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
;;; Copyright © 2016 Al McElrath <hello@yrns.org>
;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org>
+;;; Copyright © 2016 Alex Kost <alezost@gmail.com>
+;;; Copyright © 2016 Troy Sankey <sankeytms@gmail.com>
+;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
;;;
;;; This file is part of GNU Guix.
;;;
(sha256
(base32
"0szbqa12zqzldqyw97lxqax3ja2adis83i7brdfsxmrfw68iaf65"))
- (patches (list (search-patch "m4-gets-undeclared.patch")))))
+ (patches (search-patches "m4-gets-undeclared.patch"))))
(build-system gnu-build-system)
(arguments
'(;; TODO: Add `--with-sql'.
(define-public mutt
(package
(name "mutt")
- (version "1.5.24")
+ (version "1.6.2")
(source (origin
(method url-fetch)
(uri (string-append "ftp://ftp.mutt.org/pub/mutt/mutt-"
version ".tar.gz"))
(sha256
(base32
- "0012njrgxf1barjksqkx7ccid2l0xyikhna9mjs9vcfpbrvcm4m2"))
- (patches (list (search-patch "mutt-store-references.patch")))))
+ "13hxmji7v9m2agmvzrs7gzx8s3c9jiwrv7pbkr7z1kc6ckq2xl65"))
+ (patches (search-patches "mutt-store-references.patch"))))
(build-system gnu-build-system)
(inputs
`(("cyrus-sasl" ,cyrus-sasl)
+ ("gdbm" ,gdbm)
("gpgme" ,gpgme)
("ncurses" ,ncurses)
("openssl" ,openssl)
"--enable-imap"
"--enable-pop"
"--enable-gpgme"
+ "--enable-hcache" ; for header caching
"--with-ssl"
"--with-sasl"
;; so that mutt does not check whether the path
'unpack 'patch-paths-in-tests
(lambda _
;; The test programs run several programs using 'system' with
- ;; hard-coded paths. Here we patch them all. We also change "gpg"
- ;; to "gpg2". We use ISO-8859-1 here because test-iconv.c contains
+ ;; hard-coded paths. Here we patch them all.
+ ;; We use ISO-8859-1 here because test-iconv.c contains
;; raw byte sequences in several different encodings.
(with-fluids ((%default-port-encoding #f))
(substitute* (find-files "tests" "\\.c$")
(("(system *\\(\")(/[^ ]*)" all pre prog-path)
(let* ((base (basename prog-path))
- (prog (which (if (string=? base "gpg") "gpg2" base))))
+ (prog (which base)))
(string-append pre
(or prog (error "not found: " base))))))))))))
(home-page "http://spruce.sourceforge.net/gmime/")
(define-public offlineimap
(package
(name "offlineimap")
- (version "6.7.0")
+ (version "7.0.0")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/OfflineIMAP/offlineimap/"
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "0462mal2fxvavxhwjk1a6vsnspx07yniifa687dwg46aplqznin4"))))
+ "0hnyfby6ib7i7yblg7qpabdyl35n9l3n0a6agk47w1crpn2lsric"))))
(build-system python-build-system)
- (native-inputs `(("python" ,python-2)))
+ (inputs `(("python2-pysqlite" ,python2-pysqlite)
+ ("python2-six" ,python2-six)))
(arguments
;; The setup.py script expects python-2.
`(#:python ,python-2
;; Tests require a modifiable IMAP account.
- #:tests? #f))
+ #:tests? #f
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'install 'wrap-binary
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (bin (string-append out "/bin/offlineimap")))
+ (wrap-program bin
+ `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH"))))
+ #t))))))
(home-page "http://www.offlineimap.org")
(synopsis "Sync emails between two repositories")
(description
repository and Maildir/IMAP as LOCAL repository.")
(license gpl2+)))
-(define %mu-gtester-patch
- ;; Ensure tests have unique names, to placate GLib 2.6's gtester.
- (origin
- (method url-fetch)
- (uri "https://github.com/djcb/mu/commit/b44039ed.patch")
- (sha256
- (base32
- "165hryqqhx3wah8a4f5jaq465azx1pm9r4jid7880pys9gd88qlv"))))
-
(define-public mu
(package
(name "mu")
- (version "0.9.13")
+ (version "0.9.16")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/djcb/mu/archive/v"
(file-name (string-append "mu-" version ".tar.gz"))
(sha256
(base32
- "0wj33pma8xgjvn2akk7khzbycwn4c9sshxvzdph9dnpy7gyqxj51"))
- (patches (list %mu-gtester-patch))))
+ "0p7hqri1r1x6750x138cc29mh81kdav2dcim26y58s8an206h25g"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
("glib" ,glib "bin") ; for gtester
("autoconf" ,autoconf)
("automake" ,automake)
+ ("emacs" ,emacs-minimal)
("libtool" ,libtool)
("texinfo" ,texinfo)))
;; TODO: Add webkit and gtk to build the mug GUI.
(inputs
`(("xapian" ,xapian)
- ("emacs" ,emacs-no-x)
("guile" ,guile-2.0)
("glib" ,glib)
("gmime" ,gmime)
("tzdata" ,tzdata))) ;for mu/test/test-mu-query.c
(arguments
- '(#:phases (alist-cons-after
- 'unpack 'autoreconf
- (lambda _
- (zero? (system* "autoreconf" "-vi")))
- (alist-cons-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")))
- %standard-phases))))
+ `(#:modules ((guix build gnu-build-system)
+ (guix build utils)
+ (guix build emacs-utils))
+ #:imported-modules (,@%gnu-build-system-modules
+ (guix build emacs-utils))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-configure.ac
+ ;; 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.ac"
+ (("^ +lispdir=.*") ""))
+ #t))
+ (add-after 'patch-configure.ac 'autoreconf
+ (lambda _
+ (zero? (system* "autoreconf" "-vi"))))
+ (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))
+ (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)))))
(home-page "http://www.djcbsoftware.nl/code/mu/")
(synopsis "Quickly find emails")
(description
attachments, create new maildirs, and so on.")
(license gpl3+)))
+(define-public alot
+ (package
+ (name "alot")
+ (version "0.3.7")
+ (source (origin
+ (method url-fetch)
+ ; v0.3.7 not on PyPi yet, so use github instead
+ (uri (string-append "https://github.com/pazz/alot/archive/"
+ version ".tar.gz"))
+ (file-name (string-append "alot-" version ".tar.gz"))
+ (sha256
+ (base32
+ "09md9llg38r6xby8l0y0zf8nhlh91cr4xs0r15b294hhp8hl2bgx"))))
+ (build-system python-build-system)
+ (arguments
+ `(#:tests? #f ; no tests
+ ; python 3 is unsupported, more info:
+ ; https://github.com/pazz/alot/blob/0.3.7/docs/source/faq.rst
+ #:python ,python-2))
+ (inputs
+ `(("python2-magic" ,python2-magic)
+ ("python2-configobj" ,python2-configobj)
+ ("python2-twisted" ,python2-twisted)
+ ("python2-urwid" ,python2-urwid)
+ ("python2-urwidtrees" ,python2-urwidtrees)
+ ("python2-pygpgme" ,python2-pygpgme)
+ ("python2-notmuch" ,python2-notmuch)))
+ (home-page "https://github.com/pazz/alot")
+ (synopsis "Commandline MUA using notmuch")
+ (description
+ "Alot is an experimental terminal mail user agent (MUA) based on
+@code{notmuch} mail. It is written in Python using the @code{urwid} toolkit.")
+ (license gpl3+)))
+
(define-public notmuch
(package
(name "notmuch")
(define-public getmail
(package
(name "getmail")
- (version "4.48.0")
+ (version "4.49.0")
(source
(origin
(method url-fetch)
name "-" version ".tar.gz"))
(sha256
(base32
- "0k5rm5kag14izng2ajcagvli9sns5mzvkyfa65ri4xymxs91wi29"))))
+ "1m0yzxd05fklwbmjj1n2q4sx397c1j5qi9a0r5fv3h8pplz4lv0w"))))
(build-system python-build-system)
(arguments
`(#:tests? #f ; no tests
(define-public libetpan
(package
(name "libetpan")
- (version "1.6")
+ (version "1.7.2")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/dinhviethoa/" name
"/archive/" version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "05qyqx2c1ppb1jnrs3m52i60f9xlxfxdmb9dnwg4vqjv8kwv2qkr"))))
+ (base32 "081ixgj3skglq9i7v0jb835lmfx21zi4i5b7997igwr0lj174y9j"))))
(build-system gnu-build-system)
(native-inputs `(("autoconf" ,(autoconf-wrapper))
("automake" ,automake)
("openssl" ,openssl)))
(inputs
`(("curl" ,curl)
- ("expat" ,expat)))
+ ("expat" ,expat)
+ ("zlib" ,zlib)))
(arguments
'(#:phases (alist-cons-after
'unpack 'autogen
("libsm" ,libsm)
("libxml2" ,libxml2)
("perl" ,perl)
- ("python-2" ,python-2)))
+ ("python-2" ,python-2)
+ ("mime-info" ,shared-mime-info)))
(arguments
'(#:configure-flags
- '("--enable-gnutls" "--enable-pgpmime-plugin" "--enable-enchant")))
+ '("--enable-gnutls" "--enable-pgpmime-plugin" "--enable-enchant")
+ #:phases (modify-phases %standard-phases
+ (add-before 'build 'patch-mime
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/procmime.c"
+ (("/usr/share/mime/globs")
+ (string-append (assoc-ref inputs "mime-info")
+ "/share/mime/globs"))))))))
(synopsis "GTK-based Email client")
(description
"Claws-Mail is an email client (and news reader) based on GTK+. The
(define-public msmtp
(package
(name "msmtp")
- (version "1.6.3")
+ (version "1.6.5")
(source
(origin
(method url-fetch)
- (uri (string-append
- "mirror://sourceforge/msmtp/msmtp-" version ".tar.xz"))
- (sha256 (base32
- "0mbkflxv2swjz4185inis83v6pxcblpmapwjhgpc6wh7kh3bx0pr"))))
+ (uri (string-append "mirror://sourceforge/msmtp/msmtp/" version
+ "/msmtp-" version ".tar.xz"))
+ (sha256
+ (base32
+ "01jh9ba49bih8zsh40myw6qq1ll210q1vw0jg865vrn7jc3dd83n"))))
(build-system gnu-build-system)
(inputs
`(("libidn" ,libidn)
(define-public exim
(package
(name "exim")
- (version "4.86.2")
+ (version "4.87")
(source
(origin
(method url-fetch)
version ".tar.bz2")))
(sha256
(base32
- "1cvfcc1hi60lydv8h3a2rxlfc0v2nflwpvzjj7h7cdsqs2pxwmkp"))))
+ "1jbxn13shq90kpn0s73qpjnx5xm8jrpwhcwwgqw5s6sdzw6iwsbl"))))
(build-system gnu-build-system)
(inputs
`(("bdb" ,bdb)
("gzip" ,gzip)
("bzip2" ,bzip2)
("xz" ,xz)
- ("pcre" ,pcre)
("perl" ,perl)
("libxt" ,libxt)
("libxaw" ,libxaw)))
(native-inputs
- `(("perl" ,perl)))
+ `(("pcre" ,pcre "bin")
+ ("perl" ,perl)))
(arguments
'(#:phases
(alist-replace
(define-public dovecot
(package
(name "dovecot")
- (version "2.2.19")
+ (version "2.2.25")
(source
(origin
(method url-fetch)
(version-major+minor version) "/"
name "-" version ".tar.gz"))
(sha256 (base32
- "17sf5aancad4pg1vx1606k99389wg76blpqzmnmxlz4hklzix7km"))))
+ "0rwn5wc5b8j9fzqcjggdgpzmb77myrf4ra294z1gg5v3hhng7nfq"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
;; The following patch fixes an ambiguous definition of
;; getline() in formail.c. The patch is provided by Debian as
;; patch 24.
- (patches
- (list
- (search-patch "procmail-ambiguous-getline-debian.patch")))))
+ (patches (search-patches "procmail-ambiguous-getline-debian.patch"
+ "procmail-CVE-2014-3618.patch"))))
(arguments
`(#:phases (modify-phases %standard-phases
(replace 'configure
;; filesystem are performed during 'make install'. However, these
;; are performed before the actual build process.
(build-system gnu-build-system)
- (inputs `(("glibc" ,glibc)
- ("exim" ,exim)))
+ (inputs `(("exim" ,exim)))
(home-page "http://www.procmail.org/")
(synopsis "Versatile mail delivery agent (MDA)")
(description "Procmail is a mail delivery agent (MDA) featuring support
(define-public khard
(package
(name "khard")
- (version "0.8.1")
+ (version "0.9.0")
(source (origin
(method url-fetch)
(uri (pypi-uri name version))
(sha256
(base32
- "098gs94qmnspdfn6ar8lycx7dbsz9bcff90aps0cmn47mw7llch0"))))
+ "0y83rji4f270hbb41m4jpr0z3yzvpvbsl32mpg9d38hlydw8fk1s"))))
(build-system python-build-system)
(arguments
`(#:python ,python-2 ; only python-2 is supported.
HCoop / jackhill / guix / guix.git / blobdiff