From patchwork Tue Jan 21 21:43:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 37484 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 279A827BBEA; Tue, 21 Jan 2025 21:45:37 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 A50E227BBE2 for ; Tue, 21 Jan 2025 21:45:36 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1taM3d-0007mJ-BU; Tue, 21 Jan 2025 16:45:13 -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 1taM3Y-0007eg-T6 for guix-patches@gnu.org; Tue, 21 Jan 2025 16:45:09 -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 1taM3X-0006Ps-HU; Tue, 21 Jan 2025 16:45:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=30v6jVGqH9po8TSEVb3R+Ns0+hFuV0Bs43FS/2XNtsE=; b=aUZqPj0AEtQw8VRO02n78lgKSUcHlzS00g83xnLCRPvucC3nqMJ4j2IdIS/DfcUqQeMWKKF6wlhyEdN4O7Y9s9tzbmNx3iq/BIEeu7DzD7EX7q/e1gz0y2/aQZvu6Dgg/HBBzGorZGi3SKOYIjBnTTT/9CHoVY6CCPkJA67W53oL3u2hKfVx3EOY1B3MXAAQ5TwkIkysvTMdZiEbK1RU+gqVJ+SorsbLMxXCRuIGXNTOPa6RWelT+mxnvi/JAkpHjnwPiGmTaW28fR8vP17dooxmvosm8Oq07U35WcBNxCxYyy2lvzntnnVZ09Zt4g93MZ+EBNje/OEWIlLJ9JvQFg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1taM3S-00089S-Fl; Tue, 21 Jan 2025 16:45:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74979] [PATCH v2 1/4] scripts: style: Refactor order-packages. References: In-Reply-To: Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Tue, 21 Jan 2025 21:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74979 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74979@debbugs.gnu.org Cc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 74979-submit@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 ) id 1taM2T-00085R-W2 for submit@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 ) id 1taM2P-000844-EE for 74979@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@debbugs.gnu.org>; Tue, 21 Jan 2025 21:43:49 +0000 (UTC) Date: Tue, 21 Jan 2025 22:43:00 +0100 Message-ID: X-Mailer: git-send-email 2.47.1 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: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches X-Patchwork-Original-From: Herman Rimm via Guix-patches via From: Herman Rimm 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/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(-) base-commit: 6dd219387940ba02db02cc81b35cd7437c108287 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) From patchwork Tue Jan 21 21:43:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 37482 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 24E0427BBE9; Tue, 21 Jan 2025 21:45:35 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 6D8F827BBEB for ; Tue, 21 Jan 2025 21:45:32 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1taM3l-0007ox-SS; Tue, 21 Jan 2025 16:45:22 -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 1taM3Z-0007ev-0y for guix-patches@gnu.org; Tue, 21 Jan 2025 16:45:09 -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 1taM3Y-0006QK-Mw; Tue, 21 Jan 2025 16:45:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=AIsNtxSnvTom4sJWmoAfk+arhgMo6vzT/hun7vtY9B4=; b=C7Bvly7gioXwfvoZ24NeMPJjQVtsO/Sihe5wvTHoaxZ1dlHvDBKFW5M85WGy3sD7afN1HXrIuAdm1uqFWqH7BlOcqTYt2pBR3eTsk4kl/gxqvDQ8ErM51TkpV0ZlGIgLC8NPnWtKXv/Uu/9mUSm1cB74MTrn3h+JaDwpiTI80+xm+D3+bNUjbIu4fT57pspOvMQBiIyM/wK5Z2Rzps1/JeGMfG6tpuAWoPLZaOk4XS1QFEmEutxKjMrPJUedzTI6tSAH3lrJKUjbMEjdfawKF2sLrtn0D/95XNPVFuA5kPcLrhTLdIDsMUE8NBmgHGoSrMrEyRsxvSsk8gSve5XPuA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1taM3T-00089m-K8; Tue, 21 Jan 2025 16:45:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74979] [PATCH v2 2/4] scripts: style: Sort more kinds of package definitions. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Tue, 21 Jan 2025 21:45:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74979 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74979@debbugs.gnu.org Cc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 74979-submit@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 ) id 1taM2V-00085c-5Y for submit@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 ) id 1taM2R-000844-8W for 74979@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@debbugs.gnu.org>; Tue, 21 Jan 2025 21:43:49 +0000 (UTC) Date: Tue, 21 Jan 2025 22:43:01 +0100 Message-ID: <71ca4b6a08f7610dfcb7df41b73b16a0171fb252.1737495587.git.herman@rimm.ee> X-Mailer: git-send-email 2.47.1 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: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches X-Patchwork-Original-From: Herman Rimm via Guix-patches via From: Herman Rimm 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/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" < X-Patchwork-Id: 37481 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 F083627BBEE; Tue, 21 Jan 2025 21:45:33 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 699F227BBE9 for ; Tue, 21 Jan 2025 21:45:32 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1taM3j-0007nq-A7; Tue, 21 Jan 2025 16:45: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 ) id 1taM3Z-0007ew-Fn for guix-patches@gnu.org; Tue, 21 Jan 2025 16:45:09 -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 1taM3Y-0006Q9-Hg; Tue, 21 Jan 2025 16:45:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=7OEIy5IctDduuOgo6HgVRV8OJxehqp/pAvlmlIkpjL0=; b=A57eNYNeXftiT/5qQ05wjyeuvojgCnWmQoMfYRVR9BAQP0iyz6ngYm5FsGpPgQpzA30T/hcbJHNiHQ8xZ2U7LO2c5PG8+D9Guh2cC+Hm02bgcfkSBHPSZqXGN+t3AnlatYTSuoECRgRuCBOG0jXsg7CDrqc38t0TS3sNY0WaTtIVzdIsSueapuslUef3sHfCKRy4iEzQWHkLr/ZBuCd5aNr7LcB1ThfqBDHMO1Vd96xZ/Vao499E6b3hqNlxyU867Q6e9i09SckUe3+CXYNTfp3zZlTvqiZX24RJj1NryHBIQ4QUZHGdMn0dXa3YKucjYvweB8OlPEXJFa2Cbfrn3Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1taM3V-0008B6-7y; Tue, 21 Jan 2025 16:45:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74979] [PATCH v2 3/4] scripts: style: Only sort packages with string literal name. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Tue, 21 Jan 2025 21:45:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74979 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74979@debbugs.gnu.org Cc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 74979-submit@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 ) id 1taM2b-00086L-CC for submit@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 ) id 1taM2S-000844-Bg for 74979@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@debbugs.gnu.org>; Tue, 21 Jan 2025 21:43:50 +0000 (UTC) Date: Tue, 21 Jan 2025 22:43:02 +0100 Message-ID: X-Mailer: git-send-email 2.47.1 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: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches X-Patchwork-Original-From: Herman Rimm via Guix-patches via From: Herman Rimm 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/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) From patchwork Tue Jan 21 21:43:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 37483 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 79BFC27BBE2; Tue, 21 Jan 2025 21:45:36 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 6FE3C27BBEC for ; Tue, 21 Jan 2025 21:45:32 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1taM3m-0007py-5h; Tue, 21 Jan 2025 16:45:23 -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 1taM3b-0007lw-PY for guix-patches@gnu.org; Tue, 21 Jan 2025 16:45:11 -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 1taM3b-0006Qv-7z; Tue, 21 Jan 2025 16:45:11 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=jd9nTtUaa1xGdmEeNzmP1Frod5T7qlhRCsNQuZlWaFA=; b=rCjY11HuHMlHyWy3/w8HPHvZW3SjrTo5l9lEPZCcts3Hv3TKCjAh+O0TPQ9HmqDgq1duLMvsQrcRjBzftL4k92INrvSVOKuqQCZlaMFRmakbCOc6aG5I4+SdRkLy9E/KPyvL05pe5xJatfLQZAI/n+geXiAEv9i0U4PGX2BEUW/WJTziipH1h4lE3vLDAVY35RHOeFj7fOVvxVAo3Bl6GcZWmfFxBCya9RKv0RRnvjOk3sFvXwoHY5f3YmtcXrn08zKeZhY5R1HCy55Zv9m+yTY/Eu5l2JIiqxKE4vfS9kblCDrBfmzgzXFSky8OYboGmTT+Vv7pQV21oFrkSaFACg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1taM3X-0008D6-49; Tue, 21 Jan 2025 16:45:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74979] [PATCH v2 4/4] scripts: style: Warn about unmatched package definitions. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Tue, 21 Jan 2025 21:45:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74979 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74979@debbugs.gnu.org Cc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 74979-submit@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 ) id 1taM2b-00086P-Pa for submit@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 ) id 1taM2T-000844-4C for 74979@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@debbugs.gnu.org>; Tue, 21 Jan 2025 21:43:51 +0000 (UTC) Date: Tue, 21 Jan 2025 22:43:03 +0100 Message-ID: <7c2818a626dcece74e293363fd58023543f0df91.1737495587.git.herman@rimm.ee> X-Mailer: git-send-email 2.47.1 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: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches X-Patchwork-Original-From: Herman Rimm via Guix-patches via From: Herman Rimm 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/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))