From patchwork Sun Mar 5 00:48:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 47667 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 11D1416BD9; Sun, 5 Mar 2023 00:49:24 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CDC2B16A6A for ; Sun, 5 Mar 2023 00:49:21 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pYcYl-0003M8-ND; Sat, 04 Mar 2023 19:49:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pYcYh-0003Lf-Tn for guix-patches@gnu.org; Sat, 04 Mar 2023 19:49:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pYcYg-0002y9-IL; Sat, 04 Mar 2023 19:49:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pYcYg-0002h0-0r; Sat, 04 Mar 2023 19:49:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61972] [PATCH] services: dict: Deprecate 'dicod-service' procedure. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: ludo@gnu.org, guix-patches@gnu.org Resent-Date: Sun, 05 Mar 2023 00:49:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 61972 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61972@debbugs.gnu.org Cc: Bruno Victal , ludo@gnu.org X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: ludo@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167797732310323 (code B ref -1); Sun, 05 Mar 2023 00:49:01 +0000 Received: (at submit) by debbugs.gnu.org; 5 Mar 2023 00:48:43 +0000 Received: from localhost ([127.0.0.1]:38083 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pYcYN-0002gQ-2t for submit@debbugs.gnu.org; Sat, 04 Mar 2023 19:48:43 -0500 Received: from lists.gnu.org ([209.51.188.17]:47870) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pYcYM-0002gK-2W for submit@debbugs.gnu.org; Sat, 04 Mar 2023 19:48:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pYcYL-0003CA-Qj for guix-patches@gnu.org; Sat, 04 Mar 2023 19:48:41 -0500 Received: from smtpmciv3.myservices.hosting ([185.26.107.239]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pYcYJ-0002wC-5n for guix-patches@gnu.org; Sat, 04 Mar 2023 19:48:41 -0500 Received: from smtpmciv7.myservices.hosting (smtpmciv7.myservices.hosting [185.26.106.202]) by smtpmciv3.myservices.hosting (Postfix) with ESMTP id 9BFEA205C7 for ; Sun, 5 Mar 2023 01:48:36 +0100 (CET) Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv7.myservices.hosting (Postfix) with ESMTP id 5C93E2084B for ; Sun, 5 Mar 2023 01:48:36 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 0CC3A80097; Sun, 5 Mar 2023 01:48:36 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id PJdgJZ02WTms; Sun, 5 Mar 2023 01:48:34 +0100 (CET) Received: from guix-nuc.home.arpa (bl9-119-177.dsl.telepac.pt [85.242.119.177]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id A149C80079; Sun, 5 Mar 2023 01:48:34 +0100 (CET) From: Bruno Victal Date: Sun, 5 Mar 2023 00:48:23 +0000 Message-Id: <8743d00e54840d6afde42b5080f9c19bfcdde96a.1677977220.git.mirai@makinata.eu> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Received-SPF: pass client-ip=185.26.107.239; envelope-from=mirai@makinata.eu; helo=smtpmciv3.myservices.hosting X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * doc/guix.texi (Miscellaneous Services): Remove 'dicod-service' mention. * gnu/services/dict.scm (dicod-service): Deprecate procedure. --- doc/guix.texi | 48 +++++++++++++++++++------------------------ gnu/services/dict.scm | 6 ++++-- 2 files changed, 25 insertions(+), 29 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 74658dbc86..98a8b42fcf 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -37826,27 +37826,19 @@ Miscellaneous Services @end table @end deftp -@subsubheading Dictionary Service @cindex dictionary +@subsubheading Dictionary Service + 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{} 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. @@ -37911,22 +37903,24 @@ Miscellaneous Services 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 . (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 @@ (define-module (gnu services dict) #: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 @@ (define dicod-service-type 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}).