From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id +I+ME4h1ZGfklQAAe85BDQ:P1 (envelope-from ) for ; Thu, 19 Dec 2024 19:35:36 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id +I+ME4h1ZGfklQAAe85BDQ (envelope-from ) for ; Thu, 19 Dec 2024 20:35:36 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=GEufIJXC; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=rRTdsfMA; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1734636935; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=kgsostRT8tT8RjtyY070f2oua+b1EeF4/Ahdh3L16pw=; b=K5xQ/8Bayhoq9hAt6gSFET5KtFR6BcvoWN+o9Xq6va0hsdW2H1/0qYWlfrxU1LBgI6FAf4 UI4i/42EZznitZMJnBLIqvloKlM3crXUfoFOneZDG9G48OK9gFFHuu81tiSO/T8YjNZzbD 1rXL/4zvwLht8w1BVgh6J+Y59jTTesFPcNf4TQRLFca+rP7tafIrqwTshlxo42gcLwIp3m Yg4ezDDOwXqaAJTeqBuECDUZha+InMZD+EPbMgvuLC88ABq1oGVmOyJUtgpoNJ7MsKoRKx 2eaAuXfIkxWVySiJzF7LnBVEAqy9jAOAo4VAtqtww2R11YkW1qm/4YExws+hJA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1734636935; a=rsa-sha256; cv=none; b=eeTaJRzCzC7WURhty0P8Vuy+RWtclIWSwBM6mUBSJFbQDN5m8WKLFKeNH/hJuBwhBNadrm vC5MWbZKKUvsZJnIB3DpM955fDO0TpO5Ty5e94/Um8k3yZg0cpIYoUrfHcXNRSTtJjLj63 F+TmXYH0LnTvmYbpna1Ce8tO+g+6m8qChmW8zI6cV7m7MsnNwyejD9ZYtq3GpQz0UOpJ/b y4wTNra+0A8tOqa9nGTbKQWVAIV8hIJYz9+E9KlMNE3B6NUdpB65GkBbxWMkPCKZOfX6Ul FFmwEzncGAjECyWmnyNBP7JQnCAIrF7sGGhgw87Wv5O4Dsr4A+9Rx7jusfXVbg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=GEufIJXC; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=rRTdsfMA; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 3453387C88 for ; Thu, 19 Dec 2024 20:35:35 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tOMIl-0003Ge-6f; Thu, 19 Dec 2024 14:35:17 -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 1tOMIZ-0003AJ-Uh for guix-patches@gnu.org; Thu, 19 Dec 2024 14:35:05 -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 1tOMIZ-00036i-Lf; Thu, 19 Dec 2024 14:35:03 -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=kgsostRT8tT8RjtyY070f2oua+b1EeF4/Ahdh3L16pw=; b=GEufIJXCqOEzL6fpr97Oz90mA9TT5QyFLqTxhrROPHk6i26ejLaeUKhinv2lBnoW6LqE24sIoe0pcC2eKM+UQHh7sa2emHaItCrG1b1cerRK4q4n2eFNw38ZjQQ7f3fHJEoYptBnUp+UqQbGC3Uz+0KtqVQRqiGRcwdm2DQc+4lT35MyZ9fBUzaHkouNOennYXljW6h5yYHztkWoUne8zDa1R09nJha7tv0zjqhPH9M+pO2cJLnTLDgmfrAeFRY17uaKPUUR9oYWjP4OHtOxhEtTaTb/e5f3Oy/J5BlebsG+ZWkxAWxWVv1AEal2W9sjOYGS2NyQCC3MUYX8+jw0kQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tOMIY-0000VX-Ad; Thu, 19 Dec 2024 14:35:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74979] [PATCH 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: Thu, 19 Dec 2024 19:35: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.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 ) id 1tOMHf-0000Tl-4o for submit@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 ) id 1tOMHW-0000SA-Ua for 74979@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@debbugs.gnu.org>; Thu, 19 Dec 2024 19:33:49 +0000 (UTC) Date: Thu, 19 Dec 2024 20:33:06 +0100 Message-ID: <48fb3a7d236d39e90107931893cbddf2f16a761f.1734636205.git.herman@rimm.ee> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 From: Herman Rimm via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx11.migadu.com X-Migadu-Spam-Score: -1.72 X-Spam-Score: -1.72 X-Migadu-Queue-Id: 3453387C88 X-TUID: qoVjui8SF/vJ * 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