From patchwork Fri May 13 21:46:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 39251 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 78C7C27BBEA; Fri, 13 May 2022 22:48:55 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 01AA527BBE9 for ; Fri, 13 May 2022 22:48:55 +0100 (BST) Received: from localhost ([::1]:39330 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1npd9Y-0004bN-9h for patchwork@mira.cbaines.net; Fri, 13 May 2022 17:48:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41824) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1npd8k-0004ZF-J1 for guix-patches@gnu.org; Fri, 13 May 2022 17:48:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51335) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1npd8k-0005wm-Ab for guix-patches@gnu.org; Fri, 13 May 2022 17:48:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1npd8k-0004yk-8i for guix-patches@gnu.org; Fri, 13 May 2022 17:48:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55404] [PATCH 1/2] services: Add more description fields. References: <20220513214318.27355-1-ludo@gnu.org> In-Reply-To: <20220513214318.27355-1-ludo@gnu.org> Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 13 May 2022 21:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55404 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55404@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 55404-submit@debbugs.gnu.org id=B55404.165247842318905 (code B ref 55404); Fri, 13 May 2022 21:48:02 +0000 Received: (at 55404) by debbugs.gnu.org; 13 May 2022 21:47:03 +0000 Received: from localhost ([127.0.0.1]:45224 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1npd7i-0004uP-Ae for submit@debbugs.gnu.org; Fri, 13 May 2022 17:47:03 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48336) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1npd7h-0004u4-7y for 55404@debbugs.gnu.org; Fri, 13 May 2022 17:46:57 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:44016) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1npd7b-0005qM-VJ; Fri, 13 May 2022 17:46:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=WAT5hNbRvaJVm9pr+7ptR2OwfSqUSlkuelFTMojVh7Y=; b=Jjdiix0xPQLgNH xyn2nnQch5+K7WvPzOb2SniF5LXxuel61Qco4hqNrw2v4UwDIZ910rjwMAhEUvoDOinmniOTjDIn2 ez6mOwrYowgc+7XzHbqwWEhx3MxZQux/zTnZKFo8364KgQAHieY1qwiCIbMC1eoIf3ZHB91F1IGpl ROLVyuhLLMcTsvOFZAtVHx65EZltIRNv1ZDm38m9oIz/gpQ4gCOolJu/7oKOIzXz+yFWwWByQK8p7 x1LLj1g5MwExIvOZWHpBWfkZ4whE51Hghufy/vuWgOc19L5Jir7dmaid8yxTSBA3MfXcO74cW/v/7 OHOqJWuMBGVV9tp0e+Rw==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:52847 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1npd7b-0004su-JH; Fri, 13 May 2022 17:46:51 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Fri, 13 May 2022 23:46:44 +0200 Message-Id: <20220513214645.27434-1-ludo@gnu.org> X-Mailer: git-send-email 2.36.0 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" X-getmail-retrieved-from-mailbox: Patches * gnu/services.scm (simple-service): Add 'description' field. * gnu/services/base.scm (udev-rules-service): Likewise. * gnu/system/install.scm (configuration-template-service-type): Likewise. * gnu/tests.scm (marionette-service-type): Likewise. --- gnu/services.scm | 3 ++- gnu/services/base.scm | 3 ++- gnu/system/install.scm | 6 ++++-- gnu/tests.scm | 7 +++++-- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/gnu/services.scm b/gnu/services.scm index e3d4fcc232..234ee372b8 100644 --- a/gnu/services.scm +++ b/gnu/services.scm @@ -292,7 +292,8 @@ (define (simple-service name target value) singleton service type NAME, of which the returned service is an instance." (let* ((extension (service-extension target identity)) (type (service-type (name name) - (extensions (list extension))))) + (extensions (list extension)) + (description "This is a simple service.")))) (service type value))) (define-syntax %modify-service diff --git a/gnu/services/base.scm b/gnu/services/base.scm index bcec888587..3fb92e6da0 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -2191,7 +2191,8 @@ (define* (udev-rules-service name rules #:key (groups '())) (service-extension account-service-type account-extension) (service-extension - udev-service-type udev-extension)))))) + udev-service-type udev-extension))) + (description "This service adds udev rules.")))) (service type #f))) (define (swap-space->shepherd-service-name space) diff --git a/gnu/system/install.scm b/gnu/system/install.scm index 073d7df1db..2fbf08f676 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès +;;; Copyright © 2014-2022 Ludovic Courtès ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2016 Andreas Enge ;;; Copyright © 2017 Marius Bakke @@ -252,7 +252,9 @@ (define configuration-template-service-type (service-type (name 'configuration-template) (extensions (list (service-extension etc-service-type - /etc/configuration-files))))) + /etc/configuration-files))) + (description "Install the operating system configuration file +templates under @file{/etc/configuration}."))) (define %configuration-template-service (service configuration-template-service-type #t)) diff --git a/gnu/tests.scm b/gnu/tests.scm index 85f38ae8c9..ca677d315b 100644 --- a/gnu/tests.scm +++ b/gnu/tests.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016, 2017, 2018, 2019, 2020 Ludovic Courtès +;;; Copyright © 2016-2020, 2022 Ludovic Courtès ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; Copyright © 2021 Maxime Devos @@ -161,7 +161,10 @@ (define marionette-service-type (service-type (name 'marionette-repl) (extensions (list (service-extension shepherd-root-service-type - marionette-shepherd-service))))) + marionette-shepherd-service))) + (description "The @dfn{marionette} service allows a guest +system (virtual machine) to be manipulated by the host. It is used for system +tests."))) (define* (marionette-operating-system os #:key From patchwork Fri May 13 21:46:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 39252 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 4742527BBEA; Fri, 13 May 2022 22:52:40 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 06C1327BBE9 for ; Fri, 13 May 2022 22:52:40 +0100 (BST) Received: from localhost ([::1]:42196 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1npdDD-0006fP-5f for patchwork@mira.cbaines.net; Fri, 13 May 2022 17:52:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41826) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1npd8k-0004Zf-W9 for guix-patches@gnu.org; Fri, 13 May 2022 17:48:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51336) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1npd8k-0005wr-N0 for guix-patches@gnu.org; Fri, 13 May 2022 17:48:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1npd8k-0004yt-LM for guix-patches@gnu.org; Fri, 13 May 2022 17:48:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55404] [PATCH 2/2] services: Make 'description' field mandatory. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 13 May 2022 21:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55404 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55404@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 55404-submit@debbugs.gnu.org id=B55404.165247842418915 (code B ref 55404); Fri, 13 May 2022 21:48:02 +0000 Received: (at 55404) by debbugs.gnu.org; 13 May 2022 21:47:04 +0000 Received: from localhost ([127.0.0.1]:45227 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1npd7n-0004ur-Rw for submit@debbugs.gnu.org; Fri, 13 May 2022 17:47:04 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48342) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1npd7h-0004u5-Qp for 55404@debbugs.gnu.org; Fri, 13 May 2022 17:46:58 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:44018) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1npd7c-0005qX-I7; Fri, 13 May 2022 17:46:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=sj5trf8yoCz0ssK2CnzLB33ug1IWTpq8KfzEurOZmZU=; b=nKQfX3mYTsBpQiDTkOKC +BX7+cffcPFDcKB7AlkdEbL2HsxB9e+DROA/3d/kcwIWtOeOrVBNQ9aWKuRGD+VooB7i8MBYKQV47 iQjto+XUQGiCbZsmbCwZgCuMwaKTZCaA5FyQwM/iQt0rpgkZC14rgVriZNlooet0z9aM7HI86gF+d EqgA6G63UJBNC6odsXgt4ZZHNp2OAX4+ebJdFBrN5J5s9XYFnMvyDwRx6QF4FFensFFJ2sajFI1v8 4mv2CryuGTlJIx/w8NJyVP0xBm1zi1iGbX7LkVW5vRt1n1Y2F9OaT1Lvd52izbeIYh32TNksuhSrl r7ILlR1sz7bDwg==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:52847 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1npd7c-0004su-62; Fri, 13 May 2022 17:46:52 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Fri, 13 May 2022 23:46:45 +0200 Message-Id: <20220513214645.27434-2-ludo@gnu.org> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220513214645.27434-1-ludo@gnu.org> References: <20220513214645.27434-1-ludo@gnu.org> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/services.scm ()[description]: Remove default value. --- gnu/services.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/services.scm b/gnu/services.scm index 234ee372b8..6f0f4d5bdc 100644 --- a/gnu/services.scm +++ b/gnu/services.scm @@ -183,8 +183,7 @@ (define-record-type* service-type make-service-type (default &no-default-value)) ;; Meta-data. - (description service-type-description ;string - (default #f)) + (description service-type-description) ;string (location service-type-location ; (default (and=> (current-source-location) source-properties->location))