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)