diff options
| author | Leo Famulari <leo@famulari.name> | 2016-07-22 18:57:40 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2016-07-22 18:58:31 -0400 |
| commit | d227260d2f7833b6bdc55b8e3792378626ef3b69 (patch) | |
| tree | 26d47d5d8ee8efb102323bca215429a8f8fe1095 /gnu/services/databases.scm | |
| parent | d778fa5ff6f4a860919eaf13db3f84cfc68cbee8 (diff) | |
| parent | 26ad4adb5568c6ff370f446431b079520fb09615 (diff) | |
| download | guix-patches-d227260d2f7833b6bdc55b8e3792378626ef3b69.tar guix-patches-d227260d2f7833b6bdc55b8e3792378626ef3b69.tar.gz | |
Merge branch 'master' into core-updates
Resolved conflicts:
* gnu/packages/scheme.scm: Conflict in import of (guix licenses). On master,
"#:hide (openssl)" was used. On core-updates, "#:select (some licenses)" was
used. The latter won the conflict.
* gnu/packages/version-control.scm (git)[arguments]: Whitespace conflict
in 'install-shell-completion.
Diffstat (limited to 'gnu/services/databases.scm')
| -rw-r--r-- | gnu/services/databases.scm | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm index e136d1e00b..86847f8c50 100644 --- a/gnu/services/databases.scm +++ b/gnu/services/databases.scm @@ -27,9 +27,15 @@ #:use-module (guix records) #:use-module (guix gexp) #:use-module (ice-9 match) - #:export (postgresql-service + #:export (postgresql-configuration + postgresql-configuration? + postgresql-service + postgresql-service-type + mysql-service - mysql-configuration)) + mysql-service-type + mysql-configuration + mysql-configuration?)) ;;; Commentary: ;;; |