summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Victal <mirai@makinata.eu>2023-03-05 00:48:23 +0000
committerLudovic Courtès <ludo@gnu.org>2023-03-17 23:20:36 +0100
commit20aa4c30fbfdb72c25d267fe36299f02e3e202e2 (patch)
tree9f853079f86f34ba3830a6a83dbfa2912a8125e3
parent511ae8325db0dfc7803d7b98d7e4d8f76774e8c5 (diff)
downloadguix-patches-20aa4c30fbfdb72c25d267fe36299f02e3e202e2.tar
guix-patches-20aa4c30fbfdb72c25d267fe36299f02e3e202e2.tar.gz
services: dict: Deprecate 'dicod-service' procedure.
* doc/guix.texi (Miscellaneous Services): Remove 'dicod-service' mention. * gnu/services/dict.scm (dicod-service): Deprecate procedure. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
-rw-r--r--doc/guix.texi46
-rw-r--r--gnu/services/dict.scm6
2 files changed, 24 insertions, 28 deletions
diff --git a/doc/guix.texi b/doc/guix.texi
index edf410d024..fa9ea5a6ec 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -37850,25 +37850,17 @@ If true, this must be the name of a file to log messages to.
@subsubheading Dictionary Service
@cindex dictionary
+
The @code{(gnu services dict)} module provides the following service:
@defvar dicod-service-type
This is the type of the service that runs the @command{dicod} daemon, an
implementation of DICT server (@pxref{Dicod,,, dico, GNU Dico Manual}).
-@end defvar
-
-@deffn {Scheme Procedure} dicod-service [#:config (dicod-configuration)]
-Return a service that runs the @command{dicod} daemon, an implementation
-of DICT server (@pxref{Dicod,,, dico, GNU Dico Manual}).
-
-The optional @var{config} argument specifies the configuration for
-@command{dicod}, which should be a @code{<dicod-configuration>} object, by
-default it serves the GNU Collaborative International Dictionary of English.
You can add @command{open localhost} to your @file{~/.dico} file to make
@code{localhost} the default server for @command{dico} client
(@pxref{Initialization File,,, dico, GNU Dico Manual}).
-@end deffn
+@end defvar
@deftp {Data Type} dicod-configuration
Data type representing the configuration of dicod.
@@ -37933,22 +37925,24 @@ A @code{<dicod-database>} object serving the GNU Collaborative International
Dictionary of English using the @code{gcide} package.
@end defvar
-The following is an example @code{dicod-service} configuration.
-
-@lisp
-(dicod-service #:config
- (dicod-configuration
- (handlers (list (dicod-handler
- (name "wordnet")
- (module "dictorg")
- (options
- (list #~(string-append "dbdir=" #$wordnet))))))
- (databases (list (dicod-database
- (name "wordnet")
- (complex? #t)
- (handler "wordnet")
- (options '("database=wn")))
- %dicod-database:gcide))))
+The following is an example @code{dicod-service-type} configuration.
+
+@lisp
+(service dicod-service-type
+ (dicod-configuration
+ (handlers (list
+ (dicod-handler
+ (name "wordnet")
+ (module "dictorg")
+ (options
+ (list #~(string-append "dbdir=" #$wordnet))))))
+ (databases (list
+ (dicod-database
+ (name "wordnet")
+ (complex? #t)
+ (handler "wordnet")
+ (options '("database=wn")))
+ %dicod-database:gcide))))
@end lisp
@cindex Docker
diff --git a/gnu/services/dict.scm b/gnu/services/dict.scm
index 35253a0077..5a61085316 100644
--- a/gnu/services/dict.scm
+++ b/gnu/services/dict.scm
@@ -19,6 +19,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu services dict)
+ #:use-module (guix deprecation)
#:use-module (guix gexp)
#:use-module (guix records)
#:use-module (guix modules)
@@ -34,7 +35,7 @@
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-26)
#:use-module (ice-9 match)
- #:export (dicod-service
+ #:export (dicod-service ; deprecated
dicod-service-type
dicod-configuration
dicod-handler
@@ -202,7 +203,8 @@ database {
implements the standard DICT protocol supported by clients such as
@command{dico} and GNOME Dictionary.")))
-(define* (dicod-service #:key (config (dicod-configuration)))
+(define-deprecated (dicod-service #:key (config (dicod-configuration)))
+ dicod-service-type
"Return a service that runs the @command{dicod} daemon, an implementation
of DICT server (@pxref{Dicod,,, dico, GNU Dico Manual}).