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" <