From patchwork Sat Jul 26 02:39:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43300 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 7EA6F27BC4B; Sat, 26 Jul 2025 03:51:30 +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 AF1D327BC49 for ; Sat, 26 Jul 2025 03:51:29 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufV0J-0007Oc-60; Fri, 25 Jul 2025 22:51:19 -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-00051B-Rc 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 1ufUxF-0006Np-5Y 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=MwAeiNnd4iMGr9FNVD+qe9mSPV3QaQ3V7RVP+o6lAVE=; b=v0KFG8axaWwrTPpeQpjCeSpKfCUfslBlSN3QUQAbcL/6jhfjqVOTDgs5dF0tSB0zufcfcfqAXNsfkrNIxTWphkKaPNOVH5FLwPRFikteE0a6LYJecCA9xL/JSj8gnMGYGWwGNNmAeGtPnSJk/lPAs02QoX2bidUu8sO2TTqW/HnDcG469ULs07BajEm3jSwyfRRaW5BnrSTvEx4/itS6oBNm2sDHx8hgqpfNdLHN5YPlWAsAaApx+W2hulwM9k8NoX3j3WpkuGzXB0+ae96shxpQ0hiQK3KQXgTZtG+ektBLoUVf9RnXUOM8oN4TipuYX1tjY2B1HLnZhnpMKOn1Uw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ufUxE-0008RA-T1 for guix-patches@gnu.org; Fri, 25 Jul 2025 22:48:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79099] [PATCH 30/34] gnu/packages/v*.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.175349808732415 (code B ref 79099); Sat, 26 Jul 2025 02:48:08 +0000 Received: (at 79099) by debbugs.gnu.org; 26 Jul 2025 02:48:07 +0000 Received: from localhost ([127.0.0.1]:38248 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ufUxC-0008QX-43 for submit@debbugs.gnu.org; Fri, 25 Jul 2025 22:48:07 -0400 Received: from 8.mo562.mail-out.ovh.net ([46.105.60.65]:55861) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ufUwv-0008OG-4b for 79099@debbugs.gnu.org; Fri, 25 Jul 2025 22:47:56 -0400 Received: from director3.derp.mail-out.ovh.net (director3.derp.mail-out.ovh.net [152.228.215.222]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4bpprC1Y6jz2c2Z; Sat, 26 Jul 2025 02:40:27 +0000 (UTC) Received: from director3.derp.mail-out.ovh.net (director3.derp.mail-out.ovh.net. [127.0.0.1]) by director3.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 mta6.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.178.122]) by director3.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bpprB75Djz5xQH; Sat, 26 Jul 2025 02:40:26 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.10]) by mta6.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id AFD5A8E318E; Sat, 26 Jul 2025 02:40:26 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-101G004c514283d-f239-49ce-bbfb-2a558325ab1d, 7BFD41D65738CBEA4850BE66907D66307393418F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sat, 26 Jul 2025 04:39:36 +0200 Message-ID: <20250726023951.11862-30-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: 4619285843551183586 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdekhedvfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdffheegkefhkefggfelheffteeigfegiedtudetkeffhfekheevjeefjeeltdeinecuffhomhgrihhnpehgihhthhhusgdrtghomhenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeeltdelleesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeivdgmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=MwAeiNnd4iMGr9FNVD+qe9mSPV3QaQ3V7RVP+o6lAVE=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1753497627; v=1; b=YhIF2vyOvMyXOc0nB1Rc9CVAzbOf9IQINnMTax2Wno+IpmGvgNoA5OPsbrwdXWr/WcgWIWUx CE6dazhoXxcKLGfhAQlXl654HQrNdiLm+eaAxtAkI65Pee/kRmhfHf+jJkjAwN3Th4U+Ti6Ttkq 8b8Tl/wy+1V0UZyvePdH/54UG6cC9gmo4aYFUNhmOe2C6Zwl+M68UYvnFDRcOKn2W2hajigWAOT W+xQPkl3SqtJq9PaxFuzCmu6VBnntGWH8nXqw99xEbLO+P7N8QwMwZuWohbgVLtMaBMB3mYto+W MtSQbHYGx0gVwVtG790yXMdUkpHs9F/Y2T7CiUJwvoQdw== 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 "v*.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/version-control.scm | 10 ++++----- gnu/packages/video.scm | 18 +++++++-------- gnu/packages/vim.scm | 38 ++++++++++++++++---------------- gnu/packages/vnc.scm | 2 +- gnu/packages/vpn.scm | 2 +- 5 files changed, 35 insertions(+), 35 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 06d042a519d..5e04af77020 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -906,7 +906,7 @@ (define-public gitless (revision "0")) (package (name "gitless") - (version (git-version "0.8.8" revision commit)) + (version (make-git-version "0.8.8" revision commit)) (source (origin (method git-fetch) @@ -1213,7 +1213,7 @@ (define-public xdiff (package (name "xdiff") ;; The base version is taken from the CMakeLists.txt file. - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1463,7 +1463,7 @@ (define-public git-issue (revision "0")) (package (name "git-issue") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1718,7 +1718,7 @@ (define-public cgit (package (name "cgit") ;; Update the ‘git-source’ input as well. - (version (git-version "1.2.3" rev commit)) + (version (make-git-version "1.2.3" rev commit)) (source (origin (method git-fetch) (uri (git-reference @@ -2892,7 +2892,7 @@ (define-public hg-commitsigs (revision "0")) (package (name "hg-commitsigs") - (version (git-version "0.1.0" revision changeset)) + (version (make-git-version "0.1.0" revision changeset)) (source (origin (method hg-fetch) (uri (hg-reference diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 4e0dcee4cf2..f549c3f3dd8 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -964,7 +964,7 @@ (define-public libx264 (revision "0")) (package (name "libx264") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -2407,7 +2407,7 @@ (define-public gpac (name "gpac") ;; Use a git snapshot of the master branch, as it fixes build issues ;; when using a recent ffmpeg release. - (version (git-version "2.4.0" revision commit)) + (version (make-git-version "2.4.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -3949,7 +3949,7 @@ (define-public twitchy (let ((commit "9beb36d80b16662414129693e74fa3a2fd97554e")) ; 3.4 has no tag (package (name "twitchy") - (version (git-version "3.4" "1" commit)) + (version (make-git-version "3.4" "1" commit)) (source (origin (method git-fetch) @@ -5228,7 +5228,7 @@ (define-public h264bitstream (revision "1")) (package (name "h264bitstream") - (version (git-version "0.2.0" revision commit)) + (version (make-git-version "0.2.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -5957,7 +5957,7 @@ (define-public subdl (revision "1")) (package (name "subdl") - (version (git-version "1.0.3" revision commit)) + (version (make-git-version "1.0.3" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -6055,7 +6055,7 @@ (define-public vidstab (revision "0")) (package (name "vidstab") - (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 @@ -6305,7 +6305,7 @@ (define-public wlstream (revision "1")) (package (name "wlstream") - (version (git-version "0.0" revision commit)) + (version (make-git-version "0.0" revision commit)) (source (origin (method git-fetch) @@ -6398,7 +6398,7 @@ (define-public theorafile (let ((commit "ea5fd6d34053ff72b0abe83fa4f2cd0771d92663")) (package (name "theorafile") - (version (git-version "0.0.0" "2" commit)) + (version (make-git-version "0.0.0" "2" commit)) (source (origin (method git-fetch) @@ -6873,7 +6873,7 @@ (define-public libcaption (revision "0")) (package (name "libcaption") - (version (git-version "0.7" revision commit)) + (version (make-git-version "0.7" revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index ccd950d9c91..0c37ee7fbcf 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -409,7 +409,7 @@ (define-public vim-scheme (revision "3")) (package (name "vim-scheme") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -485,7 +485,7 @@ (define-public vim-coqtail (revision "1")) (package (name "vim-coqtail") - (version (git-version "1.7.1" revision commit)) + (version (make-git-version "1.7.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -614,7 +614,7 @@ (define-public vim-airline-themes (revision "2")) (package (name "vim-airline-themes") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -675,7 +675,7 @@ (define-public vim-solarized (revision "1")) (package (name "vim-solarized") - (version (git-version "1.0.0beta1" revision commit)) + (version (make-git-version "1.0.0beta1" revision commit)) (source (origin (method git-fetch) @@ -775,7 +775,7 @@ (define-public neovim-packer (revision "0")) (package (name "neovim-packer") - (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 @@ -1120,7 +1120,7 @@ (define-public vim-dispatch (revision "1")) (package (name "vim-dispatch") - (version (git-version "1.8" revision commit)) + (version (make-git-version "1.8" revision commit)) (source (origin (method git-fetch) @@ -1153,7 +1153,7 @@ (define-public vim-gemini-vim (revision "1")) (package (name "vim-gemini-vim") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -1178,7 +1178,7 @@ (define-public vim-eunuch (revision "1")) (package (name "vim-eunuch") - (version (git-version "1.2" revision commit)) + (version (make-git-version "1.2" revision commit)) (source (origin (method git-fetch) @@ -1205,7 +1205,7 @@ (define-public vim-slime (revision "1")) (package (name "vim-slime") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -1233,7 +1233,7 @@ (define-public vim-vlime (revision "1")) (package (name "vim-vlime") - (version (git-version "0.4.0" revision commit)) + (version (make-git-version "0.4.0" revision commit)) (source (origin (method git-fetch) @@ -1286,7 +1286,7 @@ (define-public vim-paredit (revision "1")) (package (name "vim-paredit") - (version (git-version "0.9.11" revision commit)) + (version (make-git-version "0.9.11" revision commit)) (source (origin (method git-fetch) @@ -1421,7 +1421,7 @@ (define-public vim-gitgutter (revision "1")) (package (name "vim-gitgutter") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -1565,7 +1565,7 @@ (define-public vim-vader (commit "429b669e6158be3a9fc110799607c232e6ed8e29")) (package (name "vim-vader") - (version (git-version "0.4.0" revision commit)) + (version (make-git-version "0.4.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1664,7 +1664,7 @@ (define-public vim-commentary (revision "1")) (package (name "vim-commentary") - (version (git-version "1.3" revision commit)) + (version (make-git-version "1.3" revision commit)) (source (origin (method git-fetch) @@ -1694,7 +1694,7 @@ (define-public vim-guile (revision "1")) (package (name "vim-guile") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -1722,7 +1722,7 @@ (define-public vim-dhall-vim (revision "1")) (package (name "vim-dhall-vim") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -1748,7 +1748,7 @@ (define-public vim-mundo (revision "1")) (package (name "vim-mundo") - (version (git-version "3.1.0" revision commit)) + (version (make-git-version "3.1.0" revision commit)) (source (origin (method git-fetch) @@ -1772,7 +1772,7 @@ (define-public vim-zig (revision "1")) (package (name "vim-zig") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -1798,7 +1798,7 @@ (define-public vim-plantuml-syntax (revision "1")) (package (name "vim-plantuml-syntax") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/vnc.scm b/gnu/packages/vnc.scm index c4051c76729..f8afcf15e95 100644 --- a/gnu/packages/vnc.scm +++ b/gnu/packages/vnc.scm @@ -596,7 +596,7 @@ (define-public x11vnc (revision "0")) (package (name "x11vnc") - (version (git-version "0.9.16" revision commit)) + (version (make-git-version "0.9.16" revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index ed067f0e021..fec663cf1f2 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -296,7 +296,7 @@ (define-public gp-saml-gui (revision "1")) (package (name "gp-saml-gui") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (home-page "https://github.com/dlenski/gp-saml-gui") (source (origin (method git-fetch)