From patchwork Sat Feb 25 18:58:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 47310 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 66DF116B42; Sat, 25 Feb 2023 18:59:48 +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 1911D16AF4 for ; Sat, 25 Feb 2023 18:59:47 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVzlL-0001uw-O6; Sat, 25 Feb 2023 13:59:15 -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 1pVzlG-0001t5-1R for guix-patches@gnu.org; Sat, 25 Feb 2023 13:59:10 -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 1pVzlF-0000dC-PS for guix-patches@gnu.org; Sat, 25 Feb 2023 13:59:09 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pVzlF-0007yQ-MW for guix-patches@gnu.org; Sat, 25 Feb 2023 13:59:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61789] [PATCH 26/27] services: dict: Deprecate 'dicod-service' procedure. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 25 Feb 2023 18:59:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61789 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61789@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 61789-submit@debbugs.gnu.org id=B61789.167735154930637 (code B ref 61789); Sat, 25 Feb 2023 18:59:09 +0000 Received: (at 61789) by debbugs.gnu.org; 25 Feb 2023 18:59:09 +0000 Received: from localhost ([127.0.0.1]:41487 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVzlE-0007xy-Bj for submit@debbugs.gnu.org; Sat, 25 Feb 2023 13:59:08 -0500 Received: from smtpm7.myservices.hosting ([185.26.105.208]:59346) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVzkk-0007uN-3o for 61789@debbugs.gnu.org; Sat, 25 Feb 2023 13:58:38 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm7.myservices.hosting (Postfix) with ESMTP id 3D9C620D3E for <61789@debbugs.gnu.org>; Sat, 25 Feb 2023 19:58:26 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id E3C858009A; Sat, 25 Feb 2023 19:58:26 +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 MyvPg2O1l0fi; Sat, 25 Feb 2023 19:58:26 +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 11C068009D; Sat, 25 Feb 2023 19:58:25 +0100 (CET) From: Bruno Victal Date: Sat, 25 Feb 2023 18:58:12 +0000 Message-Id: <78a98543d37badae1619ffd46b47f1e866606fd1.1677350250.git.mirai@makinata.eu> X-Mailer: git-send-email 2.39.1 In-Reply-To: References: MIME-Version: 1.0 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 | 17 ++--------------- gnu/services/dict.scm | 6 ++++-- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 7aa9f3a5e8..a40d88455b 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -37814,19 +37814,6 @@ Miscellaneous Services 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 - @deftp {Data Type} dicod-configuration Data type representing the configuration of dicod. @@ -37890,10 +37877,10 @@ Miscellaneous Services Dictionary of English using the @code{gcide} package. @end defvar -The following is an example @code{dicod-service} configuration. +The following is an example @code{dicod-service-type} configuration. @lisp -(dicod-service #:config +(service dicod-service-type (dicod-configuration (handlers (list (dicod-handler (name "wordnet") 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}).