From patchwork Mon Jul 28 12:22:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43333 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 D64E627BC4B; Mon, 28 Jul 2025 14:18:05 +0100 (BST) 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=ham 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 081D127BC49 for ; Mon, 28 Jul 2025 14:18:05 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ugNil-0007Zi-TS; Mon, 28 Jul 2025 09:16:51 -0400 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 1ugMvd-0006vQ-Nc for guix-patches@gnu.org; Mon, 28 Jul 2025 08:26:08 -0400 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 1ugMvc-000275-CX for guix-patches@gnu.org; Mon, 28 Jul 2025 08:26:04 -0400 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=PBW1SIblVF+h7gqGzz5dGyRIpg+FMFgSE5ug5+2iWCc=; b=QJLZmxJhE+31wJlzVLIaqN9Z9XnmX/cNHgaXD+sO7d9JnWJKXxTLx45j2BPc9fgpB+VAMq9GZP2VKTtmLgl2VQksvMua04IM03eCQTV7zSzraO9s7J95/B1Sp3TAZQ+2etHXSx1NsZXQs0MrXPy/o6hgUDR40dNfmCnZfipoPLrw/1l9QnU9eGGLAV2pZbWKzVT+3UlQEhqHiP5207vC+7jgrZiewEu0hf3hzsxf04zrE2eDd1hOLOi8m7r5NgztZ+25nEppWpID6Cb47ytRQmm71HlgESSEhDh3v9it5aLltx+3ttvasKKPJNwRx6VBrqBuciBEslTdAZdOMA2blw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ugMvc-000894-4c for guix-patches@gnu.org; Mon, 28 Jul 2025 08:26:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79111] [PATCH 32/34] gnu/packages/x*.scm: Use make-git-version. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Jul 2025 12:26:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 79111 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 79111@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 79111-submit@debbugs.gnu.org id=B79111.175370554731244 (code B ref 79111); Mon, 28 Jul 2025 12:26:04 +0000 Received: (at 79111) by debbugs.gnu.org; 28 Jul 2025 12:25:47 +0000 Received: from localhost ([127.0.0.1]:55091 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ugMvK-00087l-S3 for submit@debbugs.gnu.org; Mon, 28 Jul 2025 08:25:47 -0400 Received: from 1.mo563.mail-out.ovh.net ([178.33.106.244]:44305) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ugMt2-0007pa-V2 for 79111@debbugs.gnu.org; Mon, 28 Jul 2025 08:23:26 -0400 Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net [79.137.60.37]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4brHgv6qYXz6TYd; Mon, 28 Jul 2025 12:23:23 +0000 (UTC) Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net. [127.0.0.1]) by director4.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79111@debbugs.gnu.org>; Mon, 28 Jul 2025 12:23:23 +0000 (UTC) Received: from mta3.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.0.63]) by director4.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4brHgv5vTcz1xsN; Mon, 28 Jul 2025 12:23:23 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.8]) by mta3.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 72FAC943181; Mon, 28 Jul 2025 12:23:23 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-110S004946a803e-9f3f-452d-8ce8-595be1a85f99, 10591E46977A199058F55B545AAB4696CBF206AF) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Mon, 28 Jul 2025 14:22:38 +0200 Message-ID: <20250728122249.8829-32-ngraves@ngraves.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250728122249.8829-1-ngraves@ngraves.fr> References: <20250728122249.8829-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 7762798383748604642 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdelvdduiecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelgeevuefhudekgefhleehudfgfeekvdfgffejffekkefggeehveeluedtudelueenucffohhmrghinhepfhhrvggvuggvshhkthhophdrohhrghenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeeludduudesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeifegmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=PBW1SIblVF+h7gqGzz5dGyRIpg+FMFgSE5ug5+2iWCc=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1753705404; v=1; b=RCBhBjG3bnu5460LxO7NBTbs7hOZnZRiF550QUsellGeE5NlCgJseJW0WZ9+gBVaKuh1RzjU RsBNLgYTBaokao+yr0JrQrn4GkniQ/FQQS48NjTpSe3ST+XtRdf9RaVnp6U7HhHeN4cmW1c/fdR SRLjOgC6hxzBG4mdxs+uBz9/RsFRljCDAaefswj5+FVmwZL/QVT2Px/thShNHwBQT0v/OzlUnQy nym+NK7c/VrxSvCymlMh2bgYcjxfTNpmAkJUZzxGV8BCqv8X8k/vqO3R8pk5RyETdwlAgirTN6Q QQhDS6sHLs/qJbF7iEy7vwu64k4auTMvyw5sv5lrtEsvg== 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: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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 find gnu/packages/ -type f -name "x*.scm" -exec sed -i 's/(git-version /(make-git-version /g' {} + Then manually checked the potential usage of `version` on the build-side. --- gnu/packages/xdisorg.scm | 10 +++++----- gnu/packages/xiph.scm | 2 +- gnu/packages/xml.scm | 2 +- gnu/packages/xorg.scm | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index e7d8c02921f..7a0d19a162e 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -506,7 +506,7 @@ (define-public bigbagkbdtrixxkb (revision "0")) (package (name "bigbagkbdtrixxkb") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -587,7 +587,7 @@ (define-public xkblayout (commit "c0851b0f4bc9bc1a07240605baac8e50abe63fa8")) (package (name "xkblayout") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (home-page "https://gitlab.freedesktop.org/whot/xkblayout") (source (origin @@ -2116,7 +2116,7 @@ (define-public xsel (revision "1")) (package (name "xsel") - (version (git-version "1.2.0" revision commit)) + (version (make-git-version "1.2.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -2749,7 +2749,7 @@ (define-public xss-lock (commit "1e158fb20108058dbd62bd51d8e8c003c0a48717")) (package (name "xss-lock") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -4296,7 +4296,7 @@ (define-public xforms (commit "2c1a9f151baf50887a517280645ec23379fb96f8")) (package (name "xforms") - (version (git-version "1.3.0" revision commit)) + (version (make-git-version "1.3.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm index d58665f6c34..bb13456ecd5 100644 --- a/gnu/packages/xiph.scm +++ b/gnu/packages/xiph.scm @@ -556,7 +556,7 @@ (define-public rnnoise (revision "0")) (package (name "rnnoise") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index ea4fb3a77de..0f8404787af 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -1977,7 +1977,7 @@ (define-public python-untangle (package (name "python-untangle") ;; PyPI currently offers some untagged 1.1.1 version. - (version (git-version "1.1.1" revision commit)) + (version (make-git-version "1.1.1" revision commit)) (source (origin (method git-fetch) ;no tests in pypi archive diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 6f202c2d7da..929ef560c13 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2846,7 +2846,7 @@ (define-public xf86-video-ati (revision "1")) (package (name "xf86-video-ati") - (version (git-version "19.1.0" revision commit)) + (version (make-git-version "19.1.0" revision commit)) (source (origin (method git-fetch) @@ -3064,7 +3064,7 @@ (define-public xf86-video-intel (revision "18")) (package (name "xf86-video-intel") - (version (git-version "2.99.917" revision commit)) + (version (make-git-version "2.99.917" revision commit)) (source (origin ;; there's no current tarball