From patchwork Sat Jul 26 02:39:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43285 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 289F927BC49; Sat, 26 Jul 2025 03:43:08 +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=unavailable 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 52A6527BC4C for ; Sat, 26 Jul 2025 03:43:07 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufUqt-0000NQ-4O; Fri, 25 Jul 2025 22:41:35 -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 1ufUqq-0000LS-EW for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:32 -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 1ufUqq-0005S8-37 for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:32 -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=71MMzdJnSGz0yIPzWk5opfav3pYuUcL/aiooLXH68gM=; b=Zts1JwlyFU5GSmJr7j0kkpZmkocjk6Zq7+toPpNxIL+8q5n+IkY+xeRWFnwD0lNk5tHHT9FM2IJMCMVQzIURuulwsdRUOOjFVxggyuzbC+p+uwQrIojCIVuhU1ampQ1EKDeSy5a6imD4d43yIl01l6lED//b5PWvvmuRf4RaoO/e4oXX5ye65sY0OmFUsVNeuD296Q3ifXgJoB6Jed++5IsxAoCO7yVnqvAz3fhY8mBNejGamn+Fhh31D31PF0rpilDnu9EVv0yZnxy0BXQDZjeLImIRPAqnWBXmtIV//Aqrbapu6QZcUq5QIYNoKRHUJtbI+W4rlH/ZW4H7oQcZHw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ufUqp-0007v1-Fl for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:31 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79099] [PATCH 17/34] gnu/packages/h*.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:41:31 +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.175349768630393 (code B ref 79099); Sat, 26 Jul 2025 02:41:31 +0000 Received: (at 79099) by debbugs.gnu.org; 26 Jul 2025 02:41:26 +0000 Received: from localhost ([127.0.0.1]:38141 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ufUqh-0007to-Vb for submit@debbugs.gnu.org; Fri, 25 Jul 2025 22:41:25 -0400 Received: from 7.mo562.mail-out.ovh.net ([46.105.55.234]:54857) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ufUpb-0007fX-6T for 79099@debbugs.gnu.org; Fri, 25 Jul 2025 22:40:38 -0400 Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net [79.137.60.36]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4bppqy2nb9z2c3l; Sat, 26 Jul 2025 02:40:14 +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:14 +0000 (UTC) Received: from mta7.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.109.231.192]) by director2.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bppqy1m3hz1xwk; Sat, 26 Jul 2025 02:40:14 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.11]) by mta7.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id E87A0B8315C; Sat, 26 Jul 2025 02:40:13 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-110S00456dc814a-7e7c-4d4a-bfa9-508ddfad438a, 7BFD41D65738CBEA4850BE66907D66307393418F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sat, 26 Jul 2025 04:39:23 +0200 Message-ID: <20250726023951.11862-17-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: 4615626669342515938 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdekhedvfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvheelieffheetvdelhfffffejfefgudfhteekveehieetudeiudfgkeeutdehjeenucffohhmrghinhepghhithhhuhgsrdgtohhmnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledtleelseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=71MMzdJnSGz0yIPzWk5opfav3pYuUcL/aiooLXH68gM=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1753497614; v=1; b=STF34jvrsdx2HeUUuQ1+IjcSbnNPbJO68iD0AjsFg3sbo1jwjQbzrYqI2xqZMsQuWIH0nnSP rwmc5tt8yrIRkiySrx3sFXHqRltqoqt64Te7DAMtAe0NJzMgQGXiVeIUpJ41R1kJsWxozToQDDA rG5BWaMPPoJyj8B23vPXziinzWbmyd79LCZSxh5BtBJBim6yN3OwUbs2Jtx65C19Gc9dczq+K60 2K4KykNcR0EuL6B/9Hkj7LOnEcLVllePrP2sBTBcrUnhLwzi+nS5NgUhQzgTRSCPBZ2+ImsggBR eozESra9buI0E1Ay7B6DhPgg5vseurltE8sW5Hdnt+wjA== 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 "h*.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/hardware.scm | 10 +++++----- gnu/packages/haskell-apps.scm | 5 +++-- gnu/packages/haskell-xyz.scm | 2 +- gnu/packages/heads.scm | 2 +- gnu/packages/high-availability.scm | 2 +- gnu/packages/hurd.scm | 4 ++-- 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index ed386371ce8..72ee0dc200a 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -128,7 +128,7 @@ (define-public envytools (revision "1")) (package (name "envytools") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (home-page "https://github.com/envytools/envytools") (source (origin (method git-fetch) @@ -628,7 +628,7 @@ (define-public edid-decode (revision "1")) (package (name "edid-decode") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -665,7 +665,7 @@ (define-public h-client (revision "1")) (package (name "h-client") - (version (git-version "0.0a0" revision commit)) + (version (make-git-version "0.0a0" revision commit)) (source (origin (method git-fetch) @@ -787,7 +787,7 @@ (define-public i7z (commit "1a41ff13db747e962456ddbb5ccb2b7fc43ca0cb")) (package (name "i7z") - (version (git-version "0.28" revision commit)) + (version (make-git-version "0.28" revision commit)) (source (origin (method git-fetch) @@ -1247,7 +1247,7 @@ (define-public rkdeveloptool (revision "0")) (package (name "rkdeveloptool") - (version (git-version "1.3" revision commit)) + (version (make-git-version "1.3" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index e6265090673..384285f5a93 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -630,7 +630,7 @@ (define-public kmonad (revision "1")) (package (name "kmonad") - (version (git-version "0.4.2" revision commit)) + (version (make-git-version "0.4.2" revision commit)) (source (origin (method git-fetch) @@ -666,7 +666,8 @@ (define-public kmonad (add-after 'install-udev-rules 'install-documentation (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (doc (string-append out "/share/doc/kmonad-" ,version))) + (doc (string-append out "/share/doc/kmonad-" + ,(package-version this-package)))) (install-file "README.md" doc) (copy-recursively "doc" doc) (copy-recursively "keymap" (string-append doc "/keymap")) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 6b8cce3cfc4..e75e16485cb 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -10103,7 +10103,7 @@ (define-public ghc-reflex-sdl2 (revision "1")) (package (name "ghc-reflex-sdl2") - (version (git-version "0.3.0.2" revision commit)) + (version (make-git-version "0.3.0.2" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/heads.scm b/gnu/packages/heads.scm index a176253122d..8f22f50c041 100644 --- a/gnu/packages/heads.scm +++ b/gnu/packages/heads.scm @@ -54,7 +54,7 @@ (define-public musl-cross (commit "a8a66490dae7f23a2cf5e256f3a596d1ccfe1a03")) (package (name "musl-cross") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/high-availability.scm b/gnu/packages/high-availability.scm index a70a990cb0a..3846a2979b8 100644 --- a/gnu/packages/high-availability.scm +++ b/gnu/packages/high-availability.scm @@ -85,7 +85,7 @@ (define-public cowsql (revision "0")) (package (name "cowsql") - (version (git-version "1.15.8" revision commit)) + (version (make-git-version "1.15.8" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index cde918372da..db8cd6f6a45 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -634,7 +634,7 @@ (define-public netdde (name "netdde") ;; The version prefix corresponds to the version of Linux from which the ;; drivers were taken. - (version (git-version "2.6.32.65" revision commit)) + (version (make-git-version "2.6.32.65" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -744,7 +744,7 @@ (define-public rumpkernel (revision "0")) (package (name "rumpkernel") - (version (git-version "0-20250111" revision commit)) + (version (make-git-version "0-20250111" revision commit)) ;; This uses the Debian Salsa rumpkernel package git as upstream as that ;; is where development happens. Once things have stabilized, upstream ;; may change to the NetBSD git from where Debian takes their snapshots.