From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id ALLtGfacuWPwGAEAbAwnHQ (envelope-from ) for ; Sat, 07 Jan 2023 17:25:26 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id YK/WGfacuWNeHwAA9RJhRA (envelope-from ) for ; Sat, 07 Jan 2023 17:25:26 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id D56B319A6E for ; Sat, 7 Jan 2023 17:25:25 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pEC0G-00011d-13; Sat, 07 Jan 2023 11:25:04 -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 1pEC0E-0000zt-MC for guix-patches@gnu.org; Sat, 07 Jan 2023 11:25:02 -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 1pEC0E-0000Yl-Cn for guix-patches@gnu.org; Sat, 07 Jan 2023 11:25:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pEC0E-00072y-8V for guix-patches@gnu.org; Sat, 07 Jan 2023 11:25:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60630] [PATCH] guix: channels: Add description field. Resent-From: jgart Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 07 Jan 2023 16:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 60630 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60630@debbugs.gnu.org Cc: jgart X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167310870027075 (code B ref -1); Sat, 07 Jan 2023 16:25:02 +0000 Received: (at submit) by debbugs.gnu.org; 7 Jan 2023 16:25:00 +0000 Received: from localhost ([127.0.0.1]:58794 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pEC0B-00072b-Ii for submit@debbugs.gnu.org; Sat, 07 Jan 2023 11:24:59 -0500 Received: from lists.gnu.org ([209.51.188.17]:40614) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pEC0A-00072U-77 for submit@debbugs.gnu.org; Sat, 07 Jan 2023 11:24:58 -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 1pEC0A-0000z1-2i for guix-patches@gnu.org; Sat, 07 Jan 2023 11:24:58 -0500 Received: from mx2.dismail.de ([159.69.191.136]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pEC07-0000WA-EW for guix-patches@gnu.org; Sat, 07 Jan 2023 11:24:57 -0500 Received: from mx2.dismail.de (localhost [127.0.0.1]) by mx2.dismail.de (OpenSMTPD) with ESMTP id 330bd000 for ; Sat, 7 Jan 2023 17:24:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=dismail.de; h=from:to:cc :subject:date:message-id:mime-version:content-transfer-encoding; s=20190914; bh=0KQWm5P6S6nzAxgnltD08soZQEAEvQXH9wFu0Eld/Zs=; b= tKVtL1gymN6o7afOJG+Gz1XEShjCzvCOO62JByFH03ZRNpWMsOozCuBRxLVIaiIs ofmrklcpQTURgPP1bEjdgdruhi+4HWBzkGWavs0JF7Z1FeNE6Qb1Or+3qjNNWWRy 10Ylvk/Qf/T0KauDRjFyYFX5u6KukAzyql03X5A8RFq4XNKtPXuErtETNQI4nOIj gHos4nd8XsOyxLyXYSZYcjmlzKLWkBc7wyiIhY3r2aNs66zhPftON6O8p423h0vN KdC6BYSLFYOJMaaVEVIXhLIdRrtGNd5PYm5IFWJ8PUf6jlqCZL3/Xnq8l9TXh4D5 AsUw7RrWzlrYFbmS0HFxEw== Received: from smtp1.dismail.de ( [10.240.26.11]) by mx2.dismail.de (OpenSMTPD) with ESMTP id 627ddbfc for ; Sat, 7 Jan 2023 17:24:52 +0100 (CET) Received: from smtp1.dismail.de (localhost [127.0.0.1]) by smtp1.dismail.de (OpenSMTPD) with ESMTP id 76bb11ad for ; Sat, 7 Jan 2023 17:24:52 +0100 (CET) Received: by dismail.de (OpenSMTPD) with ESMTPSA id 916909e5 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 7 Jan 2023 17:24:46 +0100 (CET) Date: Sat, 7 Jan 2023 10:24:31 -0600 Message-Id: <20230107162431.6739-1-jgart@dismail.de> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=159.69.191.136; envelope-from=jgart@dismail.de; helo=mx2.dismail.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, 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: , Reply-to: jgart X-ACL-Warn: , jgart via Guix-patches From: jgart via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1673108726; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=m1mPv88byFAgX1kOf91UJ8YccIeAX9Y8EL/tfOn/o28=; b=PhN6XJDyZ18/F8Zcq+IFKIaoHuRdLk/MSIov5sQlckWZXDBb9Lhxpx7n+vx23SzXMjJI3r BCUte6Ls5EFhO2Vm4LkMVXJS8gnsU/OoQdeldsIFV03bUD0T5Ep4AjjcwKwsrp0FWvIy1L VCUgnwen1aU0XiOnCYGTwUbeMaISks7CcnSfY15xNwmLJsV8ipbjyGHFVx2KmkNO4ogsNo ShmP8BT2YFX1XUmhoqyiG+illKopSihCR1nIdWCDX9GuI73vMoH+3D7pjP2sN9SodTH2uY h1Xq7ytXvYDCXcCs9+E44Jb709CgqNxH09f2MY6IdpyfXu/hsA0C1gNDM4mT8A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=dismail.de header.s=20190914 header.b=tKVtL1gy; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1673108726; a=rsa-sha256; cv=none; b=HNq9Uj3tG4G4uXksIzL96k0noBEw+ZB+zUYCHvk6RvHSeY96PncE5yIzPZUy36/PPR2Hk5 EYP0rivZTfvEzebc9tRBtH8wyiHoR0Y1qsHgTcASpf6CxDZWy0WbAuNYPspmJX2/pFfEpy RyKgpEWJwwiD8FeXCmvxoyzRBwPS/ULiqHAuU7hHcDGbawzCGcNm9INglHR4l/1Nb2Cxvp +RjdTGMXrrkbSjP1577LoiCtYa+C5jXYE/jST1qQjnSY7zaws3Klbu0VLD3T4PqVo0aGAn 0a+QR2RpfbByyS1HBTwP3b2wvJRsDfNs8UjTDP+UZh9Bluzw0ZyTTU5nAXaSwA== X-Spam-Score: -3.46 X-Migadu-Queue-Id: D56B319A6E Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=dismail.de header.s=20190914 header.b=tKVtL1gy; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -3.46 X-TUID: NDk/bL+GfiiG * guix/channels.scm (): Add channel description field and comment disambiguating the type expected in an introduction field. * doc/guix.scm (Invoking guix describe): Add channel description field to channels record instance example. This commit adds an optional description field to a channel intended to describe the channel. Its purpose is similar to the description field in a record. --- doc/guix.texi | 2 ++ guix/channels.scm | 15 ++++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 24d99cbf24..483d2fbaa4 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -5063,6 +5063,8 @@ $ guix describe -f channels (list (channel (name 'guix) (url "https://git.savannah.gnu.org/git/guix.git") + (description "The main GNU Guix channel providing the core +package collection along with Guix and its documentation.") (commit "e0fa68c7718fffd33d81af415279d6ddb518f727") (introduction diff --git a/guix/channels.scm b/guix/channels.scm index d84228c47e..8acf3d8742 100644 --- a/guix/channels.scm +++ b/guix/channels.scm @@ -122,13 +122,14 @@ (define-module (guix channels) (define-record-type* channel make-channel channel? - (name channel-name) - (url channel-url) - (branch channel-branch (default "master")) - (commit channel-commit (default #f)) - (introduction channel-introduction (default #f)) - (location channel-location - (default (current-source-location)) (innate))) + (name channel-name) + (url channel-url) + (description channel-description (default #f)) ; string + (branch channel-branch (default "master")) + (commit channel-commit (default #f)) + (introduction channel-introduction (default #f)) ; + (location channel-location + (default (current-source-location)) (innate))) ;; Channel introductions. A "channel introduction" provides a commit/signer ;; pair that specifies the first commit of the authentication process as well -- 2.38.1