From patchwork Sat Jul 26 02:39:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43297 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 00A6827BC4B; Sat, 26 Jul 2025 03:51:15 +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 1C9D927BC49 for ; Sat, 26 Jul 2025 03:51:15 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufUzq-00077z-1e; Fri, 25 Jul 2025 22:50: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 1ufUxF-000518-RA for guix-patches@gnu.org; Fri, 25 Jul 2025 22:48:16 -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 1ufUxE-0006Nn-Hc for guix-patches@gnu.org; Fri, 25 Jul 2025 22:48:09 -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=gvusUpfuoDUd1efbOyc9BhcNBYhIM+nI5vsmqGHJryI=; b=nYgTZz34neX+PdSEBKeMUdXmBmqYe09YuGIEO0F4zUGvjngA3WN34uKTVNVEj5RdrTv4OCIDytOgOmbuMwY0ZP8kqbDriUPuXNrJi62/vK9L0c3k303GkzYs68u+N+D63HKEwhsbbNkmKUGD8KfPcVqe7LKY7PNsc1+Qu8nJE91KIWZCJb4k+MVZXp7cId4HmXpnvXx/8zJ9hA+JL0Z/bWqdcxGHTEEs3u77/aSrV8fPdSTYngaj4U2kwCmt6xF3SpXFGLNZbEYZWO27JnfyCwynaGVejVyI2WIFJYQd7dh8Oy4pWI8ny/sv5rzb+VDKdJWYq64WiUJKNozPeVJy9Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ufUxE-0008R1-Bd for guix-patches@gnu.org; Fri, 25 Jul 2025 22:48:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79099] [PATCH 31/34] gnu/packages/w*.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:48:08 +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.175349808632395 (code B ref 79099); Sat, 26 Jul 2025 02:48:08 +0000 Received: (at 79099) by debbugs.gnu.org; 26 Jul 2025 02:48:06 +0000 Received: from localhost ([127.0.0.1]:38244 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ufUxA-0008QC-Jh for submit@debbugs.gnu.org; Fri, 25 Jul 2025 22:48:05 -0400 Received: from 6.mo562.mail-out.ovh.net ([46.105.48.43]:58471) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ufUx0-0008Oe-1E for 79099@debbugs.gnu.org; Fri, 25 Jul 2025 22:47:56 -0400 Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net [51.68.80.175]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4bpprD18STz20yT; 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:27 +0000 (UTC) Received: from mta11.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.109.249.98]) by director1.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bpprC6SRGz5xTg; Sat, 26 Jul 2025 02:40:27 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.4]) by mta11.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 7E0769A3176; Sat, 26 Jul 2025 02:40:27 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-106R0068f6a52b5-2599-4069-9d30-6c7be7b23d7d, 7BFD41D65738CBEA4850BE66907D66307393418F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sat, 26 Jul 2025 04:39:37 +0200 Message-ID: <20250726023951.11862-31-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: 4619285843334914786 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdekhedvfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvheelieffheetvdelhfffffejfefgudfhteekveehieetudeiudfgkeeutdehjeenucffohhmrghinhepghhithhhuhgsrdgtohhmnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgepgeenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledtleelseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=gvusUpfuoDUd1efbOyc9BhcNBYhIM+nI5vsmqGHJryI=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1753497628; v=1; b=tVrPV5gaygJGe1KTA5yrR7dpN0hD3N58QVdNSUCD9Xy7uGDfkL/9/TVBnkCWO7xOsWmb7mL6 YWpeCx27Kk6bDFNwqbFAjKQ3xXEoOcDe/xH8Kc6IsSketvWiS4bsyFK8hoCBXNiNr0pd4+kvzqX +K9Gvut8rtEzi1QemNODmxxZOB/gGB+06syXYyi1dkVicniCJoPD8gAJJCnRRvm3cSZG5CSJof0 R8cNShlpSza4y3+KiwxS21u8WPvr1dpCv/VlZGNv+EIzRDu4gy87ZrFMI3ZPLTAMQ3jEOQ1UoGI rX1di9TEXTiHi8z+jMEYaDSpgu5rdV/hQNx9xpnIIAZDw== 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 "w*.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/web-browsers.scm | 6 +++--- gnu/packages/web.scm | 32 +++++++++++++++++--------------- gnu/packages/wm.scm | 22 +++++++++++----------- gnu/packages/wxwidgets.scm | 2 +- 4 files changed, 32 insertions(+), 30 deletions(-) diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index cf70505ac58..2d17fd4d14a 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -235,7 +235,7 @@ (define-public elinks (revision "2")) (package (name "elinks") - (version (git-version "0.18.0" revision commit)) + (version (make-git-version "0.18.0" revision commit)) (source (origin (method git-fetch) @@ -522,7 +522,7 @@ (define-public kristall (url "https://github.com/Alexhuszagh/BreezeStyleSheets") (commit "2d595a956f8a5f493aa51139a470b768a6d82cce"))) (file-name (git-file-name "breeze-stylesheet" - (git-version "0" revision commit))) + (make-git-version "0" revision commit))) (sha256 (base32 "1kvkxkisi3czldnb43ig60l55pi4a3m2a4ixp7krhpf9fc5wp294"))))))) @@ -1083,7 +1083,7 @@ (define-public leo (revision "1")) (package (name "leo") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 61c9ec63a5c..82630006e6a 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -726,7 +726,7 @@ (define-public nginx-accept-language-module (revision "1")) (package (name "nginx-accept-language-module") - (version (git-version "0.0.0" ;upstream has no version number + (version (make-git-version "0.0.0" ;upstream has no version number revision commit)) (source (origin @@ -1243,7 +1243,7 @@ (define-public fcgiwrap (revision "1")) (package (name "fcgiwrap") - (version (git-version "1.1.0" revision commit)) + (version (make-git-version "1.1.0" revision commit)) (source (origin (method git-fetch) @@ -1693,7 +1693,7 @@ (define-public rapidjson (revision "1")) (package (name "rapidjson") - (version (git-version "1.1.0" revision commit)) + (version (make-git-version "1.1.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1893,7 +1893,7 @@ (define-public wasm3 (let ((commit "139076a98b8321b67f850a844f558b5e91b5ac83")) (package (name "wasm3") - (version (git-version "0.5.0" "1" commit)) + (version (make-git-version "0.5.0" "1" commit)) (source (origin (method git-fetch) @@ -5839,7 +5839,7 @@ (define-public pup (commit "681d7bb639334bf485476f5872c5bdab10931f9a")) (package (name "pup") - (version (git-version "0.4.0" revision commit)) + (version (make-git-version "0.4.0" revision commit)) (source (origin (method git-fetch) @@ -6660,7 +6660,7 @@ (define-public surfraw (revision "0")) (package (name "surfraw") - (version (git-version "2.3.0" revision commit)) + (version (make-git-version "2.3.0" revision commit)) (source (origin (method git-fetch) @@ -7241,7 +7241,7 @@ (define-public http-parser (revision "1")) (package (name "http-parser") - (version (git-version "2.9.4" revision commit)) + (version (make-git-version "2.9.4" revision commit)) (home-page "https://github.com/nodejs/http-parser") (source (origin @@ -7446,7 +7446,7 @@ (define-public nntpit (revision "0")) (package (name "nntpit") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -8559,7 +8559,7 @@ (define-public gophernicus (revision "0")) (package (name "gophernicus") - (version (git-version "3.1.1" revision commit)) + (version (make-git-version "3.1.1" revision commit)) (source (origin (method git-fetch) @@ -8583,11 +8583,13 @@ (define-public gophernicus (lambda _ (substitute* "Makefile.in" (("^(VERSION += ).*" _ prefix) - (string-append prefix #$version "\n"))) + (string-append prefix + #$(package-version this-package) "\n"))) ;; This is done in the release.sh script. (substitute* "README.md" (("^(This release: Version )DEVEL\\b.*" _ prefix) - (string-append prefix #$version "\n")) + (string-append prefix + #$(package-version this-package) "\n")) (("^NOTE: The master branch is rolling Development\\b.*") "")))) (replace 'configure @@ -8692,7 +8694,7 @@ (define-public monsterid (revision "0")) (package (name "monsterid") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -8721,7 +8723,7 @@ (define-public cat-avatar-generator (revision "1")) (package (name "cat-avatar-generator") - (version (git-version "1" revision commit)) + (version (make-git-version "1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -9733,7 +9735,7 @@ (define-public quark (commit "c6a9055e5a30be570e30da8d216c39662c3a3f99")) (package (name "quark") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -9770,7 +9772,7 @@ (define-public go-webring (revision "0")) (package (name "go-webring") - (version (git-version "20220426" revision commit)) + (version (make-git-version "20220426" revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index a660798e858..2a609c345e6 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -342,7 +342,7 @@ (define-public hypridle (revision "1")) (package (name "hypridle") - (version (git-version "0.1.6" revision commit)) + (version (make-git-version "0.1.6" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -2381,7 +2381,7 @@ (define-public shaderbg (revision "0")) (package (name "shaderbg") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -2695,7 +2695,7 @@ (define-public wlopm (revision "0")) (package (name "wlopm") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -2913,7 +2913,7 @@ (define stumpwm-contrib (revision "7")) (package (name "stumpwm-contrib") - (version (git-version "0.0.1" revision commit)) ;no upstream release + (version (make-git-version "0.0.1" revision commit)) ;no upstream release (source (origin (method git-fetch) @@ -2960,7 +2960,7 @@ (define-public sbcl-stumpwm-pamixer (revision "1")) (package (name "sbcl-stumpwm-pamixer") - (version (git-version "0.1.1" revision commit)) + (version (make-git-version "0.1.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -3516,7 +3516,7 @@ (define-public xinitrc-xsession (revision "0")) (package (name "xinitrc-xsession") - (version (git-version "1" revision commit)) + (version (make-git-version "1" revision commit)) (source (origin (method git-fetch) @@ -4149,7 +4149,7 @@ (define-public grimblast (revision "1")) (package (name "grimblast") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -4258,7 +4258,7 @@ (define-public wld (revision "1")) (package (name "wld") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -4291,7 +4291,7 @@ (define-public swc (revision "1")) (package (name "swc") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -4337,7 +4337,7 @@ (define-public velox (revision "1")) (package (name "velox") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -4403,7 +4403,7 @@ (define-public wsbg (package (inherit swaybg) (name "wsbg") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm index c961c29536b..909144790bc 100644 --- a/gnu/packages/wxwidgets.scm +++ b/gnu/packages/wxwidgets.scm @@ -259,7 +259,7 @@ (define-public prusa-wxwidgets (package (inherit wxwidgets-sans-egl) (name "prusa-wxwidgets") - (version (git-version "3.2.0" revision commit)) + (version (make-git-version "3.2.0" revision commit)) (home-page "https://github.com/prusa3d/wxWidgets") (source (origin