From patchwork Tue Jan 9 22:45:31 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: 58708 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 05F7E27BBEA; Tue, 9 Jan 2024 22:46:05 +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=-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 5965427BBE2 for ; Tue, 9 Jan 2024 22:46:04 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNKrA-0006wX-QT; Tue, 09 Jan 2024 17:46:00 -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 1rNKr5-0006sT-9V for guix-patches@gnu.org; Tue, 09 Jan 2024 17:45:56 -0500 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 1rNKr5-00046u-1N for guix-patches@gnu.org; Tue, 09 Jan 2024 17:45:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNKrC-0002Z5-1v for guix-patches@gnu.org; Tue, 09 Jan 2024 17:46:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68353] [PATCH 1/2] doc: Document cvs-fetch and cvs-reference. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 09 Jan 2024 22:46: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> Received: via spool by 68353-submit@debbugs.gnu.org id=B68353.17048403498610 (code B ref 68353); Tue, 09 Jan 2024 22:46:02 +0000 Received: (at 68353) by debbugs.gnu.org; 9 Jan 2024 22:45:49 +0000 Received: from localhost ([127.0.0.1]:41216 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNKqz-0002E7-4e for submit@debbugs.gnu.org; Tue, 09 Jan 2024 17:45:49 -0500 Received: from wolfsden.cz ([37.205.8.62]:45732) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1rNKqw-00027h-0W for 68353@debbugs.gnu.org; Tue, 09 Jan 2024 17:45:47 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id 60CB124E308; Tue, 9 Jan 2024 22:45:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1704840337; bh=Pg9FbphzVrChCtmPtzMFhqN4Ibp/UBdJnGafw1N9aRM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=uRCNCpKhyj8bssfQsWDEFXf/rBuOL5a9lYdgsxn4AtdHfi4uNfpjzOxXR9dDrQ5oj AAoPmlZVz+Yk9ln7DMPcjT/dx/GkqRFx94e3arhKr5vFgnQqrP8V6+M7xtnqPZDd4Q MPmNkapbh2PoZCWqJjEkDYfKrN+SY9WEeyErEzbMxp5STQSqwwgQtBNhzZvHufRHWz clOUoU986tAU0DqC/eLR/V0+IUovcXgZih+6iL0NXaYODjEzBbkQAQveFO5C5492h2 Xff/GxwMvvAQlupzS/Ka7FeGpPaJQh5wU3GraqTxNjAzCjWaRHaoKxV01/26Oe7VAo A/BFa4e9n+glgEmLqKz8dZ5wa1Fc6RxObufFZZ6R6YuoJr2mi2o4K2/aaIUjssAj8L JZwNKzzXAUcVgXKABhj4jVkeuAC0UZvd3zpwe4M/3EWhUU58zx2h+66NLNRn27p1oe GPGH3EALNZt2cKSaXFANAprqf2/0SOX9zO71dbkwmq6nuv0u+3G5j8E4T1HHdFNxzp zZoYC3Hpk1aP0G4ksTNbao5mmI6GctHB1KTR+YLdOipAA+6mquU/fZUrjr+NGQAVZI PuRdQCjyFIFUpEIRoSTRDjGGLpdDdO2FtujQYNsM2wUbwyB3oxfT1Wfl1DFyZ8YOfe i3l2qoo/dQHMlSIRjv1uCrZ8= Received: from localhost (unknown [146.70.134.143]) by wolfsden.cz (Postfix) with ESMTPSA id CCB4124CFEE; Tue, 9 Jan 2024 22:45:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1704840336; bh=Pg9FbphzVrChCtmPtzMFhqN4Ibp/UBdJnGafw1N9aRM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ooQLqM28veswWtmpP2wx6JNqtcQbG7F3uEFyBs9O3XWSqIw1ncHPPC7qR/n4YM+hJ jxLYtACOSz6wJsYsVfUjvHNYP1y4x1nXm6KT8o3yXMH6JzVRfkx256LPb+vjGa4LwU pXOLgmOzP6yX82J1m3HcXcUTlCo8npXF2S0hfh9nIZMe32DsF3/Oaf78NhjC+1raAj UZCP+qkOcjmyinNPp8mYrb8SUN9O1cg6Hoia45Kb6yjfYQGWvavD5HTLXqIxfCqwEQ FN1DAKwOrfdJcapOdYsVApCCIBFgxgBJyKIAgQfxYN9ODaSYDyAzIWoWWSH4K3TJXr oDnW1bgcjQ78kiVFRwrDOOu7yw+YyUuFdef7JR/d8qkKziFx4UPXBynTMQOeGf2+qj nI+IJY8i7ECVfB8AYUdwYPif8IXh33KFcQ2iHVixZTPRoEBJKweom9/f5YjhSGbRUH 46V0m+G9LLNij30uArS794HFRp99Tp19F4gXl+p4eMRHNBfBjpmyDibpNBM3MLsYk+ pFtvrX4zEm+Czr3f6MPtlFtRU40xOvCpS6Kh4aU3A4kiA4jd+47oeS77DTvpkrTwV2 +dh1/ej59Rhj90JcoYWzeGfDkGKQBMBurxYk66Sri02HdsY3b0v3H1t2AQKGZAm4rY MFF1MUYo0oYgmLh/GzJJpkzo= From: Tomas Volf <~@wolfsden.cz> Date: Tue, 9 Jan 2024 23:45:31 +0100 Message-ID: <341b6c7f9aad369812fb47b399ab4777641ca220.1704839277.git.~@wolfsden.cz> X-Mailer: git-send-email 2.41.0 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 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 a648a106b3..fde8aa12b9 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -8525,6 +8525,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 Tue Jan 9 22:45:32 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: 58709 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 F102E27BBE2; Tue, 9 Jan 2024 22:46:22 +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=-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 7CFD427BBE2 for ; Tue, 9 Jan 2024 22:46:22 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNKrA-0006vv-AR; Tue, 09 Jan 2024 17:46:00 -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 1rNKr5-0006sS-9J for guix-patches@gnu.org; Tue, 09 Jan 2024 17:45:56 -0500 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 1rNKr5-00046Z-16 for guix-patches@gnu.org; Tue, 09 Jan 2024 17:45:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNKrB-0002YE-Lp for guix-patches@gnu.org; Tue, 09 Jan 2024 17:46:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68353] [PATCH 2/2] doc: Fix bug in hg-reference documentation. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 09 Jan 2024 22:46:01 +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> Received: via spool by 68353-submit@debbugs.gnu.org id=B68353.17048403498570 (code B ref 68353); Tue, 09 Jan 2024 22:46:01 +0000 Received: (at 68353) by debbugs.gnu.org; 9 Jan 2024 22:45:49 +0000 Received: from localhost ([127.0.0.1]:41214 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNKqy-0002Dl-Ob for submit@debbugs.gnu.org; Tue, 09 Jan 2024 17:45:49 -0500 Received: from wolfsden.cz ([37.205.8.62]:45736) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1rNKqw-00029b-D0 for 68353@debbugs.gnu.org; Tue, 09 Jan 2024 17:45:47 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id ADFDC24CEED; Tue, 9 Jan 2024 22:45:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1704840338; bh=PvAtfUo4O5VEDcYu/TAoMOlRpUEfCPnupcv13hO988E=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=v6vjiqvjXhZUMkWjWWyUYn9k2tIY2dTP6QXShrq201eeaQD0BQMlds6vP5LwdLFiu Ll+ZzhwYkzMOmBSuRVj7FR/uvI/GzQSYXaz38q/KUaFIFh3X3SLiW0cqUF9R6KV7CS Lc9Dis1Le6Zqk/U8DstwuuF+cATHS041zFKnrahBLMR+6lFIdkwtjG9L20fs4Tar7f 3uqcLg+/kl9PT3kwydgE0XIcxtrTkpoKOdYbEXIpmGcSSAyhO5m7Xi9T6WCvLQw0AC 8S7auJ5WWtk+P2VZ5DeJsu2wTkFmaU12Q4CrU/cm66P/RHDWksg55J4+XEeOph4ig6 H5Ddmbotbau1odZn03xEOai7kwh8WqToAf/BAtCM39LjifAQJ7LbGQUb4IoN+Vwzgg UCODlHpnuC+7zzSLIHOmd25VLpjb8ANQonV6Nf7FQqYTrqmJPywnknGNUXkqeLs4q3 N3V03H9pb87Ud4bbmu9DQ68tjPpegEkgISig1ib0eZkpvDjBxw6TdDcAf2C25YrZFg dVoBHaRSbB2cFwmg/j6VMuXjAnKno0ujkhBooYWjaexECwa+1Q+A1yhTO4rux0vVjR us9x65csLA548LBmqAyJSrV87Wpe7L72gI4CSmduApfNRC9hL8+J0uYFfeBqm7P0DY iAYWrWG2eIQQGc1nS2k9O9PM= Received: from localhost (unknown [146.70.134.143]) by wolfsden.cz (Postfix) with ESMTPSA id 6C54124E09B; Tue, 9 Jan 2024 22:45:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1704840338; bh=PvAtfUo4O5VEDcYu/TAoMOlRpUEfCPnupcv13hO988E=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=v6vjiqvjXhZUMkWjWWyUYn9k2tIY2dTP6QXShrq201eeaQD0BQMlds6vP5LwdLFiu Ll+ZzhwYkzMOmBSuRVj7FR/uvI/GzQSYXaz38q/KUaFIFh3X3SLiW0cqUF9R6KV7CS Lc9Dis1Le6Zqk/U8DstwuuF+cATHS041zFKnrahBLMR+6lFIdkwtjG9L20fs4Tar7f 3uqcLg+/kl9PT3kwydgE0XIcxtrTkpoKOdYbEXIpmGcSSAyhO5m7Xi9T6WCvLQw0AC 8S7auJ5WWtk+P2VZ5DeJsu2wTkFmaU12Q4CrU/cm66P/RHDWksg55J4+XEeOph4ig6 H5Ddmbotbau1odZn03xEOai7kwh8WqToAf/BAtCM39LjifAQJ7LbGQUb4IoN+Vwzgg UCODlHpnuC+7zzSLIHOmd25VLpjb8ANQonV6Nf7FQqYTrqmJPywnknGNUXkqeLs4q3 N3V03H9pb87Ud4bbmu9DQ68tjPpegEkgISig1ib0eZkpvDjBxw6TdDcAf2C25YrZFg dVoBHaRSbB2cFwmg/j6VMuXjAnKno0ujkhBooYWjaexECwa+1Q+A1yhTO4rux0vVjR us9x65csLA548LBmqAyJSrV87Wpe7L72gI4CSmduApfNRC9hL8+J0uYFfeBqm7P0DY iAYWrWG2eIQQGc1nS2k9O9PM= From: Tomas Volf <~@wolfsden.cz> Date: Tue, 9 Jan 2024 23:45:32 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 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 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 fde8aa12b9..466e01eab5 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -8461,8 +8461,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