summary refs log tree commit diff
path: root/gnu
diff options
context:
space:
mode:
authorMarius Bakke <marius@gnu.org>2020-11-27 13:56:38 +0100
committerMarius Bakke <marius@gnu.org>2020-11-28 19:51:40 +0100
commit89b704a456ef1cdef855a6c483832a05e1117f24 (patch)
tree9adb3ad993a05c4283edb7af9c8a4c8c43f958db /gnu
parentf4d139d02f0b0404540b74f3249de050b519b880 (diff)
downloadguix-89b704a456ef1cdef855a6c483832a05e1117f24.tar.gz
services: MySQL: Deprecate 'mysql-service'.
* gnu/services/databases.scm (mysql-service): Define in terms of DEFINE-DEPRECATED.
* gnu/tests/databases.scm (%mysql-os): Adjust accordingly.
* doc/guix.texi (Database Services): Adjust the MariaDB/MySQL section to
document MYSQL-SERVICE-TYPE instead of MYSQL-SERVICE.  While at it, document
the EXTRA-CONTENT field.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/services/databases.scm8
-rw-r--r--gnu/tests/databases.scm2
2 files changed, 3 insertions, 7 deletions
diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm
index d7b4594b9e..bb0a0c28f2 100644
--- a/gnu/services/databases.scm
+++ b/gnu/services/databases.scm
@@ -568,12 +568,8 @@ FLUSH PRIVILEGES;
                              mysql-shepherd-service)))
    (default-value (mysql-configuration))))
 
-(define* (mysql-service #:key (config (mysql-configuration)))
-  "Return a service that runs @command{mysqld}, the MySQL or MariaDB
-database server.
-
-The optional @var{config} argument specifies the configuration for
-@command{mysqld}, which should be a @code{<mysql-configuration>} object."
+(define-deprecated (mysql-service #:key (config (mysql-configuration)))
+  mysql-service-type
   (service mysql-service-type config))
 
 
diff --git a/gnu/tests/databases.scm b/gnu/tests/databases.scm
index d3045cc3f7..1d7f53ec3e 100644
--- a/gnu/tests/databases.scm
+++ b/gnu/tests/databases.scm
@@ -271,7 +271,7 @@
 
 (define %mysql-os
   (simple-operating-system
-   (mysql-service)))
+   (service mysql-service-type)))
 
 (define* (run-mysql-test)
   "Run tests in %MYSQL-OS."