X-Loop: help-debbugs@HIDDEN
Subject: [bug#74979] [PATCH 0/4] scripts: style: Sort more kinds of package
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix@HIDDEN, dev@HIDDEN, ludo@HIDDEN, othacehe@HIDDEN, zimon.toutoune@HIDDEN, me@HIDDEN, guix-patches@HIDDEN
Resent-Date: Thu, 19 Dec 2024 19:33:02 +0000
Resent-Message-ID: <handler.74979.B.17346367411548 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: report 74979
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 74979 <at> debbugs.gnu.org
Cc: Christopher Baines <guix@HIDDEN>, Josselin Poiret <dev@HIDDEN>, Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>, Mathieu Othacehe <othacehe@HIDDEN>, Simon Tournier <zimon.toutoune@HIDDEN>, Tobias Geerinckx-Rice <me@HIDDEN>
X-Debbugs-Original-To: guix-patches@HIDDEN
X-Debbugs-Original-Xcc: Christopher Baines <guix@HIDDEN>, Josselin Poiret <dev@HIDDEN>, Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>, Mathieu Othacehe <othacehe@HIDDEN>, Simon Tournier <zimon.toutoune@HIDDEN>, Tobias Geerinckx-Rice <me@HIDDEN>
Received: via spool by submit <at> debbugs.gnu.org id=B.17346367411548
(code B ref -1); Thu, 19 Dec 2024 19:33:02 +0000
Received: (at submit) by debbugs.gnu.org; 19 Dec 2024 19:32:21 +0000
Received: from localhost ([127.0.0.1]:40132 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tOMFw-0000Ot-Sj
for submit <at> debbugs.gnu.org; Thu, 19 Dec 2024 14:32:21 -0500
Received: from lists.gnu.org ([209.51.188.17]:41348)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <herman@HIDDEN>) id 1tOMFv-0000Ok-6V
for submit <at> debbugs.gnu.org; Thu, 19 Dec 2024 14:32:20 -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 <herman@HIDDEN>) id 1tOMFr-0001fr-I0
for guix-patches@HIDDEN; Thu, 19 Dec 2024 14:32:16 -0500
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]
helo=email.rimm.ee)
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256)
(Exim 4.90_1) (envelope-from <herman@HIDDEN>) id 1tOMFn-0002cw-HO
for guix-patches@HIDDEN; Thu, 19 Dec 2024 14:32:14 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
t=1734636714;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:
content-transfer-encoding:content-transfer-encoding;
bh=bELY7mBZzIzsUVwvmWLI7e+/jN2D9uMPciDttAgIzYE=;
b=qSpnHfMco+Kh2FCekEMc84N8LtKe7GW6fQPH9G94PI3rpqf3PRT4r0UgKWA84AQXxUOxoG
/34sFj9k6281y1pv+hlM8JI8GnJaSmgDH2FVF2ygTAGJGB0cGbWJACSGnfR2afYZyR/RJF
XXRCoZNrXCnvfVbuhhJUwtsLo67f3f3hHpyREG49eIvEQn7TWdDJM2euXTulkVaVKmCuge
fpz4B7GJRkV0+hIJil0wrx+fSEhLterWswH2C/4xWKBEWnuIa7dowVmwg0I7ZjriqnNhwv
LWMgJgCnfDSh9izgN6Eedj3d3igFuMZCF8AiDlA/byEYdoG0T8NLCGVi/DmR5w==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 1911aeb9
(TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
for <guix-patches@HIDDEN>; Thu, 19 Dec 2024 19:31:54 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Thu, 19 Dec 2024 20:31:12 +0100
Message-ID: <cover.1734636205.git.herman@HIDDEN>
X-Mailer: git-send-email 2.45.2
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=81.205.150.117; envelope-from=herman@HIDDEN;
helo=email.rimm.ee
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 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_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001,
SPF_HELO_NONE=0.001, SPF_PASS=-0.001,
TVD_RCVD_IP=0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -1.4 (-)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.4 (--)
Hello,
The warnings added in [PATCH 4/4] are emitted multiple times. How
should I prevent that? Or should I put them behind a --verbose option?
Cheers,
Herman
Herman Rimm (4):
scripts: style: Refactor order-packages.
scripts: style: Sort more kinds of package definitions.
scripts: style: Only sort packages with string literal name.
scripts: style: Warn about unmatched package definitions.
guix/scripts/style.scm | 57 ++++++++++++++++++++++--------------------
1 file changed, 30 insertions(+), 27 deletions(-)
base-commit: 07b4b1d055c36c6c61d39273c26974771dbfe805
--
2.45.2
Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) Content-Type: text/plain; charset=utf-8 X-Loop: help-debbugs@HIDDEN From: help-debbugs@HIDDEN (GNU bug Tracking System) To: Herman Rimm <herman@HIDDEN> Subject: bug#74979: Acknowledgement ([PATCH 0/4] scripts: style: Sort more kinds of package) Message-ID: <handler.74979.B.17346367411548.ack <at> debbugs.gnu.org> References: <cover.1734636205.git.herman@HIDDEN> X-Gnu-PR-Message: ack 74979 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 74979 <at> debbugs.gnu.org Date: Thu, 19 Dec 2024 19:33:02 +0000 Thank you for filing a new bug report with debbugs.gnu.org. This is an automatically generated reply to let you know your message has been received. Your message is being forwarded to the package maintainers and other interested parties for their attention; they will reply in due course. As you requested using X-Debbugs-CC, your message was also forwarded to Christopher Baines <guix@HIDDEN>, Josselin Poiret <dev@HIDDEN>,= Ludovic Court=C3=A8s <ludo@HIDDEN>, Mathieu Othacehe <othacehe@HIDDEN>, = Simon Tournier <zimon.toutoune@HIDDEN>, Tobias Geerinckx-Rice <me@tobias= .gr> (after having been given a bug report number, if it did not have one). Your message has been sent to the package maintainer(s): guix-patches@HIDDEN If you wish to submit further information on this problem, please send it to 74979 <at> debbugs.gnu.org. Please do not send mail to help-debbugs@HIDDEN unless you wish to report a problem with the Bug-tracking system. --=20 74979: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D74979 GNU Bug Tracking System Contact help-debbugs@HIDDEN with problems
X-Loop: help-debbugs@HIDDEN
Subject: [bug#74979] [PATCH 1/4] scripts: style: Refactor order-packages.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix@HIDDEN, dev@HIDDEN, ludo@HIDDEN, othacehe@HIDDEN, zimon.toutoune@HIDDEN, me@HIDDEN, guix-patches@HIDDEN
Resent-Date: Thu, 19 Dec 2024 19:34:01 +0000
Resent-Message-ID: <handler.74979.B74979.17346368391781 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 74979
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 74979 <at> debbugs.gnu.org
Cc: Christopher Baines <guix@HIDDEN>, Josselin Poiret <dev@HIDDEN>, Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>, Mathieu Othacehe <othacehe@HIDDEN>, Simon Tournier <zimon.toutoune@HIDDEN>, Tobias Geerinckx-Rice <me@HIDDEN>
X-Debbugs-Original-Xcc: Christopher Baines <guix@HIDDEN>, Josselin Poiret <dev@HIDDEN>, Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>, Mathieu Othacehe <othacehe@HIDDEN>, Simon Tournier <zimon.toutoune@HIDDEN>, Tobias Geerinckx-Rice <me@HIDDEN>
Received: via spool by 74979-submit <at> debbugs.gnu.org id=B74979.17346368391781
(code B ref 74979); Thu, 19 Dec 2024 19:34:01 +0000
Received: (at 74979) by debbugs.gnu.org; 19 Dec 2024 19:33:59 +0000
Received: from localhost ([127.0.0.1]:40143 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tOMHX-0000SZ-A3
for submit <at> debbugs.gnu.org; Thu, 19 Dec 2024 14:33:59 -0500
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:34221
helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <herman@HIDDEN>) id 1tOMHV-0000SA-Dr
for 74979 <at> debbugs.gnu.org; Thu, 19 Dec 2024 14:33:57 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
t=1734636828;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=Y3r8MQp/2/d8p8BJAtI4tXPjSqSX89/c314eRijplQs=;
b=PQmH35jzxuU/WnYf1fxuFwW4zeZ4AEGYOVsNeanOI5AvlXi2hXYy30sqZ6sU01K1IR98m+
fXLuG88xKIYaZSlEii3MSmks3fBETiRjNV7twj8qbgOAIcxlaAUFZb3Ida3bI3bu6fg8qL
jfO/LijAgApTu+SYDIG+2R8sQBNuFGceAgRDMZ8inbTlJpCVQ4LpY7Wh1WgAsBTxGzFEMY
771kMT30kIs61dk+RcnfEEcU9UbvvCs3T88s0870GyrufiBGb2oNc0iK4hsIeWTNSoqIC3
RnGL5CMX+BkhbJOiy3ydz426DxwyJ8JTDDCeCijfEFOPaERR5DAfsUqa/aDY4g==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 6966bcf3
(TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
for <74979 <at> debbugs.gnu.org>; Thu, 19 Dec 2024 19:33:48 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Thu, 19 Dec 2024 20:33:04 +0100
Message-ID: <bccdc8fe4884bf1f114a1f07eac3a3a3b25081e0.1734636205.git.herman@HIDDEN>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <cover.1734636205.git.herman@HIDDEN>
References: <cover.1734636205.git.herman@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* guix/scripts/style.scm (order-packages): Combine package-name and
package-version procedures into package-fields.
(format-whole-file): Do not sort copyright headers or module definition.
Change-Id: I5507bf8ed221f7017f972f0e0e64d149bea4854b
---
guix/scripts/style.scm | 36 +++++++++++++++---------------------
1 file changed, 15 insertions(+), 21 deletions(-)
diff --git a/guix/scripts/style.scm b/guix/scripts/style.scm
index 51234952e9..4b704ddfb7 100644
--- a/guix/scripts/style.scm
+++ b/guix/scripts/style.scm
@@ -43,6 +43,7 @@ (define-module (guix scripts style)
#:use-module (ice-9 match)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-9)
+ #:use-module (srfi srfi-11)
#:use-module (srfi srfi-26)
#:use-module (srfi srfi-34)
#:use-module (srfi srfi-37)
@@ -500,31 +501,19 @@ (define (order-packages lst)
"Return LST, a list of top-level expressions and blanks, with
top-level package definitions in alphabetical order. Packages which
share a name are placed with versions in descending order."
- (define (package-name pkg)
+ (define (package-fields pkg)
(match pkg
((('define-public _ expr) _ ...)
(match expr
- ((or ('package _ ('name name) _ ...)
- ('package ('name name) _ ...))
- name)
- (_ #f)))
- (_ #f)))
-
- (define (package-version pkg)
- (match pkg
- ((('define-public _ expr) _ ...)
- (match expr
- ((or ('package _ _ ('version version) _ ...)
- ('package _ ('version version) _ ...))
- version)
- (_ #f)))
- (_ #f)))
+ ((or ('package _ ('name name) ('version version) _ ...)
+ ('package ('name name) ('version version) _ ...))
+ (values name version))
+ (_ (values #f #f))))
+ (_ (values #f #f))))
(define (package>? lst1 lst2)
- (let ((name1 (package-name lst1))
- (name2 (package-name lst2))
- (version1 (package-version lst1))
- (version2 (package-version lst2)))
+ (let-values (((name1 version1) (package-fields lst1))
+ ((name2 version2) (package-fields lst2)))
(and name1 name2 (or (string>? name1 name2)
(and (string=? name1 name2)
version1
@@ -550,7 +539,12 @@ (define* (format-whole-file file order? #:rest rest)
(let* ((lst (call-with-input-file file read-with-comments/sequence
#:guess-encoding #t))
(lst (if order?
- (order-packages lst)
+ (let loop ((lst lst))
+ (match lst
+ (((? blank? blank) rest ...)
+ (cons blank (loop rest)))
+ ((module rest ...)
+ (cons module (order-packages rest)))))
lst)))
(with-atomic-file-output file
(lambda (port)
--
2.45.2
X-Loop: help-debbugs@HIDDEN
Subject: [bug#74979] [PATCH 2/4] scripts: style: Sort more kinds of package definitions.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix@HIDDEN, dev@HIDDEN, ludo@HIDDEN, othacehe@HIDDEN, zimon.toutoune@HIDDEN, me@HIDDEN, guix-patches@HIDDEN
Resent-Date: Thu, 19 Dec 2024 19:34:02 +0000
Resent-Message-ID: <handler.74979.B74979.17346368401788 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 74979
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 74979 <at> debbugs.gnu.org
Cc: Christopher Baines <guix@HIDDEN>, Josselin Poiret <dev@HIDDEN>, Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>, Mathieu Othacehe <othacehe@HIDDEN>, Simon Tournier <zimon.toutoune@HIDDEN>, Tobias Geerinckx-Rice <me@HIDDEN>
X-Debbugs-Original-Xcc: Christopher Baines <guix@HIDDEN>, Josselin Poiret <dev@HIDDEN>, Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>, Mathieu Othacehe <othacehe@HIDDEN>, Simon Tournier <zimon.toutoune@HIDDEN>, Tobias Geerinckx-Rice <me@HIDDEN>
Received: via spool by 74979-submit <at> debbugs.gnu.org id=B74979.17346368401788
(code B ref 74979); Thu, 19 Dec 2024 19:34:02 +0000
Received: (at 74979) by debbugs.gnu.org; 19 Dec 2024 19:34:00 +0000
Received: from localhost ([127.0.0.1]:40145 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tOMHX-0000Si-OH
for submit <at> debbugs.gnu.org; Thu, 19 Dec 2024 14:34:00 -0500
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:34221
helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <herman@HIDDEN>) id 1tOMHW-0000SA-6M
for 74979 <at> debbugs.gnu.org; Thu, 19 Dec 2024 14:33:58 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
t=1734636828;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=Du8aSGeMCsII1pKsTy4Y9Us6eHcnJWvll/aQj9v79VU=;
b=AwwSjHOGbACUPxuYEo9UPy0XQwb41p+Fy5q+qegm5y/SRBahMlJYgVqApBLA2e8LXWwNo2
/FONpBoiRSxsONieSVkMvqKIJE0BK3e+K/+dbrnI37uwvGLHP8gkHXeL2vEbhYbtdJRkMs
KYfof+8QVpp1jsIzU/Fzm72SyKMaOAUFaTjx3WcIiIgr4bVWfACMeKuvSfHZsZsIrN7trj
D8SKwMcP4ZPE3Kp4THinXmPu4EGGwCOT1nyJvn6KbJyOEXTsfWallC2CCmJPQhYLZqhzwU
JTodvN+JulATzax6XBBh6KxT4VZX1Y7exnOAo1k5bgvq6ZZ3HC+IehK2wGPqyQ==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 40a7efa6
(TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
for <74979 <at> debbugs.gnu.org>; Thu, 19 Dec 2024 19:33:48 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Thu, 19 Dec 2024 20:33:05 +0100
Message-ID: <addf23b3b65e09a039a11a2d9dddeb2c6109a9a1.1734636205.git.herman@HIDDEN>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <cover.1734636205.git.herman@HIDDEN>
References: <cover.1734636205.git.herman@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* guix/scripts/style.scm (order-packages): Match comments before package
S-exp. and its fields. Match in let. Match package/inherit.
Change-Id: I48a5976930501c20415b5413966b5294958bc23b
---
guix/scripts/style.scm | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/guix/scripts/style.scm b/guix/scripts/style.scm
index 4b704ddfb7..6f07f6c3b9 100644
--- a/guix/scripts/style.scm
+++ b/guix/scripts/style.scm
@@ -503,13 +503,14 @@ (define (order-packages lst)
share a name are placed with versions in descending order."
(define (package-fields pkg)
(match pkg
- ((('define-public _ expr) _ ...)
+ ((('define-public pkg _ ... (or ('let _ expr) expr)) _ ...)
(match expr
- ((or ('package _ ('name name) ('version version) _ ...)
- ('package ('name name) ('version version) _ ...))
- (values name version))
- (_ (values #f #f))))
- (_ (values #f #f))))
+ (((or 'package 'package/inherit) fields ...)
+ (let ((name (and=> (assoc-ref fields 'name) first))
+ (version (and=> (assoc-ref fields 'version) first)))
+ (values name version)))
+ (_ (and (values #f #f)))))
+ (_ (and (values #f #f)))))
(define (package>? lst1 lst2)
(let-values (((name1 version1) (package-fields lst1))
--
2.45.2
X-Loop: help-debbugs@HIDDEN
Subject: [bug#74979] [PATCH 3/4] scripts: style: Only sort packages with string literal name.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix@HIDDEN, dev@HIDDEN, ludo@HIDDEN, othacehe@HIDDEN, zimon.toutoune@HIDDEN, me@HIDDEN, guix-patches@HIDDEN
Resent-Date: Thu, 19 Dec 2024 19:35:02 +0000
Resent-Message-ID: <handler.74979.B74979.17346368471850 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 74979
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 74979 <at> debbugs.gnu.org
Cc: Christopher Baines <guix@HIDDEN>, Josselin Poiret <dev@HIDDEN>, Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>, Mathieu Othacehe <othacehe@HIDDEN>, Simon Tournier <zimon.toutoune@HIDDEN>, Tobias Geerinckx-Rice <me@HIDDEN>
X-Debbugs-Original-Xcc: Christopher Baines <guix@HIDDEN>, Josselin Poiret <dev@HIDDEN>, Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>, Mathieu Othacehe <othacehe@HIDDEN>, Simon Tournier <zimon.toutoune@HIDDEN>, Tobias Geerinckx-Rice <me@HIDDEN>
Received: via spool by 74979-submit <at> debbugs.gnu.org id=B74979.17346368471850
(code B ref 74979); Thu, 19 Dec 2024 19:35:02 +0000
Received: (at 74979) by debbugs.gnu.org; 19 Dec 2024 19:34:07 +0000
Received: from localhost ([127.0.0.1]:40158 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tOMHf-0000Tl-4o
for submit <at> debbugs.gnu.org; Thu, 19 Dec 2024 14:34:07 -0500
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:34221
helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <herman@HIDDEN>) id 1tOMHW-0000SA-Ua
for 74979 <at> debbugs.gnu.org; Thu, 19 Dec 2024 14:33:59 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
t=1734636829;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=kgsostRT8tT8RjtyY070f2oua+b1EeF4/Ahdh3L16pw=;
b=rRTdsfMA6tx2OYbxDJsjjDKqxyj5HVNEQFW+sWzeDt+8x+rNhJ3TjPdjUHvJh2FGzf2IDc
OA1JJrHKf8uMLMb7hJejs8dm8uBuQruuO7EM1idM6xUHSwzy8bYsfj0xrOmSLOiK08bMfJ
xN3FVhnCOf1Ug+rqIkhGkATewNoSuevQNocizzZiTNlAJ8wPlBMJ7/tjQjOsbYzNSezPjY
awToJkHooH6Pe0up6Ix77a2Lnwew8C/EuOzaXkTcw7nhrritGkCjmBhk1Lfl+XwFGB95h5
6JmJrhsSK9pjzs3Sp2e80u2cAk/aUwD0d7xjIsBSSHOFj5ubNAzz6IIutW6IVQ==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 0ce9401b
(TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
for <74979 <at> debbugs.gnu.org>; Thu, 19 Dec 2024 19:33:49 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Thu, 19 Dec 2024 20:33:06 +0100
Message-ID: <48fb3a7d236d39e90107931893cbddf2f16a761f.1734636205.git.herman@HIDDEN>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <cover.1734636205.git.herman@HIDDEN>
References: <cover.1734636205.git.herman@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* guix/scripts/style.scm (order-packages): Only match string literals.
Change-Id: I48a5976930501c20415b5413966b5294958bc23b
---
guix/scripts/style.scm | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/guix/scripts/style.scm b/guix/scripts/style.scm
index 6f07f6c3b9..4801529f7e 100644
--- a/guix/scripts/style.scm
+++ b/guix/scripts/style.scm
@@ -515,11 +515,13 @@ (define (order-packages lst)
(define (package>? lst1 lst2)
(let-values (((name1 version1) (package-fields lst1))
((name2 version2) (package-fields lst2)))
- (and name1 name2 (or (string>? name1 name2)
- (and (string=? name1 name2)
- version1
- version2
- (version>? version2 version1))))))
+ (and (string? name1)
+ (string? name2)
+ (or (string>? name1 name2)
+ (and (string=? name1 name2)
+ (string? version1)
+ (string? version2)
+ (version>? version2 version1))))))
;; Group define-public with preceding blanks and defines.
(let ((lst (fold2 (lambda (expr tail head)
--
2.45.2
X-Loop: help-debbugs@HIDDEN
Subject: [bug#74979] [PATCH 4/4] scripts: style: Warn about unmatched package definitions.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix@HIDDEN, dev@HIDDEN, ludo@HIDDEN, othacehe@HIDDEN, zimon.toutoune@HIDDEN, me@HIDDEN, guix-patches@HIDDEN
Resent-Date: Thu, 19 Dec 2024 19:35:02 +0000
Resent-Message-ID: <handler.74979.B74979.17346368471856 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 74979
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 74979 <at> debbugs.gnu.org
Cc: Christopher Baines <guix@HIDDEN>, Josselin Poiret <dev@HIDDEN>, Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>, Mathieu Othacehe <othacehe@HIDDEN>, Simon Tournier <zimon.toutoune@HIDDEN>, Tobias Geerinckx-Rice <me@HIDDEN>
X-Debbugs-Original-Xcc: Christopher Baines <guix@HIDDEN>, Josselin Poiret <dev@HIDDEN>, Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>, Mathieu Othacehe <othacehe@HIDDEN>, Simon Tournier <zimon.toutoune@HIDDEN>, Tobias Geerinckx-Rice <me@HIDDEN>
Received: via spool by 74979-submit <at> debbugs.gnu.org id=B74979.17346368471856
(code B ref 74979); Thu, 19 Dec 2024 19:35:02 +0000
Received: (at 74979) by debbugs.gnu.org; 19 Dec 2024 19:34:07 +0000
Received: from localhost ([127.0.0.1]:40160 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tOMHf-0000Tn-Eg
for submit <at> debbugs.gnu.org; Thu, 19 Dec 2024 14:34:07 -0500
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:34221
helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <herman@HIDDEN>) id 1tOMHX-0000SA-L6
for 74979 <at> debbugs.gnu.org; Thu, 19 Dec 2024 14:34:00 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
t=1734636829;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=o4flfIiRfJVwIQlZrnND0GZVDOuzxs31Gp2MQxP5uyA=;
b=fXB7C/G8dNeu4IkQyYgTMZKzDdkrkP86on9vOJ5696mNJCBirXVZknat6Wrk+ZVaSJbOR4
a7rcHOr6W6NePz+hQ0e1IyyYTnIClfXhweFc+5DCyfHM8YTMupNM/fQX6eo93tI/qln/ER
Xf7nrStUzJBUBVeS702Nu3IwbmPhISegiuF3p8wpdpkEMTFD2An1chFEhp+DTPF/d0fWQT
FlfyC8YLo60dZkbrg6LoR0dTCHJn3gLShZvPMfIQPa2Zt7FGC8w89TRiUdE8OtNdcDmfnv
1PNGkQ2MFMOrJAqtYr3wY3DD4KWOjsHXhSRrnsv4/LEWz3eenNj/28/1i0U+iA==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id c56d8d84
(TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
for <74979 <at> debbugs.gnu.org>; Thu, 19 Dec 2024 19:33:49 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Thu, 19 Dec 2024 20:33:07 +0100
Message-ID: <6986ddba422272423a928f2d0b40cd8aeb8752ea.1734636205.git.herman@HIDDEN>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <cover.1734636205.git.herman@HIDDEN>
References: <cover.1734636205.git.herman@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* guix/scripts/style.scm (order-packages): Warn.
Change-Id: Iddbf979ee9ee5ed1ebada63776a390db024154fa
---
guix/scripts/style.scm | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/guix/scripts/style.scm b/guix/scripts/style.scm
index 4801529f7e..81fe1141e2 100644
--- a/guix/scripts/style.scm
+++ b/guix/scripts/style.scm
@@ -508,9 +508,15 @@ (define (order-packages lst)
(((or 'package 'package/inherit) fields ...)
(let ((name (and=> (assoc-ref fields 'name) first))
(version (and=> (assoc-ref fields 'version) first)))
+ (if (and name version)
+ (unless (and (string? name) (string? version))
+ (warning (G_ "non-string name/version for ~a~%") pkg))
+ (warning (G_ "package fields not found for ~a~%") pkg))
(values name version)))
- (_ (and (values #f #f)))))
- (_ (and (values #f #f)))))
+ (_ (and (warning (G_ "package record missing for ~a~%") pkg)
+ (values #f #f)))))
+ (_ (and (info (G_ "not sorting top-level S-exp.: ~a~%") pkg)
+ (values #f #f)))))
(define (package>? lst1 lst2)
(let-values (((name1 version1) (package-fields lst1))
--
2.45.2
X-Loop: help-debbugs@HIDDEN
Subject: [bug#74979] [PATCH 0/4] scripts: style: Sort more kinds of package
Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 23 Dec 2024 17:32:02 +0000
Resent-Message-ID: <handler.74979.B74979.17349750712028 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 74979
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: Herman Rimm <herman@HIDDEN>
Cc: Josselin Poiret <dev@HIDDEN>, Simon Tournier <zimon.toutoune@HIDDEN>, Mathieu Othacehe <othacehe@HIDDEN>, Tobias Geerinckx-Rice <me@HIDDEN>, 74979 <at> debbugs.gnu.org, Christopher Baines <guix@HIDDEN>
Received: via spool by 74979-submit <at> debbugs.gnu.org id=B74979.17349750712028
(code B ref 74979); Mon, 23 Dec 2024 17:32:02 +0000
Received: (at 74979) by debbugs.gnu.org; 23 Dec 2024 17:31:11 +0000
Received: from localhost ([127.0.0.1]:55961 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tPmGs-0000Wd-NI
for submit <at> debbugs.gnu.org; Mon, 23 Dec 2024 12:31:11 -0500
Received: from eggs.gnu.org ([209.51.188.92]:44704)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ludo@HIDDEN>) id 1tPmGq-0000WB-7X
for 74979 <at> debbugs.gnu.org; Mon, 23 Dec 2024 12:31:09 -0500
Received: from fencepost.gnu.org ([2001:470:142:3::e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <ludo@HIDDEN>)
id 1tPmEc-0003GW-0s; Mon, 23 Dec 2024 12:28:50 -0500
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To:
From; bh=x2voA1vo7K1S9XA6903IpVhKYU07mDtkw1Wv5/vBs90=; b=QgOUi0m54xv5cGMi36N/
VHkVKKcOJPHSaRYdM/U5mJUs2QAwr1kxt52vdfQ+Ef9nt/o8iN9uQA+fwzoF5XjJOxwhWhlyvJLTC
ABijsJF/hGWDcnV5h3auOjjK3PQFVsaPHFm9FMmDuyNAWuIw9rDHArBtWXVTBKPnSqu575hmRB9zr
6yV+9c6KkazktiCk1OUbx0B7RAzqKwGNWbedDlSv3UY6W+wUVQtNpHyvl/OP9QA5dFikHPKaeeKI8
9FPBjIMODFzm8zdfscWK2BnKj9FMQ1k3f9KLOtdbc4b0cw+Ou0mtd4R+gznluBQu5VUyYaijcBKdP
2IRJ4W3aVdTUjg==;
From: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
In-Reply-To: <cover.1734636205.git.herman@HIDDEN> (Herman Rimm's message of
"Thu, 19 Dec 2024 20:31:12 +0100")
References: <cover.1734636205.git.herman@HIDDEN>
Date: Mon, 23 Dec 2024 18:28:39 +0100
Message-ID: <87ttau8g1k.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -2.3 (--)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
Hi Herman,
Herman Rimm <herman@HIDDEN> skribis:
> The warnings added in [PATCH 4/4] are emitted multiple times. How
> should I prevent that? Or should I put them behind a --verbose option?
Not sure, do you have an example on how to trigger it?
> +++ b/guix/scripts/style.scm
> @@ -508,9 +508,15 @@ (define (order-packages lst)
> (((or 'package 'package/inherit) fields ...)
> (let ((name (and=3D> (assoc-ref fields 'name) first))
> (version (and=3D> (assoc-ref fields 'version) first)))
> + (if (and name version)
> + (unless (and (string? name) (string? version))
> + (warning (G_ "non-string name/version for ~a~%") pkg))
> + (warning (G_ "package fields not found for ~a~%") pkg))
> (values name version)))
> - (_ (and (values #f #f)))))
> - (_ (and (values #f #f)))))
> + (_ (and (warning (G_ "package record missing for ~a~%") pkg)
> + (values #f #f)))))
> + (_ (and (info (G_ "not sorting top-level S-exp.: ~a~%") pkg)
> + (values #f #f)))))
You shouldn=E2=80=99t rely on the return value of =E2=80=98info=E2=80=99, =
=E2=80=98warning=E2=80=99, etc.:
they=E2=80=99re not specified (that=E2=80=99s generally the case for proced=
ures called
for side effects only).
So I=E2=80=99d recommend:
(begin
(info =E2=80=A6)
(values #f #f))
(You don=E2=80=99t even need =E2=80=98begin=E2=80=99 in this context.)
The other patches LGTM, though perhaps =E2=80=98tests/guix-style.sh=E2=80=
=99 could be
augmented a bit to cover the new cases?
Thanks,
Ludo=E2=80=99.
X-Loop: help-debbugs@HIDDEN
Subject: [bug#74979] [PATCH 0/4] scripts: style: Sort more kinds of package
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Tue, 24 Dec 2024 10:45:01 +0000
Resent-Message-ID: <handler.74979.B74979.1735037042791 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 74979
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
Cc: 74979 <at> debbugs.gnu.org
Received: via spool by 74979-submit <at> debbugs.gnu.org id=B74979.1735037042791
(code B ref 74979); Tue, 24 Dec 2024 10:45:01 +0000
Received: (at 74979) by debbugs.gnu.org; 24 Dec 2024 10:44:02 +0000
Received: from [127.0.0.1] (port=59642 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tQ2OB-0000Bn-Iw
for submit <at> debbugs.gnu.org; Tue, 24 Dec 2024 05:44:02 -0500
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:49441
helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <herman@HIDDEN>) id 1tQ2O3-0000BX-Tj
for 74979 <at> debbugs.gnu.org; Tue, 24 Dec 2024 05:43:40 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
t=1735037014;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=lpAQWVKrcZ+4d8QB+BREwVEYSBzrJZTeTkmscveFnK8=;
b=ujhKBO71m1bX5jngSBKR6mWWB+GS3/5LfbKBL2v1mT1Yr7CtbeJ2msA7irEuuT2uiuCENG
gccXw/YhNf1PMZnutkkQzd3pKkGP32v0wSdWNf2yZtMkL63mbyIRIg0Po6U+PU1LL9gbUz
oq07NvSVkFQjXLMbvRwcxalGVUamAiznn8pxwnhBw/Cs3on5bIsCONPdGIKujiLqCJ4FhF
bEn1JhjlEc3zZahOcoP/iL03vn2Bai5qgzE/8Os+cIlS1SXu11ZaUVSDnieNYTapSdFjUy
IUWvotj0dicGyvAijl27IWxy51l38yhnHNWz2cZVJKX5dzGUxNMX4W2qmSzcRg==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 3b8268b4
(TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO);
Tue, 24 Dec 2024 10:43:34 +0000 (UTC)
Date: Tue, 24 Dec 2024 11:42:52 +0100
From: Herman Rimm <herman@HIDDEN>
Message-ID: <mnyemf53orphuunwlle7vfpljqqrlv2kujextlh4pifllv3b6w@uhlhq6ycuohc>
References: <cover.1734636205.git.herman@HIDDEN>
<87ttau8g1k.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <87ttau8g1k.fsf@HIDDEN>
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Hello,
On Mon, Dec 23, 2024 at 06:28:39PM +0100, Ludovic Courtès wrote:
> Hi Herman,
>
> Herman Rimm <herman@HIDDEN> skribis:
>
> > The warnings added in [PATCH 4/4] are emitted multiple times. How
> > should I prevent that? Or should I put them behind a --verbose option?
>
> Not sure, do you have an example on how to trigger it?
Yeah, for example:
$ guix style -fA gnu/packages/crates-io.scm
guix style: warning: package record missing for rust-version-compare-0.0
guix style: warning: package record missing for rust-version-compare-0.0
guix style: warning: package record missing for rust-version-compare-0.0
guix style: warning: package record missing for rust-version-compare-0.0
guix style: warning: package record missing for rust-version-compare-0.0
guix style: warning: package fields not found for rust-indoc-0.3
guix style: warning: package fields not found for rust-indoc-0.3
guix style: warning: package fields not found for rust-indoc-0.3
guix style: warning: package fields not found for rust-indoc-0.3
guix style: warning: package fields not found for rust-indoc-0.3
guix style: warning: package fields not found for rust-indoc-0.3
guix style: warning: package fields not found for rust-indoc-0.3
guix style: warning: package fields not found for rust-indoc-0.3
guix style: warning: package fields not found for rust-indoc-0.3
guix style: warning: package record missing for rust-version-compare-0.0
guix style: warning: package fields not found for rust-indoc-0.3
guix style: warning: package fields not found for rust-indoc-0.3
guix style: warning: package fields not found for rust-indoc-0.3
guix style: warning: package fields not found for rust-indoc-0.3
guix style: warning: package fields not found for rust-indoc-0.3
Cheers,
Herman
X-Loop: help-debbugs@HIDDEN
Subject: [bug#74979] [PATCH 0/4] scripts: style: Sort more kinds of package
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Tue, 24 Dec 2024 11:30:02 +0000
Resent-Message-ID: <handler.74979.B74979.17350397819453 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 74979
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
Cc: 74979 <at> debbugs.gnu.org
Received: via spool by 74979-submit <at> debbugs.gnu.org id=B74979.17350397819453
(code B ref 74979); Tue, 24 Dec 2024 11:30:02 +0000
Received: (at 74979) by debbugs.gnu.org; 24 Dec 2024 11:29:41 +0000
Received: from localhost ([127.0.0.1]:59717 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tQ36a-0002SP-O9
for submit <at> debbugs.gnu.org; Tue, 24 Dec 2024 06:29:40 -0500
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:51401
helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <herman@HIDDEN>) id 1tQ36X-0002SB-UB
for 74979 <at> debbugs.gnu.org; Tue, 24 Dec 2024 06:29:38 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
t=1735039768;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:content-type:content-type:
in-reply-to:in-reply-to:references:references;
bh=pbPZX9R0l2x8ruC3Gq31Fzq5xaH4qubTOBWpr5cmflA=;
b=Vqo/IDSe0dAE2q/HDT1ppOd0aQUH0wbg4SZbG8xsuEsTmOat4oJ2TRpMPnYJpy8wahrax+
NNMdCAFJey7uQ6M+xRrX5ej7WzNP61VC9F1lxG2iYFEEz0m4F6BF4YaQCDMOIULU7OiBZV
dwFEu05LfR6GArkb7qkIZ7wCVTBq9xyZ6ZI4MTN5IVvnbJl6Fo6wA2SZ9Q6qvOZ6WXiJaD
MgCUK2Fe+MFjbs8/w43a9i4EpwLNIMQMhP7dWNSS1Eu7WEvyyTXQZHlXOmZ6HBl5iIszmI
UteEcI1hlAHwR3OIipmMEslz/+2J29Qu8qL+mVjKkih1sP4l6cb7qb632GKPZA==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 964a9f39
(TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO);
Tue, 24 Dec 2024 11:29:28 +0000 (UTC)
Date: Tue, 24 Dec 2024 12:28:45 +0100
From: Herman Rimm <herman@HIDDEN>
Message-ID: <yj4mzm422sh2kmjacpw2pcgjbykrzzipmvll5c6ygyqvuhnim6@spykgwusvgyf>
References: <cover.1734636205.git.herman@HIDDEN> <87ttau8g1k.fsf@HIDDEN>
<mnyemf53orphuunwlle7vfpljqqrlv2kujextlh4pifllv3b6w@uhlhq6ycuohc>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <mnyemf53orphuunwlle7vfpljqqrlv2kujextlh4pifllv3b6w@uhlhq6ycuohc>
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Hi again,
On Tue, Dec 24, 2024 at 11:42:58AM +0100, Herman Rimm wrote:
> > Not sure, do you have an example on how to trigger it?
>
> Yeah, for example:
>
> $ guix style -fA gnu/packages/crates-io.scm
Just to be clear, this will only work if you are using a Guix channel
with this patch series already applied. Instead, you probably want to
run (in a Git checkout with the patch series applied):
./pre-inst-env guix style -fA gnu/packages/crates-io.scm
Cheers,
Herman
X-Loop: help-debbugs@HIDDEN
Subject: [bug#74979] [PATCH v2 1/4] scripts: style: Refactor order-packages.
References: <cover.1734636205.git.herman@HIDDEN>
In-Reply-To: <cover.1734636205.git.herman@HIDDEN>
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix@HIDDEN, dev@HIDDEN, ludo@HIDDEN, othacehe@HIDDEN, zimon.toutoune@HIDDEN, me@HIDDEN, guix-patches@HIDDEN
Resent-Date: Tue, 21 Jan 2025 21:45:02 +0000
Resent-Message-ID: <handler.74979.B74979.173749584331105 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 74979
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 74979 <at> debbugs.gnu.org
Cc: Christopher Baines <guix@HIDDEN>, Josselin Poiret <dev@HIDDEN>, Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>, Mathieu Othacehe <othacehe@HIDDEN>, Simon Tournier <zimon.toutoune@HIDDEN>, Tobias Geerinckx-Rice <me@HIDDEN>
X-Debbugs-Original-Xcc: Christopher Baines <guix@HIDDEN>, Josselin Poiret <dev@HIDDEN>, Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>, Mathieu Othacehe <othacehe@HIDDEN>, Simon Tournier <zimon.toutoune@HIDDEN>, Tobias Geerinckx-Rice <me@HIDDEN>
Received: via spool by 74979-submit <at> debbugs.gnu.org id=B74979.173749584331105
(code B ref 74979); Tue, 21 Jan 2025 21:45:02 +0000
Received: (at 74979) by debbugs.gnu.org; 21 Jan 2025 21:44:03 +0000
Received: from localhost ([127.0.0.1]:57425 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1taM2T-00085R-W2
for submit <at> debbugs.gnu.org; Tue, 21 Jan 2025 16:44:03 -0500
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:49925
helo=email.rimm.ee)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <herman@HIDDEN>) id 1taM2P-000844-EE
for 74979 <at> debbugs.gnu.org; Tue, 21 Jan 2025 16:43:58 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
t=1737495829;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:
content-transfer-encoding:content-transfer-encoding;
bh=30v6jVGqH9po8TSEVb3R+Ns0+hFuV0Bs43FS/2XNtsE=;
b=dXIp+FApV0Ay7KXtGJQ3+MW38QafesrKQGZFUwJqcsJPYPFjwrERSNT1m2qeqVyJcwH+MO
tPrknkg5p4Yecdk0Kmv/R51cxtQ27UOBoN1jjSWrJG8Bqj+pd/jU1Vb5Q+gfdPseAlTQNe
HnLYgV6puFxz90/60qP67+TqojFYht79NjnXxzHwDq3//to3tiriR/1mPLwukC2DrqGJWj
wNmHT2pLNQVjy+d/xcOcla8T5WS5aCIStM0/Qq1NlU/2DQer8JbEam0IrpGKFEQzBj9X4j
yLpxkUiSeuwae4ucTEOkF72ODE3wMkYc2P+odFLGSyvKlNchMjt09uXRFC/ZKA==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 56f62fa2
(TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
for <74979 <at> debbugs.gnu.org>; Tue, 21 Jan 2025 21:43:49 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Tue, 21 Jan 2025 22:43:00 +0100
Message-ID: <a7bb27cee522c0f89aba50b5b1ff412a8fcf1249.1737495587.git.herman@HIDDEN>
X-Mailer: git-send-email 2.47.1
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* guix/scripts/style.scm (order-packages): Combine package-name and
package-version procedures into package-fields.
(format-whole-file): Do not sort copyright headers or module definition.
Change-Id: I5507bf8ed221f7017f972f0e0e64d149bea4854b
---
guix/scripts/style.scm | 36 +++++++++++++++---------------------
1 file changed, 15 insertions(+), 21 deletions(-)
diff --git a/guix/scripts/style.scm b/guix/scripts/style.scm
index 51234952e91..4b704ddfb7e 100644
--- a/guix/scripts/style.scm
+++ b/guix/scripts/style.scm
@@ -43,6 +43,7 @@ (define-module (guix scripts style)
#:use-module (ice-9 match)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-9)
+ #:use-module (srfi srfi-11)
#:use-module (srfi srfi-26)
#:use-module (srfi srfi-34)
#:use-module (srfi srfi-37)
@@ -500,31 +501,19 @@ (define (order-packages lst)
"Return LST, a list of top-level expressions and blanks, with
top-level package definitions in alphabetical order. Packages which
share a name are placed with versions in descending order."
- (define (package-name pkg)
+ (define (package-fields pkg)
(match pkg
((('define-public _ expr) _ ...)
(match expr
- ((or ('package _ ('name name) _ ...)
- ('package ('name name) _ ...))
- name)
- (_ #f)))
- (_ #f)))
-
- (define (package-version pkg)
- (match pkg
- ((('define-public _ expr) _ ...)
- (match expr
- ((or ('package _ _ ('version version) _ ...)
- ('package _ ('version version) _ ...))
- version)
- (_ #f)))
- (_ #f)))
+ ((or ('package _ ('name name) ('version version) _ ...)
+ ('package ('name name) ('version version) _ ...))
+ (values name version))
+ (_ (values #f #f))))
+ (_ (values #f #f))))
(define (package>? lst1 lst2)
- (let ((name1 (package-name lst1))
- (name2 (package-name lst2))
- (version1 (package-version lst1))
- (version2 (package-version lst2)))
+ (let-values (((name1 version1) (package-fields lst1))
+ ((name2 version2) (package-fields lst2)))
(and name1 name2 (or (string>? name1 name2)
(and (string=? name1 name2)
version1
@@ -550,7 +539,12 @@ (define* (format-whole-file file order? #:rest rest)
(let* ((lst (call-with-input-file file read-with-comments/sequence
#:guess-encoding #t))
(lst (if order?
- (order-packages lst)
+ (let loop ((lst lst))
+ (match lst
+ (((? blank? blank) rest ...)
+ (cons blank (loop rest)))
+ ((module rest ...)
+ (cons module (order-packages rest)))))
lst)))
(with-atomic-file-output file
(lambda (port)
base-commit: 6dd219387940ba02db02cc81b35cd7437c108287
--
2.47.1
X-Loop: help-debbugs@HIDDEN
Subject: [bug#74979] [PATCH v2 2/4] scripts: style: Sort more kinds of package definitions.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix@HIDDEN, dev@HIDDEN, ludo@HIDDEN, othacehe@HIDDEN, zimon.toutoune@HIDDEN, me@HIDDEN, guix-patches@HIDDEN
Resent-Date: Tue, 21 Jan 2025 21:45:03 +0000
Resent-Message-ID: <handler.74979.B74979.173749584431125 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 74979
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 74979 <at> debbugs.gnu.org
Cc: Christopher Baines <guix@HIDDEN>, Josselin Poiret <dev@HIDDEN>, Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>, Mathieu Othacehe <othacehe@HIDDEN>, Simon Tournier <zimon.toutoune@HIDDEN>, Tobias Geerinckx-Rice <me@HIDDEN>
X-Debbugs-Original-Xcc: Christopher Baines <guix@HIDDEN>, Josselin Poiret <dev@HIDDEN>, Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>, Mathieu Othacehe <othacehe@HIDDEN>, Simon Tournier <zimon.toutoune@HIDDEN>, Tobias Geerinckx-Rice <me@HIDDEN>
Received: via spool by 74979-submit <at> debbugs.gnu.org id=B74979.173749584431125
(code B ref 74979); Tue, 21 Jan 2025 21:45:03 +0000
Received: (at 74979) by debbugs.gnu.org; 21 Jan 2025 21:44:04 +0000
Received: from localhost ([127.0.0.1]:57427 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1taM2V-00085c-5Y
for submit <at> debbugs.gnu.org; Tue, 21 Jan 2025 16:44:04 -0500
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:49925
helo=email.rimm.ee)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <herman@HIDDEN>) id 1taM2R-000844-8W
for 74979 <at> debbugs.gnu.org; Tue, 21 Jan 2025 16:44:00 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
t=1737495829;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=AIsNtxSnvTom4sJWmoAfk+arhgMo6vzT/hun7vtY9B4=;
b=RMM3NiSI/DPVaobno3rdKsbXjCzRd5vxORSyqzsI8iuZ41QhwAMU5is+Dt/M1FyklZg4LH
iDZpU7y2CLGtcnLAnkdAK/M54MJP9uOthRMjEGmXjirDj0KzljPZFw0l6BOtl41SuqKIdy
T00Igtvz8Gf55mYBBqW2U+8sZmmSBEHSwX/G25q/RwWsrn14mzGxzlR8x3LQl1kcrvpZtW
5xN48pN9NYajjYzpUNK0Zo8smYj/m3RfWnbn8P2wen75hi/t4cFPHEaATw03Eg/Ndv1oke
52cfBWFriMtSBx7R48vzCRVopDtYLq0tDCGmtw/+WunKEfHk5j+CitCVn3ZEiQ==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 894d8f7a
(TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
for <74979 <at> debbugs.gnu.org>; Tue, 21 Jan 2025 21:43:49 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Tue, 21 Jan 2025 22:43:01 +0100
Message-ID: <71ca4b6a08f7610dfcb7df41b73b16a0171fb252.1737495587.git.herman@HIDDEN>
X-Mailer: git-send-email 2.47.1
In-Reply-To: <a7bb27cee522c0f89aba50b5b1ff412a8fcf1249.1737495587.git.herman@HIDDEN>
References: <a7bb27cee522c0f89aba50b5b1ff412a8fcf1249.1737495587.git.herman@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* guix/scripts/style.scm (order-packages): Match comments before package
S-exp. and its fields. Match in let. Match package/inherit.
* tests/guix-style.sh: Add pkg-baz variable and package/inherit to test.
Change-Id: I48a5976930501c20415b5413966b5294958bc23b
---
guix/scripts/style.scm | 13 +++++++------
tests/guix-style.sh | 10 ++++++++--
2 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/guix/scripts/style.scm b/guix/scripts/style.scm
index 4b704ddfb7e..6f07f6c3b9e 100644
--- a/guix/scripts/style.scm
+++ b/guix/scripts/style.scm
@@ -503,13 +503,14 @@ (define (order-packages lst)
share a name are placed with versions in descending order."
(define (package-fields pkg)
(match pkg
- ((('define-public _ expr) _ ...)
+ ((('define-public pkg _ ... (or ('let _ expr) expr)) _ ...)
(match expr
- ((or ('package _ ('name name) ('version version) _ ...)
- ('package ('name name) ('version version) _ ...))
- (values name version))
- (_ (values #f #f))))
- (_ (values #f #f))))
+ (((or 'package 'package/inherit) fields ...)
+ (let ((name (and=> (assoc-ref fields 'name) first))
+ (version (and=> (assoc-ref fields 'version) first)))
+ (values name version)))
+ (_ (and (values #f #f)))))
+ (_ (and (values #f #f)))))
(define (package>? lst1 lst2)
(let-values (((name1 version1) (package-fields lst1))
diff --git a/tests/guix-style.sh b/tests/guix-style.sh
index 93331394353..703e148b699 100644
--- a/tests/guix-style.sh
+++ b/tests/guix-style.sh
@@ -65,10 +65,16 @@ cat > "$tmpfile" <<EOF
(name "bar")
(version "2")))
+(define-public pkg-baz
+ (let ()
+ (package
+ (name "baz")
+ (version "2"))))
+
;; The comment below belongs to the foo package.
(define-public pkg
- (package
- (name "bar")
+ (package/inherit pkg-baz
+ (name "baz")
(version "1")))
;; Incomplete package definitions in alphabetical order.
--
2.47.1
X-Loop: help-debbugs@HIDDEN
Subject: [bug#74979] [PATCH v2 3/4] scripts: style: Only sort packages with string literal name.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix@HIDDEN, dev@HIDDEN, ludo@HIDDEN, othacehe@HIDDEN, zimon.toutoune@HIDDEN, me@HIDDEN, guix-patches@HIDDEN
Resent-Date: Tue, 21 Jan 2025 21:45:05 +0000
Resent-Message-ID: <handler.74979.B74979.173749585031153 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 74979
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 74979 <at> debbugs.gnu.org
Cc: Christopher Baines <guix@HIDDEN>, Josselin Poiret <dev@HIDDEN>, Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>, Mathieu Othacehe <othacehe@HIDDEN>, Simon Tournier <zimon.toutoune@HIDDEN>, Tobias Geerinckx-Rice <me@HIDDEN>
X-Debbugs-Original-Xcc: Christopher Baines <guix@HIDDEN>, Josselin Poiret <dev@HIDDEN>, Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>, Mathieu Othacehe <othacehe@HIDDEN>, Simon Tournier <zimon.toutoune@HIDDEN>, Tobias Geerinckx-Rice <me@HIDDEN>
Received: via spool by 74979-submit <at> debbugs.gnu.org id=B74979.173749585031153
(code B ref 74979); Tue, 21 Jan 2025 21:45:05 +0000
Received: (at 74979) by debbugs.gnu.org; 21 Jan 2025 21:44:10 +0000
Received: from localhost ([127.0.0.1]:57429 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1taM2b-00086L-CC
for submit <at> debbugs.gnu.org; Tue, 21 Jan 2025 16:44:09 -0500
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:49925
helo=email.rimm.ee)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <herman@HIDDEN>) id 1taM2S-000844-Bg
for 74979 <at> debbugs.gnu.org; Tue, 21 Jan 2025 16:44:00 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
t=1737495830;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=7OEIy5IctDduuOgo6HgVRV8OJxehqp/pAvlmlIkpjL0=;
b=i4T3guJR6DtS+Dy+5L2NkbCrKiDN9kv1Af0ayoXU9+k/3+Rf2FqEzocSwZ2u2j8SgwfC3m
2oZG47kYVEaleMt3rh7qM59zTVNUlFAqWSbCR9ASZPQw8O9h40FJwW7w1INCfMei+Vg3d5
eT+x67qA6lgNfq6f7zhUKUAnRcLqhoUt7+ZHuC9Wio1MC5wdlyvcmmUnKJdP6DIYwqAqdX
lCoTDExYlG2kNdR3mTRb3ILgkyZJi/6iZqJhhQEEXMRtcmClQrfpqnF9rrHwdsNxuYrGjz
aFyCKeA5BTPUS28TzEMDyO5JJl2kmySOb4L6wXIxMGvF4aXWn0tcGOPRLye6cg==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id b1765ea5
(TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
for <74979 <at> debbugs.gnu.org>; Tue, 21 Jan 2025 21:43:50 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Tue, 21 Jan 2025 22:43:02 +0100
Message-ID: <f18def074591f5b45d8deb210ae17f599d8721e5.1737495587.git.herman@HIDDEN>
X-Mailer: git-send-email 2.47.1
In-Reply-To: <a7bb27cee522c0f89aba50b5b1ff412a8fcf1249.1737495587.git.herman@HIDDEN>
References: <a7bb27cee522c0f89aba50b5b1ff412a8fcf1249.1737495587.git.herman@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* guix/scripts/style.scm (order-packages): Only match string literals.
Change-Id: I48a5976930501c20415b5413966b5294958bc23b
---
guix/scripts/style.scm | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/guix/scripts/style.scm b/guix/scripts/style.scm
index 6f07f6c3b9e..4801529f7e9 100644
--- a/guix/scripts/style.scm
+++ b/guix/scripts/style.scm
@@ -515,11 +515,13 @@ (define (order-packages lst)
(define (package>? lst1 lst2)
(let-values (((name1 version1) (package-fields lst1))
((name2 version2) (package-fields lst2)))
- (and name1 name2 (or (string>? name1 name2)
- (and (string=? name1 name2)
- version1
- version2
- (version>? version2 version1))))))
+ (and (string? name1)
+ (string? name2)
+ (or (string>? name1 name2)
+ (and (string=? name1 name2)
+ (string? version1)
+ (string? version2)
+ (version>? version2 version1))))))
;; Group define-public with preceding blanks and defines.
(let ((lst (fold2 (lambda (expr tail head)
--
2.47.1
X-Loop: help-debbugs@HIDDEN
Subject: [bug#74979] [PATCH v2 4/4] scripts: style: Warn about unmatched package definitions.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix@HIDDEN, dev@HIDDEN, ludo@HIDDEN, othacehe@HIDDEN, zimon.toutoune@HIDDEN, me@HIDDEN, guix-patches@HIDDEN
Resent-Date: Tue, 21 Jan 2025 21:45:07 +0000
Resent-Message-ID: <handler.74979.B74979.173749585031161 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 74979
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 74979 <at> debbugs.gnu.org
Cc: Christopher Baines <guix@HIDDEN>, Josselin Poiret <dev@HIDDEN>, Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>, Mathieu Othacehe <othacehe@HIDDEN>, Simon Tournier <zimon.toutoune@HIDDEN>, Tobias Geerinckx-Rice <me@HIDDEN>
X-Debbugs-Original-Xcc: Christopher Baines <guix@HIDDEN>, Josselin Poiret <dev@HIDDEN>, Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>, Mathieu Othacehe <othacehe@HIDDEN>, Simon Tournier <zimon.toutoune@HIDDEN>, Tobias Geerinckx-Rice <me@HIDDEN>
Received: via spool by 74979-submit <at> debbugs.gnu.org id=B74979.173749585031161
(code B ref 74979); Tue, 21 Jan 2025 21:45:07 +0000
Received: (at 74979) by debbugs.gnu.org; 21 Jan 2025 21:44:10 +0000
Received: from localhost ([127.0.0.1]:57431 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1taM2b-00086P-Pa
for submit <at> debbugs.gnu.org; Tue, 21 Jan 2025 16:44:10 -0500
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:49925
helo=email.rimm.ee)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <herman@HIDDEN>) id 1taM2T-000844-4C
for 74979 <at> debbugs.gnu.org; Tue, 21 Jan 2025 16:44:01 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
t=1737495831;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=jd9nTtUaa1xGdmEeNzmP1Frod5T7qlhRCsNQuZlWaFA=;
b=VaLBu36t6Fb4mCIntY9LvxeJOhJKqhUuCuNUwLABkHOdEn8zqI+LmeFehPQAbzRP5mPkPd
VBxwTuK89QWNpz8zo6iRoEGTs7QDyvDz97i3kThRHEO5Mbl7/TfuM16+vUMO6paB4SZvOR
dE890hQVfC4kvsUX7fKQ/DlQh+d99U71ujueHhkXUfF+48lmm63fdrI/UcVpMzZNyRuZtH
M7G2+EnFej5piSdYhsvB+9AWhMuQL/JAFGpdqLVR+gBAQnrdP0dVujD+hG1qAg6cmLnPW3
PChdeHxOY3HQV4XFJWs2ksd5U9aY86T8WNGGsrqzC3fVpVDpD0RQkNl0XWGJ2g==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 3299245e
(TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
for <74979 <at> debbugs.gnu.org>; Tue, 21 Jan 2025 21:43:51 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Tue, 21 Jan 2025 22:43:03 +0100
Message-ID: <7c2818a626dcece74e293363fd58023543f0df91.1737495587.git.herman@HIDDEN>
X-Mailer: git-send-email 2.47.1
In-Reply-To: <a7bb27cee522c0f89aba50b5b1ff412a8fcf1249.1737495587.git.herman@HIDDEN>
References: <a7bb27cee522c0f89aba50b5b1ff412a8fcf1249.1737495587.git.herman@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* guix/scripts/style.scm (order-packages): Warn.
Change-Id: Iddbf979ee9ee5ed1ebada63776a390db024154fa
---
guix/scripts/style.scm | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/guix/scripts/style.scm b/guix/scripts/style.scm
index 4801529f7e9..2555b3c6108 100644
--- a/guix/scripts/style.scm
+++ b/guix/scripts/style.scm
@@ -508,9 +508,15 @@ (define (order-packages lst)
(((or 'package 'package/inherit) fields ...)
(let ((name (and=> (assoc-ref fields 'name) first))
(version (and=> (assoc-ref fields 'version) first)))
+ (if (and name version)
+ (unless (and (string? name) (string? version))
+ (warning (G_ "non-string name/version for ~a~%") pkg))
+ (warning (G_ "package fields not found for ~a~%") pkg))
(values name version)))
- (_ (and (values #f #f)))))
- (_ (and (values #f #f)))))
+ (_ (warning (G_ "package record missing for ~a~%") pkg)
+ (values #f #f))))
+ (_ (info (G_ "not sorting top-level S-exp.: ~a~%") pkg)
+ (values #f #f))))
(define (package>? lst1 lst2)
(let-values (((name1 version1) (package-fields lst1))
--
2.47.1
X-Loop: help-debbugs@HIDDEN
Subject: [bug#74979] [PATCH v2 1/4] scripts: style: Refactor order-packages.
Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Sun, 09 Feb 2025 16:13:02 +0000
Resent-Message-ID: <handler.74979.B74979.173911755419083 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 74979
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: Herman Rimm <herman@HIDDEN>
Cc: Josselin Poiret <dev@HIDDEN>, Simon Tournier <zimon.toutoune@HIDDEN>, Mathieu Othacehe <othacehe@HIDDEN>, Tobias Geerinckx-Rice <me@HIDDEN>, 74979 <at> debbugs.gnu.org, Christopher Baines <guix@HIDDEN>
Received: via spool by 74979-submit <at> debbugs.gnu.org id=B74979.173911755419083
(code B ref 74979); Sun, 09 Feb 2025 16:13:02 +0000
Received: (at 74979) by debbugs.gnu.org; 9 Feb 2025 16:12:34 +0000
Received: from localhost ([127.0.0.1]:45930 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1th9v7-0004xj-Q4
for submit <at> debbugs.gnu.org; Sun, 09 Feb 2025 11:12:34 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10]:48632)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <ludo@HIDDEN>) id 1th9v2-0004xK-4I
for 74979 <at> debbugs.gnu.org; Sun, 09 Feb 2025 11:12:32 -0500
Received: from fencepost.gnu.org ([2001:470:142:3::e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <ludo@HIDDEN>)
id 1th9ut-0001av-EW; Sun, 09 Feb 2025 11:12:19 -0500
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To:
From; bh=q65xfrRG4O+mLqaHPeM0k6mZ457YoxXButwPlVxmFxc=; b=bJtUTIGWiOzw+Kf+ONN0
p0zgy/l7rsuQFfVi91Rg5gJcPXe1HHBOQIb6pcBgbJFz7/5TtboQW+c8wh9ddtFCWD5RJOMOcluX8
DYNFSHJdMZnRnNLAa3GFROoV4fQYxL1iyCjd7eeG0eqXcPgHfJRW/Cvga5KWsFFZOuVoEm6MSV332
ub1RJ6T/3qT9AIgjNhApeodEeC9+3VkryYdPVTs+A8aQTAsSZ3clL0SzDcSAzJ2VCDMPfu1KI3OJh
MN6dGoKsdIylujju4VSNhJBMy5BKfx1K/Ke5Im423L7a6sjHf5w2t6kAdjsNbLBYGulc++xyYYK/h
kxqH8E5/6HIvpQ==;
From: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
In-Reply-To: <a7bb27cee522c0f89aba50b5b1ff412a8fcf1249.1737495587.git.herman@HIDDEN>
(Herman Rimm's message of "Tue, 21 Jan 2025 22:43:00 +0100")
References: <cover.1734636205.git.herman@HIDDEN>
<a7bb27cee522c0f89aba50b5b1ff412a8fcf1249.1737495587.git.herman@HIDDEN>
Date: Sun, 09 Feb 2025 17:11:50 +0100
Message-ID: <87y0yfqerd.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -2.3 (--)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
Hi,
With the warnings added in patch #4, =E2=80=98tests/guix-style.log=E2=80=99=
reads this:
--8<---------------cut here---------------start------------->8---
guix style: not sorting top-level S-exp.: ((operating-system (host-name kom=
putilo) (locale eo_EO.UTF-8) #<<vertical-space> height: 1> #<<comment> str:=
";; User accounts.\n" margin?: #f> (users (cons (user-account (name alice)=
(comment Bob's sister) (group users) #<<vertical-space> height: 1> #<<comm=
ent> str: ";; Groups fit on one line.\n" margin?: #f> (supplementary-groups=
(quote (wheel audio video)))) %base-user-accounts)) #<<vertical-space> hei=
ght: 1> #<<com
--8<---------------cut here---------------end--------------->8---
(It goes on on several lines.)
This is below our standards and probably hard to use in practice. I
think a better solution here would be to report the source code
location:
(info loc (G_ "ignoring s-expression~%"))
The problem is how to get source location information.
I see two options:
1. (read-enable 'positions) and hope that =E2=80=98read-with-comments=E2=
=80=99
preserves or augments source location info from =E2=80=98read=E2=80=99=
using the
=E2=80=98source-properties=E2=80=99 side table. Not pretty.
2. Have =E2=80=98read-with-comments=E2=80=99 insert zero-length blanks wi=
th source
location info right before top-level definitions, which would allow
us to get partial source location info. Not great either, but
avoids the memory-hungry side table.
Thoughts?
For now I=E2=80=99ve applied everything except patch #4.
Thanks,
Ludo=E2=80=99.
Received: (at control) by debbugs.gnu.org; 18 Feb 2025 16:55:34 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue Feb 18 11:55:33 2025 Received: from localhost ([127.0.0.1]:60027 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tkQsf-0003WA-Fn for submit <at> debbugs.gnu.org; Tue, 18 Feb 2025 11:55:33 -0500 Received: from mail3-relais-sop.national.inria.fr ([192.134.164.104]:17466) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <ludo@HIDDEN>) id 1tkQsd-0003VL-39 for control <at> debbugs.gnu.org; Tue, 18 Feb 2025 11:55:31 -0500 Authentication-Results: mail3-relais-sop.national.inria.fr; dkim=none (message not signed) header.i=none; spf=SoftFail smtp.mailfrom=ludo@HIDDEN; dmarc=fail (p=none dis=none) d=gnu.org X-IronPort-AV: E=Sophos;i="6.13,296,1732575600"; d="scan'208";a="109442542" Received: from unknown (HELO ribbon) ([193.50.110.84]) by mail3-relais-sop.national.inria.fr with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Feb 2025 17:55:23 +0100 Date: Tue, 18 Feb 2025 17:55:22 +0100 Message-Id: <87h64rjipx.fsf@HIDDEN> To: control <at> debbugs.gnu.org From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN> Subject: control message for bug #74979 MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -2.3 (--) tags 74979 + moreinfo quit
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.