From patchwork Sun May 12 09:57:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 64366 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 4A1FE27BBEA; Sun, 12 May 2024 10:58:21 +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=-1.9 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no 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 97A1627BBE2 for ; Sun, 12 May 2024 10:58:20 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s65y3-0000MO-6e; Sun, 12 May 2024 05:58:07 -0400 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 1s65y2-0000M0-0E for guix-patches@gnu.org; Sun, 12 May 2024 05:58:06 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s65y1-0004aR-NH; Sun, 12 May 2024 05:58:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s65xy-0000G7-Eg; Sun, 12 May 2024 05:58:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#68353] [PATCH v2 1/2] doc: Document cvs-fetch and cvs-reference. References: In-Reply-To: Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: pelzflorian@pelzflorian.de, ludo@gnu.org, matt@excalamus.com, guix-patches@gnu.org Resent-Date: Sun, 12 May 2024 09:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68353 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68353@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz>, Florian Pelz , Ludovic =?utf-8?q?Court=C3=A8s?= , Matthew Trzcinski X-Debbugs-Original-Xcc: Florian Pelz , Ludovic =?utf-8?q?Court=C3=A8s?= , Matthew Trzcinski Received: via spool by 68353-submit@debbugs.gnu.org id=B68353.1715507877957 (code B ref 68353); Sun, 12 May 2024 09:58:02 +0000 Received: (at 68353) by debbugs.gnu.org; 12 May 2024 09:57:57 +0000 Received: from localhost ([127.0.0.1]:53575 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s65xs-0000FJ-M9 for submit@debbugs.gnu.org; Sun, 12 May 2024 05:57:57 -0400 Received: from wolfsden.cz ([37.205.8.62]:52626) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1s65xp-0000Ej-Ad for 68353@debbugs.gnu.org; Sun, 12 May 2024 05:57:54 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id B453528A577; Sun, 12 May 2024 09:57:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1715507871; bh=fD5JNz7mB2BMSTNBvJJkoaYSZDpNRzbgmA3k9LOyJ1c=; h=From:To:Cc:Subject:Date; b=DJ1ar5ntqsi+qebVwvxcDaRpAI0gHBcKAWP2LMqw6rTMNNT1Zk0TULniJ/eASL3FV IQ9bpfYqbaAGMOvm+pRallcqs9zRp+6JoKGxc3eYuCpx0TBmc6IZnjjJxZZvJDO9nJ oHBzSbT6wCAxI2WFncQ2KPnzRqVlr7MGbCnCZW1eRf4rrGfArG2qw2bCi1PFw3fuQK ewDJN6TWcl94MYEBgnJcfEiQjw1jvHBf9Iy3k22WMU4t37w18+k6wH5n/z7UTwaT8i kf+mKdzViPP2MwnCeMnPfIDpYbV7NoqT+bzkKy66DqYF32sZeFOH4bo6QCZpwuQsMj 3vyrOix93eaNm0idnKGoY09aJn4TMtGZvn5rQ7guiCuOhKEz0QgPvKOFrwQZZkCNZ0 htQuqw6CQ+hMMga6n31i9M7WenrAE1C1SOv46pQgbSCpBzbWB+5UtQydbHjRVk61My zAi5el/CSsWsBcjQsG1r6pg9UCgBl5Gv+JVfbkMDIeOfcTxKR/3t8pOpiJavyXkMJG LY+rP2JFOSyRzz1wMbF/7992x9bThC34vO/AhqzNc7rTpPNyiaT4JWv1Jj6rkz00HG U8lBSdzMq3XB8InFKZfq4iH8MNFAblLusxaw+mjeSXPlv2kFxmS4vgcPe1u1DDsWKH cF1WaHzX8nOJLe+jFos5O3KY= Received: from localhost (unknown [193.32.127.156]) by wolfsden.cz (Postfix) with ESMTPSA id CAF212887E2; Sun, 12 May 2024 09:57:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1715507870; bh=fD5JNz7mB2BMSTNBvJJkoaYSZDpNRzbgmA3k9LOyJ1c=; h=From:To:Cc:Subject:Date; b=X4/mxdtcZ6BMMd2VfH/j+eEBTrPqArc5KMLdpFA62zsHxqGMpOQa0rNuRB+On8948 EDxaPliRtEINd3vfWUmrd6811dhZr61aDUDMU2v2UtqYrPghoJDgpeTJ+/G+53nCR6 S6m5CtSOARms8VBI45mGtME6x69ZylHBPzo6rMedl3iizsaH6zwOJtHoHTroCwl6FB ySZBMstvyUh3TRrhZO/SEQ+UFKLXjNeUH4h4dORKeNj4QpPzSuA17HsqLziUwqw93y 9RdidcMxH+qLAwoiFILFihmfG/xy4mTENIXwrPy38NSWvqoNPDdLbAPDyOy1N2jUU8 mN/33NJXyslcqWhSny8z4FtzGXxzm88wVvu8/v9OFoWv9NFwuB43Fzne0MykXeVJP8 KMvqmYHKV1ywsJ9iSsaQn8GYNZJAoT6BSY7cXKdnthz9kL9SygzLk91E4Sizv1M8tk /fLaxRY5gdUuhGFC3PKv5pWrVmkIUp2ud15gOWAY19RRUj1nMjRn4Q0s+Lrv+RKvA9 DlO3syfTLnJrP+vloXlxV/Ff8TkR+YV2QpF0J97NudCYDz5PuybzFZsH3K2FB05pjX VHJMKee2HSBFzim96JmClglP3ekMmfhBL6h0DfZR3sveUre9FedwlYfaHxuTZi1EYp +5XEhIq30+B7OrIuEWB8lXYQ= From: Tomas Volf <~@wolfsden.cz> Date: Sun, 12 May 2024 11:57:40 +0200 Message-ID: <82ec854214fad37f82bc18d4424ac61f82da3f1a.1715507861.git.~@wolfsden.cz> X-Mailer: git-send-email 2.41.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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches For some reason, they were missing from the documentation. This commit adds them including an example of usage. * doc/guix.texi (origin Reference): Add cvs-fetch and cvs-reference. Change-Id: I6622a9f70e6d71ed31fbb3d2689df4a6946f8868 --- doc/guix.texi | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index f20208f94f..bc73942eaf 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -8302,6 +8302,43 @@ origin Reference @end table @end deftp +For CVS repositories, the module @code{(guix cvs-download)} defines the +@code{cvs-fetch} origin method and @code{cvs-reference} data type for +support of the Concurrent Versions System (CVS). + +@deffn {Procedure} cvs-fetch ref hash-algo hash [name] +Return a fixed-output derivation that fetches @var{ref}, a +@code{} object. The output is expected to have recursive +hash @var{hash} of type @var{hash-algo} (a symbol). Use @var{name} as +the file name, or a generic name if @code{#f}. +@end deffn + +@deftp {Data Type} cvs-reference +This data type represents a CVS reference for @code{cvs-fetch} to +retrieve. + +@table @asis +@item @code{root-directory} +The CVS root directory. + +@item @code{module} +Module to fetch. + +@item @code{revision} +Revision to fetch. +@end table + +The example below denotes a version of gnu-standards to fetch: + +@lisp +(cvs-reference + (root-directory ":pserver:anonymous@@cvs.savannah.gnu.org:/sources/gnustandards") + (module "gnustandards") + (revision "2020-11-25")) +@end lisp + +@end deftp + @node Defining Package Variants @section Defining Package Variants From patchwork Sun May 12 09:57:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 64367 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 01EB827BBEA; Sun, 12 May 2024 10:58:38 +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=-1.9 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no 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 A184E27BBE2 for ; Sun, 12 May 2024 10:58:37 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s65y1-0000Lw-Lp; Sun, 12 May 2024 05:58:05 -0400 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 1s65xz-0000K2-RY for guix-patches@gnu.org; Sun, 12 May 2024 05:58:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s65xz-0004aI-Is; Sun, 12 May 2024 05:58:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s65xz-0000GG-2E; Sun, 12 May 2024 05:58:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#68353] [PATCH v2 2/2] doc: Fix bug in hg-reference documentation. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: pelzflorian@pelzflorian.de, ludo@gnu.org, matt@excalamus.com, guix-patches@gnu.org Resent-Date: Sun, 12 May 2024 09:58:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68353 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68353@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz>, Florian Pelz , Ludovic =?utf-8?q?Court=C3=A8s?= , Matthew Trzcinski X-Debbugs-Original-Xcc: Florian Pelz , Ludovic =?utf-8?q?Court=C3=A8s?= , Matthew Trzcinski Received: via spool by 68353-submit@debbugs.gnu.org id=B68353.1715507877966 (code B ref 68353); Sun, 12 May 2024 09:58:03 +0000 Received: (at 68353) by debbugs.gnu.org; 12 May 2024 09:57:57 +0000 Received: from localhost ([127.0.0.1]:53577 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s65xt-0000FN-5S for submit@debbugs.gnu.org; Sun, 12 May 2024 05:57:57 -0400 Received: from wolfsden.cz ([37.205.8.62]:52640) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1s65xp-0000El-Ad for 68353@debbugs.gnu.org; Sun, 12 May 2024 05:57:54 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 040FB28B191; Sun, 12 May 2024 09:57:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1715507872; bh=TC5uetgzDRmhkwUx0qUyYGCnDfZPFz3m9NiDGBqmFyI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=GqLtlROWVVsFvSm/jIn1Zu9ZBtQFuejofzuqiiA2oA99m3b1Gl3ZTO6SeM5UI2nYq s9cgNRyiLs6TCsgXZo/HpqkD2NMMW2kl4KetFOZEDXoo8PzUkrJNIBEHzuCKr9T7zA WOWWPUEPoCmmG0EJ8TL7IKemS1ocXGelGrywsmHYuVI+rEm2dVSvc6FIDdUjTaqHFg vR9yyQn/VoquF+rXdVBX7sUIYRja24Mwig4Ry23Kk8H6Mx6N8PKrSswbjqSHPLlqaL 7ZCmG5HW0GSrURRafXXUdcnu3ZLDe34CU7uzhjdENjkw7NoZo+WkCK7vvVZm/K3fTF mvwccxozpZhA5+cjqFdpoUZEULQl2cYsOADgPXVi21eLZ1UdbSfGGv9hzBAzEl7oT1 K7BhwqtzUSmnwY3zNxXBTpBy8Xigf/Dq4ghR3/y3KJZzxmOg5O2DklKenm8Wws99iX i7TM7JOU6Z9qgfpor6iYQJRbSe09k50uO7uTeGAgNydbknDQTx+FCP70csXD3yxiaK plwNJ2dRXWbBoRpG3RKngMhpRmeqvIXOCIXOwMxf0I6lxkpup0pNNLU5PA3tCddV2w JqlYvgx+hK1G7yWsOsBV7xSlkkyOUT/IE2x4vdnSzOjUUKNE7IR60k0Wmds+RGYU7Y 00mieGyXNQvdBSPZho8YQvcA= Received: from localhost (unknown [193.32.127.156]) by wolfsden.cz (Postfix) with ESMTPSA id A957F28924F; Sun, 12 May 2024 09:57:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1715507871; bh=TC5uetgzDRmhkwUx0qUyYGCnDfZPFz3m9NiDGBqmFyI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=CZwjeKqtyg3V0Vmw2Qe9Y1B2vjjpqyQx0i/7ZRKLABGxBoyVbvUpuYLHuqthtMYBz g7yaOYc/3QS06r1q+B3riQY3FijkLpHoDNHuMbpny9KnM0ejVtXoS3rDkoghUoxTpV 7aTX9GSZ5whzL00+t3tunX0AMV/EQTBTdiJHCQhJEASCZKZsbvPKq6vl9Kaqk6KF3z n8UfXhKVQ7MuXoUyCq8TkqNbA4bEHQiCiMHyEh1QD+inJx1v3LeGhgphB4Pts0Vkvk KyEGZ7j29UVBgeJ1qxCPKOBQRW9pD+dW5Ue2obsAPXa8sXjw1AQSeJ6dBSIlR4OLb2 NxpbvwUjf86Uc+5B0ufSg2ivYgK5jyaVjzh5w3fvc2eIjXwLuBs6IJkrsOucyZdmiZ Iw7BPh3ABOsVr2wqMERX3uiff2aboKPWTx/FIGM4eUcmHT48jfGSSkpDsZUgtdQ3Il 1R9y76AMDqH10PhIvKRBUbdyUx3B+HpbthGgmj4Nwb5j9Ni1XVDh2OnEK42o5/8FTL y28sM3PukIR0mUvY7WaU98NAd4Mq41e/MJ+7k9/w7o3LX65uOthbiO3bi4wh6bOnKw lgWnXrv1gP+qQeLQ++D9cr5PcD2kTuh7abDpGQ9TUnC+nneLtV2NslM4Cm7N+nhzua ui8NHy+mpH8wK1UvWJ9SfrjA= From: Tomas Volf <~@wolfsden.cz> Date: Sun, 12 May 2024 11:57:41 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <82ec854214fad37f82bc18d4424ac61f82da3f1a.1715507861.git.~@wolfsden.cz> References: <82ec854214fad37f82bc18d4424ac61f82da3f1a.1715507861.git.~@wolfsden.cz> 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 The field is called changeset, not revision. And the string does not have to be a number. * doc/guix.texi (origin Reference): Fix documentation for hg-reference. Change-Id: Ic622dfc7b44caf42d070cdab8e42808dd96e6d63 --- doc/guix.texi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index bc73942eaf..230ba511c5 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -8238,8 +8238,8 @@ origin Reference @item @code{url} The URL of the Mercurial repository to clone. -@item @code{revision} -This string denotes revision to fetch specified as a number. +@item @code{changeset} +This string denotes changeset to fetch. @end table @end deftp