From patchwork Sat Jul 26 02:39:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43293 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 D383C27BC4B; Sat, 26 Jul 2025 03:50: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 BC73A27BC4A for ; Sat, 26 Jul 2025 03:50:14 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufUz2-0006Su-Qd; Fri, 25 Jul 2025 22:50:01 -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 1ufUx8-0004y5-QB for guix-patches@gnu.org; Fri, 25 Jul 2025 22:48:04 -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 1ufUx8-0006N6-GP for guix-patches@gnu.org; Fri, 25 Jul 2025 22:48:02 -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=oT0P6kZ0MjqIMVd55xV/PfiHh3g5Os96vjy1dmQ9Xq0=; b=JB8cPp16NvZ9r5TbYcTyHojeFYZNtx34JEb1cJaP6t6nhcan4+9psZA9/ABKoPdjLDtOYJNwXRST4ucyOkJllSMdUixAa4UrpJ7OUFrFA0yCCQ4FN8HfAr0Dnr1daluVbCpEmsiGdn3OxmPTPVul/6Tk1VQ+XGyKN7zzgkuRPsxQ5Wd7JD0znVY3KjFCzDSZ7SEXD+wv/U2IhuJhWl45pvmBUp5bsjZBg161qXhHSJ3Dxt0YmG7MCEgg7NFHmnOaG1KRcy0fbptNPrvL0ADDh8pTx09Sz3EEJbTKDVyrX3TW1iesuLfZPLNOWqmiCWsbhY+SmZboaHmM97tOTKkvqQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ufUx8-0008Pa-3f for guix-patches@gnu.org; Fri, 25 Jul 2025 22:48:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79099] [PATCH 24/34] gnu/packages/o*.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:01 +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.175349804532152 (code B ref 79099); Sat, 26 Jul 2025 02:48:01 +0000 Received: (at 79099) by debbugs.gnu.org; 26 Jul 2025 02:47:25 +0000 Received: from localhost ([127.0.0.1]:38216 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ufUwV-0008MT-E4 for submit@debbugs.gnu.org; Fri, 25 Jul 2025 22:47:24 -0400 Received: from 7.mo563.mail-out.ovh.net ([46.105.59.58]:52035) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ufUwK-0008Lr-LC for 79099@debbugs.gnu.org; Fri, 25 Jul 2025 22:47:20 -0400 Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net [79.137.60.36]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4bppr46yyzz5yHx; Sat, 26 Jul 2025 02:40:20 +0000 (UTC) Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net. [127.0.0.1]) by director2.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79099@debbugs.gnu.org>; Sat, 26 Jul 2025 02:40:20 +0000 (UTC) Received: from mta11.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.43.206]) by director2.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bppr464hkz1xrp; Sat, 26 Jul 2025 02:40:20 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.4]) by mta11.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 8E2ED9A3176; Sat, 26 Jul 2025 02:40:20 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-106R0066a1d22db-017d-4147-aa41-a006b3ad716e, 7BFD41D65738CBEA4850BE66907D66307393418F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sat, 26 Jul 2025 04:39:30 +0200 Message-ID: <20250726023951.11862-24-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: 4617315519998321378 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdekhedvfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvheelieffheetvdelhfffffejfefgudfhteekveehieetudeiudfgkeeutdehjeenucffohhmrghinhepghhithhhuhgsrdgtohhmnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgepvdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledtleelseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehieefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=oT0P6kZ0MjqIMVd55xV/PfiHh3g5Os96vjy1dmQ9Xq0=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1753497621; v=1; b=ZpsFn2f0fXmCzN68wLE+QtpVkgtbfEPmiRyO4ULajaHd2m0xctSPghGJZa8U27RIyfLrUsz4 zYX6TLC7Vlj8aJg/1A71LxM4nQi+ez5AM4mRRJTF3KoRnVfNGqRwKJuwJN4SKOnJoJNpcg2Mn+7 qEw3H0FS0lzND6+vJ31+Dgy1c35NbT4S1j17ZnVZ52wE10udxOB/Wpe2gnsxZ6bLCs3AErJf5LQ LupRXFUlaf1WOgZDBRqET9BsDTiY+JfWaaFaByxsaKwVHdilOHTOp/R26eNExir/C5goYCOS1ZM BVdr0MZMB/y1gWs80o/OaJ6vSL3EYyJYnuRepMr9Wq3wA== 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 "o*.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/ocaml.scm | 18 +++++++++--------- gnu/packages/ocr.scm | 2 +- gnu/packages/opencog.scm | 12 ++++++------ 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 88c9241e205..a0004b6c4b0 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -128,7 +128,7 @@ (define-public camlboot (revision "1")) (package (name "camlboot") - (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 @@ -2583,7 +2583,7 @@ (define-public ocaml-calendar (package (name "ocaml-calendar") ;; Makefile.in says 2.04. - (version (git-version "2.04" revision commit)) + (version (make-git-version "2.04" revision commit)) (source (origin (method git-fetch) @@ -2953,7 +2953,7 @@ (define-public ocaml-pyml (commit "e33f4c49cc97e7bc6f8e5faaa64cce994470642e")) (package (name "ocaml-pyml") - (version (git-version "20220905" revision commit)) + (version (make-git-version "20220905" revision commit)) (source (origin (method git-fetch) @@ -5380,7 +5380,7 @@ (define-public bap (commit "f995d28a4a34abb4cef8e0b3bd3c41cd710ccf1a")) (package (name "bap") - (version (git-version "2.6.0-alpha" revision commit)) + (version (make-git-version "2.6.0-alpha" revision commit)) (home-page "https://github.com/BinaryAnalysisPlatform/bap") (source (origin (method git-fetch) @@ -5495,7 +5495,7 @@ (define-public ocaml-charinfo-width (let ((commit "20aaaa6dca8f1e0b1ace55b6f2a8ba5e5910b620")) (package (name "ocaml-charinfo-width") - (version (git-version "1.1.0" "1" commit)) + (version (make-git-version "1.1.0" "1" commit)) (home-page "https://github.com/kandu/charinfo_width/") (source (origin (method git-fetch) @@ -5747,7 +5747,7 @@ (define-public ocaml5.0-ctypes (package (inherit ocaml-ctypes) (name "ocaml-ctypes") - (version (git-version "0.20.1" revision commit)) + (version (make-git-version "0.20.1" revision commit)) (home-page "https://github.com/ocamllabs/ocaml-ctypes") (arguments (append @@ -6544,7 +6544,7 @@ (define-public ocaml5.0-base (package (inherit ocaml-base) (name "ocaml-base") - (version (git-version "0.15.0" revision commit)) + (version (make-git-version "0.15.0" revision commit)) (source (origin (method git-fetch) @@ -6690,7 +6690,7 @@ (define-public ocaml-cinaps (revision "0")) (package (name "ocaml-cinaps") - (version (git-version "0.15.1" revision commit)) + (version (make-git-version "0.15.1" revision commit)) (home-page "https://github.com/ocaml-ppx/cinaps") (source (origin @@ -7477,7 +7477,7 @@ (define-public ocaml5.0-ppx-expect (package (inherit ocaml-ppx-expect) (name "ocaml-ppx-expect") - (version (git-version "0.15.0" revision commit)) + (version (make-git-version "0.15.0" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/ocr.scm b/gnu/packages/ocr.scm index adb71bcc37e..21fcdaefe63 100644 --- a/gnu/packages/ocr.scm +++ b/gnu/packages/ocr.scm @@ -238,7 +238,7 @@ (define-public zinnia (let* ((commit "581faa8f6f15e4a7b21964be3a5ec36265c80e5b") (revision "1") ;; version copied from 'configure.in' - (version (git-version "0.07" revision commit))) + (version (vc-version "0.07" revision commit))) (package (name "zinnia") (version version) diff --git a/gnu/packages/opencog.scm b/gnu/packages/opencog.scm index 998d9b47ae5..69b9556ea80 100644 --- a/gnu/packages/opencog.scm +++ b/gnu/packages/opencog.scm @@ -40,7 +40,7 @@ (define-public cogutil (revision "1")) (package (name "cogutil") - (version (git-version "2.0.3" revision commit)) + (version (make-git-version "2.0.3" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -72,7 +72,7 @@ (define-public atomspace (revision "1")) (package (name "atomspace") - (version (git-version "5.0.3" revision commit)) + (version (make-git-version "5.0.3" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -114,7 +114,7 @@ (define-public cogserver (revision "2")) (package (name "cogserver") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -152,7 +152,7 @@ (define-public attention (revision "1")) (package (name "attention") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -197,7 +197,7 @@ (define-public opencog (revision "1")) (package (name "opencog") - (version (git-version "0.1.4" revision commit)) + (version (make-git-version "0.1.4" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -248,7 +248,7 @@ (define-public agi-bio (revision "1")) (package (name "agi-bio") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference