diff options
author | Mark H Weaver <mhw@netris.org> | 2014-09-11 18:26:28 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2014-09-11 18:26:28 -0400 |
commit | 66ea98e321e93b0806f6870d77dd4c00e7e720c0 (patch) | |
tree | 21778401485e3b8683bbc6a31769233c059683b1 /gnu/packages/mail.scm | |
parent | da5538ef44bfa74d3e435f9f557374eabba5dc1e (diff) | |
parent | 5dae0186dea1e72e73bf223161620cfeddef5a63 (diff) |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/image.scm
Diffstat (limited to 'gnu/packages/mail.scm')
-rw-r--r-- | gnu/packages/mail.scm | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index a9e862ac88..2a742cdc56 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -31,7 +31,7 @@ #:use-module (gnu packages guile) #:use-module (gnu packages linux) #:use-module (gnu packages m4) - #:use-module (gnu packages mysql) + #:use-module (gnu packages databases) #:use-module (gnu packages ncurses) #:use-module (gnu packages openssl) #:use-module (gnu packages perl) @@ -43,7 +43,6 @@ #:use-module (gnu packages glib) #:use-module (gnu packages pkg-config) #:use-module (gnu packages flex) - #:use-module (gnu packages bdb) #:use-module (gnu packages gdb) #:use-module (gnu packages samba) #:use-module ((guix licenses) |