From patchwork Sat Sep 16 23:59:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tobias Geerinckx-Rice X-Patchwork-Id: 54147 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 2061C27BBEA; Fri, 22 Sep 2023 02:02:14 +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 0A0DA27BBE9 for ; Fri, 22 Sep 2023 02:02:13 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qjUYO-0008T0-4k; Thu, 21 Sep 2023 21:01:56 -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 1qjUYM-0008SU-JS for guix-patches@gnu.org; Thu, 21 Sep 2023 21:01:54 -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 1qjUYL-0003sv-Ud; Thu, 21 Sep 2023 21:01:53 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qjUYU-0007D4-0B; Thu, 21 Sep 2023 21:02:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66148] [PATCH v2 1/2] [Sloppy PoC] self: Use a more meaningful VERSION string for manuals. References: <87edirt4ft.fsf@nckx> In-Reply-To: <87edirt4ft.fsf@nckx> Resent-From: Tobias Geerinckx-Rice Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Fri, 22 Sep 2023 01:02:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66148 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 66148@debbugs.gnu.org Cc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 66148-submit@debbugs.gnu.org id=B66148.169534447027643 (code B ref 66148); Fri, 22 Sep 2023 01:02:01 +0000 Received: (at 66148) by debbugs.gnu.org; 22 Sep 2023 01:01:10 +0000 Received: from localhost ([127.0.0.1]:35003 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qjUXd-0007Bl-Tl for submit@debbugs.gnu.org; Thu, 21 Sep 2023 21:01:10 -0400 Received: from tobias.gr ([80.241.217.52]:53096) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qjUXc-0007BT-2Q for 66148@debbugs.gnu.org; Thu, 21 Sep 2023 21:01:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=2018; bh=9OXCtCN2RcXDt 5SEgHgmP2oP3PdA1+MPccd+MaFEf00=; h=date:subject:to:from; d=tobias.gr; b=fdwcdwYWY2bMf4LC4gFkLYqqMkCyf8gFQN9EQepI55MthMcAcBAizq7sNwYPin9O54y9 h8rWVgQR6J/D5hM2xTvM6c2IIOEI7+eRDDREmFCrQuFLrnn8sIud7eB6YdG1q9N83nDKA2 6gwJZyG4k8xbGaMXXUOdh9JtH1wfaFisp2u2tWrx6fwCzxDU6nDZQlDWNTzrV2HmDWyrq5 vIXnGjbTTx8id4e3J93L2XNDqt+RaBrEOFarH6lYCA5HYlD/DW9LZfLbVZ1fa3/GkEE7s9 JjX6z0QeDFdRjHYRVkGUBfCH9+sWn45CW/Vm3MFlXbicxOVWGtWjWVMidPHGIGCQ== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id 3121fa6c (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <66148@debbugs.gnu.org>; Fri, 22 Sep 2023 01:00:55 +0000 (UTC) Date: Sun, 17 Sep 2023 01:59:59 +0200 Message-ID: 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: , Reply-to: Tobias Geerinckx-Rice X-ACL-Warn: , Tobias Geerinckx-Rice via Guix-patches X-Patchwork-Original-From: Tobias Geerinckx-Rice via Guix-patches via From: Tobias Geerinckx-Rice 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 * guix/self.scm (info-manual): Use the last public Guix release, according to our own guix package. --- gnu/packages/package-management.scm | 2 +- guix/self.scm | 52 ++++++++++++++++++++++++----- 2 files changed, 44 insertions(+), 10 deletions(-) base-commit: ee7c9d254117fa470686210ad2ef5e7f1ba4fefc prerequisite-patch-id: 4df99ef206175ed2fc52016929d4b7a3413a36dc prerequisite-patch-id: 61f4235965cf06a4a9a619afb1606c6b9f9eeaf1 prerequisite-patch-id: 4e22c12f447e759bbd52a486f25e279829c7b88f prerequisite-patch-id: 7e6e4ab87b52996e9bb6cd8595889f21ba87e9fe prerequisite-patch-id: 6f86f2a54f77c0e8841b6f22953c2f748e358107 prerequisite-patch-id: 7c88071ffd6af8c9de9a44ef2e745e3b111d28e7 prerequisite-patch-id: dacf336396c4f629906e4689dc2868d437179a37 prerequisite-patch-id: 35641348fcba881313d08cb85da3722ba0891264 prerequisite-patch-id: ea98f949fde81f63a309e36405b87463dc07ac50 prerequisite-patch-id: a299994eb9a52db942a5cc3a038b8bc34529c799 prerequisite-patch-id: 9ffc6d3a9be37af59ec29bfce0543cf8371edacb prerequisite-patch-id: c489fbc8af7d431f9372d0b8bc9e4c609703680e prerequisite-patch-id: 471c932817cc1044fd03f56e1a1f84e4ce4029a9 prerequisite-patch-id: 88f3a5981ea62ce654a48c258df09315f24ba73e prerequisite-patch-id: 62b7b8d8b26d642f524d45e910f7685a57345d76 prerequisite-patch-id: 6ad7cb518d3f48614c97e7ef851289a8f4375306 prerequisite-patch-id: 758284e9a8f0cbc718feace3ba3575478360b88a prerequisite-patch-id: 3fec7d86bd725207d19e77b38cba7f989af68ea3 prerequisite-patch-id: 3bd20d51aa3a07f86722c5894b85f58b96e1e798 prerequisite-patch-id: 1011132081c09cd02295c999c9af44d1191bc4b2 prerequisite-patch-id: c3b42b9e20d68f2d3522424af509bfa6c8e79ee8 prerequisite-patch-id: 760df26aee26e14249c412f32630ae6e71a3fa3e prerequisite-patch-id: b89039b55bef0639c3679b1a5ba13b7a5593af5b prerequisite-patch-id: 24fc8fdb82bb9287ed944673e2f922587bc49503 prerequisite-patch-id: 077e45c8081930192499bfa5c7391d882b1ad401 prerequisite-patch-id: 68aa5fda780581e44d43d179d71b1232e568bcd3 prerequisite-patch-id: f31368d6b77f811e4b1fba489492ac4d6cde0948 prerequisite-patch-id: fc4e5787813af14bc812bc61a18acd684bd319af prerequisite-patch-id: 08f122a2c9dec498a089d665280f37191f96a1ba prerequisite-patch-id: 8df25a01fcb36ee0616d12930524131a6cb5af40 diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index cbda40f78b..a7f3363f4e 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -172,7 +172,7 @@ (define (boot-guile-uri arch) (define-public guix ;; Latest version of Guix, which may or may not correspond to a release. ;; Note: the 'update-guix-package.scm' script expects this definition to - ;; start precisely like this. + ;; start precisely like this. Also match the regexps in (guix self)! (let ((version "1.4.0") (commit "4dfdd822102690b5687acf28365ab707b68d9476") (revision 10)) diff --git a/guix/self.scm b/guix/self.scm index 5c8c00e0b0..2d11dd47a4 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -418,23 +418,57 @@ (define (info-manual source) (define examples (file-append* source "gnu/system/examples")) + ;; Sniff the latest public Guix release version number from this file. + (define guix-package-module + (file-append* source "gnu/packages/package-management.scm")) + (define build (with-imported-modules '((guix build utils)) #~(begin (use-modules (guix build utils) - (ice-9 match)) + (ice-9 match) + (ice-9 rdelim) + (ice-9 regex)) + + ;; Use regular expressions rather than READ to ‘parse’ the guix + ;; package, in an attempt not to limit any future reader extensions. + (define guix-package-regexp + (make-regexp + "^\\(define[-[:alnum:]]*[[:blank:]]+guix([^[:alnum:]]|$)")) + + (define guix-package-version-regexp + (make-regexp "\\(version[[:blank:]]*\"([^\"]*)\"\\)")) + + (define (get-guix-package-version port) + (let loop () + (let ((line (read-line port))) + (unless (or (eof-object? line) + (regexp-exec guix-package-regexp line)) + (loop)))) + (let loop () + (let ((line (read-line port))) + (if (eof-object? line) + #f + (let ((rx (regexp-exec guix-package-version-regexp line))) + (if (eq? 2 (and=> rx match:count)) + (match:substring rx 1) + (loop))))))) (mkdir #$output) - ;; Create 'version.texi'. - ;; XXX: Can we use a more meaningful version string yet one that - ;; doesn't change at each commit? + ;; Create 'version.texi'. We could sniff the git commit from the + ;; SOURCE file name, but don't: not only is the manual expensive to + ;; rebuild, VERSION is used almost exclusively to construct release + ;; URLs and the like. (call-with-output-file "version.texi" - (lambda (port) - (let ((version "0.0-git")) - (pk (find-files #$source ".")) - (punt) - (format port " + (lambda (output) + (let* ((input (open-file #$guix-package-module "r")) + (version (if input + (let ((v (get-guix-package-version input))) + (close-port input) + v) + "0.0-git"))) + (format output "\ @set UPDATED 1 January 1970 @set UPDATED-MONTH January 1970 @set EDITION ~a From patchwork Sun Sep 17 00:00:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tobias Geerinckx-Rice X-Patchwork-Id: 54146 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 B20D027BBEA; Fri, 22 Sep 2023 02:02:09 +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=ham 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 1D04A27BBE2 for ; Fri, 22 Sep 2023 02:02:09 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qjUYM-0008SZ-Qu; Thu, 21 Sep 2023 21:01:54 -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 1qjUYL-0008S5-Io for guix-patches@gnu.org; Thu, 21 Sep 2023 21:01:53 -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 1qjUYL-0003sj-9i; Thu, 21 Sep 2023 21:01:53 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qjUYU-0007DE-Du; Thu, 21 Sep 2023 21:02:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66148] [PATCH v2 2/2] doc: Mention it when we were pulled. Resent-From: Tobias Geerinckx-Rice Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Fri, 22 Sep 2023 01:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66148 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 66148@debbugs.gnu.org Cc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 66148-submit@debbugs.gnu.org id=B66148.169534447027649 (code B ref 66148); Fri, 22 Sep 2023 01:02:02 +0000 Received: (at 66148) by debbugs.gnu.org; 22 Sep 2023 01:01:10 +0000 Received: from localhost ([127.0.0.1]:35005 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qjUXe-0007Bo-EJ for submit@debbugs.gnu.org; Thu, 21 Sep 2023 21:01:10 -0400 Received: from tobias.gr ([80.241.217.52]:53096) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qjUXc-0007BT-WA for 66148@debbugs.gnu.org; Thu, 21 Sep 2023 21:01:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=2018; bh=aeg+QgLWj7WyA qxJUs/hjRSpaTmS2I+uP1W1/r+i/DE=; h=references:in-reply-to:date: subject:to:from; d=tobias.gr; b=J2Dce23gDeo42vBNNDYWRYos/u9wg/077OWWJ1 YWv+QjBE3d98BE2PCQrJIHONEJk2iHfKsd4U9KHQTN/vGZZ7mK3oKo4J2GzMMB6Jn/o6ZE oAlBTcHT38u3H82xgCtkytt/44eu+wNXum8eRqArKjcuEtXNNparm/u8ObJxzmoAlKftE6 Byp1oX+rZiwLb9kVRNsmvpTONgm1P1DYQ6zq5mHncCrHD6ZlpWmM70hczcVJ9Zgzzook0X b6oDnRMF4c3xiVA7L5nqiT+DBOCfql+G8QqMuyDxmrlTAIRsNXoClViyxYObDhooz7APqs YoE5hp7qJoMc/Yc/gLdk5aZw== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id 4926f85a (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <66148@debbugs.gnu.org>; Fri, 22 Sep 2023 01:00:56 +0000 (UTC) Date: Sun, 17 Sep 2023 02:00:00 +0200 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: , Reply-to: Tobias Geerinckx-Rice X-ACL-Warn: , Tobias Geerinckx-Rice via Guix-patches X-Patchwork-Original-From: Tobias Geerinckx-Rice via Guix-patches via From: Tobias Geerinckx-Rice 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 Now that we use the latest release VERSION even for pulled Guixes, make it abundantly clear that this is a later build. * guix/self.scm (info-manual): @set the PULLED flag in version.texi. * doc/guix.texi (Top): Honour it. --- doc/guix.texi | 5 +++-- guix/self.scm | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 39088b954b..c959cff1a1 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -166,8 +166,9 @@ @node Top @top GNU Guix -This document describes GNU Guix version @value{VERSION}, a functional -package management tool written for the GNU system. +This document describes GNU Guix @inlineifset{GUIX-PULLED, from a +@command{guix pull} after the release of} version @value{VERSION}, a +functional package management tool written for the GNU system. @c TRANSLATORS: You can replace the following paragraph with information on @c how to join your own translation team and how to report issues with the diff --git a/guix/self.scm b/guix/self.scm index 2d11dd47a4..81c5c722e0 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -469,6 +469,10 @@ (define (info-manual source) v) "0.0-git"))) (format output "\ +@c There's no Texinfo command to test whether @value{UPDATED} ends in 1970 and +@c tweak the intro to guix.texi accordingly, so we add this Guix-specific flag. +@set GUIX-PULLED true + @set UPDATED 1 January 1970 @set UPDATED-MONTH January 1970 @set EDITION ~a