From patchwork Sat Jul 26 02:39: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: 43287 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 B224227BC4B; Sat, 26 Jul 2025 03:43:12 +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 CCFA827BC49 for ; Sat, 26 Jul 2025 03:43:11 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufUsP-0001q7-CY; Fri, 25 Jul 2025 22:43:09 -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 1ufUsM-0001ll-VW for guix-patches@gnu.org; Fri, 25 Jul 2025 22:43:06 -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 1ufUsM-0005kt-M6 for guix-patches@gnu.org; Fri, 25 Jul 2025 22:43:06 -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=DD0eLg/XvKOAht8q78X4XNJ2mZ/xu6uPdnkx7d3Q2+M=; b=m7hC30FpB4IC93/v2ziV0DwZHYvQjrcY3lf0BP9djWYEbj1Z7Fj3NwFYPsd/egMxE0uLePMDJ7SoDOcD8zIrV0tk7uaizvHSzEEDwwlw/8yyLdqhRTG6gZWEzMyHow9VejKRh/9Y2GfaBNSHcH8Cc5a3VFyDnFMhp+0/eccOt4kno2fR+NXR9Lk3CuooABeqjzuTqmBVK1uuH0323InVjMInEF42Gda6vUAAk+l8M0jfbi8BOuYEjg7htdNZDNcC9w21/2+1GHo1FMFE7sJr897f4Pq2YMB9TvGrQdLrxIeIJIZSCC6t2pDYjNjrnV1PfHc4wnD97f0UKklCYdyVsw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ufUsM-000829-CM for guix-patches@gnu.org; Fri, 25 Jul 2025 22:43:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79099] [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: Sat, 26 Jul 2025 02:43:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 79099 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 79099@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 79099-submit@debbugs.gnu.org id=B79099.175349774130690 (code B ref 79099); Sat, 26 Jul 2025 02:43:06 +0000 Received: (at 79099) by debbugs.gnu.org; 26 Jul 2025 02:42:21 +0000 Received: from localhost ([127.0.0.1]:38176 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ufUrb-0007yj-Kl for submit@debbugs.gnu.org; Fri, 25 Jul 2025 22:42:20 -0400 Received: from 4.mo563.mail-out.ovh.net ([46.105.53.192]:38851) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ufUpq-0007jR-82 for 79099@debbugs.gnu.org; Fri, 25 Jul 2025 22:40:48 -0400 Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net [51.68.80.175]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4bpprD6P1lz5xPh; Sat, 26 Jul 2025 02:40:28 +0000 (UTC) Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net. [127.0.0.1]) by director1.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79099@debbugs.gnu.org>; Sat, 26 Jul 2025 02:40:28 +0000 (UTC) Received: from mta3.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.0.145]) by director1.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bpprD45Wwz5wGM; Sat, 26 Jul 2025 02:40:28 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.9]) by mta3.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 29DFF94313E; Sat, 26 Jul 2025 02:40:28 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-98R00214345302-bd00-4302-a4e8-9f3358d1851f, 7BFD41D65738CBEA4850BE66907D66307393418F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sat, 26 Jul 2025 04:39:38 +0200 Message-ID: <20250726023951.11862-32-ngraves@ngraves.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250726023951.11862-1-ngraves@ngraves.fr> References: <20250726023951.11862-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 4619567321007252194 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdekhedvfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelgeevuefhudekgefhleehudfgfeekvdfgffejffekkefggeehveeluedtudelueenucffohhmrghinhepfhhrvggvuggvshhkthhophdrohhrghenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeeltdelleesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeifegmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=DD0eLg/XvKOAht8q78X4XNJ2mZ/xu6uPdnkx7d3Q2+M=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1753497629; v=1; b=tBmBN8zm8ENpN0EJiljUgXVy/h5BTizlwG1onjTD+EvgQolEgrksuGsoDUR4cUZggDI92QAi /zoHiYz6xWSWiV6jCupbtR9NUH4aadWlRozIVuX9Ay+rVEv8WkfVTr5SYOf8IgVZIK0YBnRpXU8 uAZ4QJsZrUDgdSYzjm5Ts3QLBZeO5tufWEhZNyVLL2N50hnVyxGKnUV2I7XhDc3cVbEWUcf9ms6 jo3MRl7TSc8vjTX6pKr5B5j2B0IoBx113s8VUjC/aNcC5S0YfxAPBaRHk9RByVacE/NAi3ujaVf xoq7/rGwQdpsEYJ6ELb06j5TqrtQ9MEkcRbM0TLAmelOA== 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 c396cf7c992..bc7fec7432e 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 0d1992eb209..f33cf3663bf 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -1985,7 +1985,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