From patchwork Sat Jul 26 02:39:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43288 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 E7BAE27BC4D; Sat, 26 Jul 2025 03:43:16 +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 23D5F27BC4A for ; Sat, 26 Jul 2025 03:43:16 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufUsQ-0001sA-Qg; Fri, 25 Jul 2025 22:43:11 -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-0001kJ-Cy 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 1ufUsL-0005kR-Ri 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=jwUMSM7S6gbM/YBFGQai+c0TvJk46mngAL6hCySIhIE=; b=iOa+lox2Kv5tvGssBTTdbh/y/qWMLgJsm5c8N7Ot465d3QaI3+RBkBWtB+SIJKnxxaLHV9TUvM5+SPYZnIyxaKvsJ6qRDH3gec96XB3Y3j2dul/mLKPvpKgS2fDJP7Ll6bbhbK+gWWrdZ/UQKl25DGid7IGQdtTfMQD01VS1WkI5qPLn8FYtVicClv3M8pWMVVYOnrVEF8bYxEn4qXYHNYJrIg9b4Sm4jtQBW3G0inavfiyzDcvlOWosw0DOZDIKAnP531hSaNiiccARgrAeRih1tBeI9FvvPXvCSw2zGF7KpfHBd8fPUL6pfg37jjCTvP8/P4ZqHG7BnHuTFX33xg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ufUsL-00081z-Gk for guix-patches@gnu.org; Fri, 25 Jul 2025 22:43:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79099] [PATCH 18/34] gnu/packages/i*.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:05 +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.175349774030676 (code B ref 79099); Sat, 26 Jul 2025 02:43:05 +0000 Received: (at 79099) by debbugs.gnu.org; 26 Jul 2025 02:42:20 +0000 Received: from localhost ([127.0.0.1]:38172 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ufUrX-0007yV-Ew for submit@debbugs.gnu.org; Fri, 25 Jul 2025 22:42:19 -0400 Received: from 9.mo563.mail-out.ovh.net ([46.105.73.201]:60919) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ufUpc-0007fj-99 for 79099@debbugs.gnu.org; Fri, 25 Jul 2025 22:40:44 -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 4bppqz2TrNz6MdK; Sat, 26 Jul 2025 02:40:15 +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 <79099@debbugs.gnu.org>; Sat, 26 Jul 2025 02:40:15 +0000 (UTC) Received: from mta3.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.0.187]) by director4.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bppqz1XQ8z251P; Sat, 26 Jul 2025 02:40:15 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.8]) by mta3.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id D759594313E; Sat, 26 Jul 2025 02:40:14 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-99G0036d5fa789-ae6a-41c9-a728-9abc87d9782d, 7BFD41D65738CBEA4850BE66907D66307393418F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sat, 26 Jul 2025 04:39:24 +0200 Message-ID: <20250726023951.11862-18-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: 4615908145851851490 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 49 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdekhedvfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecuogfuuhhsphgvtghtffhomhgrihhnucdlgeelmdenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepveduheehudegtedujeejteekvdevjeeiuedvgeetveehlefhjeduheduheetffffnecuffhomhgrihhnpehsohhurhgtvghfohhrghgvrdhnvghtpdhgihhthhhusgdrtghomhenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeeltdelleesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeifegmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=jwUMSM7S6gbM/YBFGQai+c0TvJk46mngAL6hCySIhIE=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1753497615; v=1; b=XICJ7kajcrc+rQdg9GryWiUbdGLCLDiJPTXA2CxhF+W7ffTe1Gc0RRuASojOEbeAN6nKWS/i Gb1T/5BIRYKjYsz5JkRS8xdxgTLxDsMHnxYviNOnvYk/9YkhZUrOSc/mUmP9YI78KSTQ8SRlYq3 pjXVf8iJ2W7KlTtBeSaxe2OMrAZsMPrOdGo16MWXg06SwdLuQU+xMboO3qQ6lN8OfqFWXZO0HSP PHU6uiDxyosFTHJrWxhgyNm8ATs6+ykwsDUrIfjoQ3gCyYS8cO7SQrQdqyVn9kmqB9O067wHu3r pNIaZ+G5llXnjcGVvTnJYeyLhe+T9aSWb596R+En+WFlA== 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 "i*.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/idris.scm | 8 ++++---- gnu/packages/image-processing.scm | 6 +++--- gnu/packages/image.scm | 12 +++++++----- gnu/packages/inferno.scm | 2 +- gnu/packages/instrumentation.scm | 6 +++--- gnu/packages/ipfs.scm | 4 ++-- 6 files changed, 20 insertions(+), 18 deletions(-) diff --git a/gnu/packages/idris.scm b/gnu/packages/idris.scm index 1837a8a8152..fc4ec7ab5a4 100644 --- a/gnu/packages/idris.scm +++ b/gnu/packages/idris.scm @@ -186,7 +186,7 @@ (define-public idris-lightyear (let ((commit "6d65ad111b4bed2bc131396f8385528fc6b3678a")) (package (name "idris-lightyear") - (version (git-version "0.1" "1" commit)) + (version (make-git-version "0.1" "1" commit)) (source (origin (method git-fetch) (uri (git-reference @@ -211,7 +211,7 @@ (define-public idris-wl-pprint (let ((commit "1d365fcf4ba075859844dbc5eb96a90f57b9f338")) (package (name "idris-wl-pprint") - (version (git-version "0.1" "1" commit)) + (version (make-git-version "0.1" "1" commit)) (source (origin (method git-fetch) (uri (git-reference @@ -236,7 +236,7 @@ (define-public idris-bifunctors (let ((commit "53d06a6ccfe70c49c9ae8c8a4135981dd2173202")) (package (name "idris-bifunctors") - (version (git-version "0.1" "1" commit)) + (version (make-git-version "0.1" "1" commit)) (source (origin (method git-fetch) (uri (git-reference @@ -260,7 +260,7 @@ (define-public idris-lens (let ((commit "26f012005f6849806cea630afe317e42cae97f29")) (package (name "idris-lens") - (version (git-version "0.1" "1" commit)) + (version (make-git-version "0.1" "1" commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 632c00ac823..a1ade701ff6 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -1487,7 +1487,7 @@ (define-public itk-snap ("c3d-src" ,(let* ((commit "f521358db26e00002c911cc47bf463b043942ad3") (revision "1") - (version (git-version "0" revision commit))) + (version (make-git-version "0" revision commit))) (origin (method git-fetch) (uri (git-reference @@ -1502,7 +1502,7 @@ (define-public itk-snap ("greedy-src" ,(let* ((commit "97e340f7e8e66597599144947775e6039e79a0d3") (revision "1") - (version (git-version "0" revision commit))) + (version (make-git-version "0" revision commit))) (origin (method git-fetch) (uri (git-reference @@ -1526,7 +1526,7 @@ (define-public metapixel (let ((commit "98ee9daa093b6c334941242e63f90b1c2876eb4f")) (package (name "metapixel") - (version (git-version "1.0.2" "1" commit)) + (version (make-git-version "1.0.2" "1" commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 1598d330464..bf93cc04195 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -462,7 +462,7 @@ (define-public pnglite ;; The latest version in sourceforge was 0.1.17: ;; https://sourceforge.net/projects/pnglite/files/pnglite/ ;; No releases are made in github. - (version (git-version "0.1.17" revision commit)) + (version (make-git-version "0.1.17" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -496,7 +496,9 @@ (define-public pnglite (lib (string-append out "/lib/")) (include (string-append out "/include/")) (doc (string-append out "/share/doc/" - ,name "-" ,version "/"))) + ,name "-" + ,(package-version this-package) + "/"))) (install-file "libpnglite.so" lib) (install-file "pnglite.h" include) (install-file "README.md" doc) @@ -1493,7 +1495,7 @@ (define-public vigra-c (revision "2")) (package (name "vigra-c") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (home-page "https://github.com/BSeppke/vigra_c") (source (origin (method git-fetch) @@ -2177,7 +2179,7 @@ (define-public flameshot (revision "1")) (package (name "flameshot") - (version (git-version "12.1.0" revision commit)) + (version (make-git-version "12.1.0" revision commit)) (source (origin (method git-fetch) @@ -2457,7 +2459,7 @@ (define-public lodepng (version "20200215")) (package (name "lodepng") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/inferno.scm b/gnu/packages/inferno.scm index 67df73bf02c..38796754a55 100644 --- a/gnu/packages/inferno.scm +++ b/gnu/packages/inferno.scm @@ -35,7 +35,7 @@ (define-public inferno (revision "0")) (package (name "inferno") - (version (git-version "4" revision commit)) + (version (make-git-version "4" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/instrumentation.scm b/gnu/packages/instrumentation.scm index 81bbd5118eb..56642fb8fdb 100644 --- a/gnu/packages/instrumentation.scm +++ b/gnu/packages/instrumentation.scm @@ -252,7 +252,7 @@ (define-public flamegraph (revision "1")) (package (name "flamegraph") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -291,7 +291,7 @@ (define-public jacquesctf (revision "0")) (package (name "jacquesctf") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -687,7 +687,7 @@ (define-public yactfr (revision "0")) (package (name "yactfr") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm index 4140000bd1a..fd3deead52e 100644 --- a/gnu/packages/ipfs.scm +++ b/gnu/packages/ipfs.scm @@ -555,7 +555,7 @@ (define-public go-github-com-ipfs-go-ipfs-blocksutil (revision "0")) (package (name "go-github-com-ipfs-go-ipfs-blocksutil") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -2607,7 +2607,7 @@ (define-public spritely-libp2p-daemon (revision "0")) (package (name "spritely-libp2p-daemon") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch)