From patchwork Sat Jul 26 02:39:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43283 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 B301E27BC4B; Sat, 26 Jul 2025 03:43:04 +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 27B0E27BC49 for ; Sat, 26 Jul 2025 03:43:03 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufUqp-0000KL-Ho; Fri, 25 Jul 2025 22:41:31 -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 1ufUql-0000GU-RG for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:27 -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 1ufUql-0005RV-Du for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:27 -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=KIIp8cVdNRyL/7IcO6I8D4lGnVZFHADGAKSgg+Upaas=; b=eYUCUGp3rXaA+rpj220PgXFYzPHI9Hw9OVbh6aROJPg6nrcU274vFp622GZ9SlEinYfLpVwyACQbkbSEFTg2wrn9voYNMjJS6wIe5Ir4rMzDKIgMzEdzxcWt9Usgbvys5inUK3rtIcfEqKzSso8t5gcuXjBn18MDRkdaqG1LvE/jV+YrfZSE65zqlj0V6irf6soHxCsjzeblnB0KcEQNswKNfZptljZ86A9cfR8KUCEiTiKqvYin2Ow6OlAguSi+d0vX91vQF+N+T01ycog5Hj/C6zKC2pqZAoekqoMZAqwecouSNPMAwPJpqQQ2B1KYNtEgIa6u2pGEtKk3u3R1pA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ufUql-0007uM-1U for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:27 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79099] [PATCH 12/34] gnu/packages/c*.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:26 +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.175349768130342 (code B ref 79099); Sat, 26 Jul 2025 02:41:26 +0000 Received: (at 79099) by debbugs.gnu.org; 26 Jul 2025 02:41:21 +0000 Received: from localhost ([127.0.0.1]:38131 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ufUqb-0007so-JT for submit@debbugs.gnu.org; Fri, 25 Jul 2025 22:41:20 -0400 Received: from 1.mo563.mail-out.ovh.net ([178.33.106.244]:58721) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ufUpW-0007f4-FD for 79099@debbugs.gnu.org; Fri, 25 Jul 2025 22:40:34 -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 4bppqs0HXBz5yGW; Sat, 26 Jul 2025 02:40:09 +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:08 +0000 (UTC) Received: from mta6.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.164.80]) by director2.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bppqr6LJBz1xwk; Sat, 26 Jul 2025 02:40:08 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.11]) by mta6.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 8925D8E318E; Sat, 26 Jul 2025 02:40:08 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-102R004867a956b-793e-42b6-966f-c507ecf4d390, 7BFD41D65738CBEA4850BE66907D66307393418F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sat, 26 Jul 2025 04:39:18 +0200 Message-ID: <20250726023951.11862-12-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: 4613937818717315810 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdekhedvfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeeikefhjeekgefhueejfeegvdegteegfeevveetjeehffdvffdtleevtdfffedugfenucffohhmrghinhepghhithhhuhgsrdgtohhmpdhgnhhurdhorhhgnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledtleelseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehieefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=KIIp8cVdNRyL/7IcO6I8D4lGnVZFHADGAKSgg+Upaas=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1753497609; v=1; b=bq6VYB3oocPww9A7aVElur7mLvBacURhgsM0qluA0nrEcAbyYCqqX29KlqdRyCfMGj4zVvVH ZCkKSrWSDGNyW+19o+D1fGlrGRj2ciJsU0upctrDpLZlh7ESLabwzaXzVN60jMz3opGRxOEAgo2 fVYBEFvmTGnSPGjgmjoAD7eFEERB1aSpU0DKmbS/ZQI0gY6kekota+x9DdZt1XrxEqNXzlcjuhs 6LajVnqyO/oMpLYpBQR9vVGn3DjEvtWRi50KYn8duR6qE5U8ydYOFZWf1RniVDSQl8XEk2DiBrx vmG9ySqd1DOWcsfHT8K7+DUIK0V8OmsmUZCWIuJzko9Kg== 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 "c*.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/c.scm | 22 +++++++++--------- gnu/packages/calendar.scm | 2 +- gnu/packages/cdrom.scm | 2 +- gnu/packages/certs.scm | 2 +- gnu/packages/check.scm | 14 +++++------ gnu/packages/chemistry.scm | 6 ++--- gnu/packages/chez.scm | 12 ++++++---- gnu/packages/ci.scm | 2 +- gnu/packages/cmake.scm | 8 +++---- gnu/packages/code.scm | 8 +++---- gnu/packages/compression.scm | 11 +++++---- gnu/packages/coq.scm | 2 +- gnu/packages/cpp.scm | 45 ++++++++++++++++++------------------ gnu/packages/cran.scm | 18 +++++++-------- gnu/packages/crypto.scm | 8 +++---- gnu/packages/cups.scm | 2 +- 16 files changed, 84 insertions(+), 80 deletions(-) diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index 06b333ef32f..93a29d4f60a 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -84,7 +84,7 @@ (define-public c-intro-and-ref (commit "47e5a234a7c036392e0f9e1e8e48ff3e6855840d")) (package (name "c-intro-and-ref") - (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 @@ -123,7 +123,7 @@ (define-public c-rrb (revision "0")) (package (name "c-rrb") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -152,7 +152,7 @@ (define-public cproc (revision "1")) (package (name "cproc") - (version (git-version "0.0" revision commit)) + (version (make-git-version "0.0" revision commit)) (source (origin (method git-fetch) @@ -246,7 +246,7 @@ (define-public tcc (commit "a83b28568596afd8792fd58d1a5bd157fc6b6634")) (package (name "tcc") ;aka. "tinycc" - (version (git-version "0.9.27" revision commit)) + (version (make-git-version "0.9.27" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -306,7 +306,7 @@ (define-public tomlc99 (commit "5221b3d3d66c25a1dc6f0372b4f824f1202fe398")) (package (name "tomlc99") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -641,7 +641,7 @@ (define-public libwuya (commit "883502041044f4616cfbf75c8f2bb60059f704a9")) (package (name "libwuya") - (version (git-version "0.0" revision commit)) + (version (make-git-version "0.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -776,7 +776,7 @@ (define-public c-template-sort (revision "0")) (package (name "c-template-sort") - (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 @@ -1433,7 +1433,7 @@ (define-public orangeduck-mpc (revision "0")) (package (name "orangeduck-mpc") - (version (git-version "0.9.0" revision commit)) + (version (make-git-version "0.9.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1634,7 +1634,7 @@ (define-public utf8-h (revision "0")) (package (name "utf8-h") - (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 @@ -1696,7 +1696,7 @@ (define-public utest-h (revision "0")) (package (name "utest-h") - (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 @@ -1823,7 +1823,7 @@ (define-public pcg-c (revision "1")) (package (name "pcg-c") - (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 diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index faf7779ce73..c9f56eb8be0 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -74,7 +74,7 @@ (define-public adl-submit (revision "0")) (package (name "adl-submit") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index bcfdc267787..7e2d18b32cd 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -806,7 +806,7 @@ (define-public geteltorito (revision "1")) ;Guix package revision (package (name "geteltorito") - (version (git-version "0.6" revision commit)) + (version (make-git-version "0.6" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/certs.scm b/gnu/packages/certs.scm index e2de6b168b4..d0a27e093bd 100644 --- a/gnu/packages/certs.scm +++ b/gnu/packages/certs.scm @@ -47,7 +47,7 @@ (define-public desec-certbot-hook (package (name "desec-certbot-hook") (version - (git-version "0" revision commit)) + (make-git-version "0" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 26ba096aafb..66b21e8bd16 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -713,7 +713,7 @@ (define-public cbehave (revision "1")) (package (name "cbehave") - (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 @@ -990,7 +990,7 @@ (define-public ftest (revision "0")) (package (name "ftest") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1284,7 +1284,7 @@ (define-public klee-uclibc (let ((commit "955d502cc1f0688e82348304b053ad787056c754")) (package (name "klee-uclibc") - (version (git-version "20230612" "0" commit)) + (version (make-git-version "20230612" "0" commit)) (source (origin (method git-fetch) @@ -3990,7 +3990,7 @@ (define-public rapidcheck (revision "1")) (package (name "rapidcheck") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -4112,7 +4112,7 @@ (define-public virtest (revision "0")) (package (name "virtest") - (version (git-version "0.0" revision commit)) + (version (make-git-version "0.0" revision commit)) (home-page "https://github.com/mattkretz/virtest") (source (origin (method git-fetch) @@ -4473,7 +4473,7 @@ (define-public uitest (revision "0")) (package (name "uitest") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -4501,7 +4501,7 @@ (define-public munit (revision "1")) (package (name "munit") - (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 diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm index 9e9f3bf6609..1dbf8336874 100644 --- a/gnu/packages/chemistry.scm +++ b/gnu/packages/chemistry.scm @@ -901,7 +901,7 @@ (define-public python-pyscf-properties (revision "1")) (package (name "python-pyscf-properties") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -1461,7 +1461,7 @@ (define-public pubchem-align3d (revision "0")) (package (name "pubchem-align3d") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1715,7 +1715,7 @@ (define-public xcfun ("autocmake-src" ,(let* ((commit "77a1f851f08af1cbe0d95fd7dba4a16a14264412") (revision "0") - (version (git-version "1.0.0" revision commit))) + (version (make-git-version "1.0.0" revision commit))) (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index cc0326bbbdd..80003464012 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -709,7 +709,7 @@ (define-public stex-bootstrap ;; command-line tools, and there isn't a Scheme API, let alone a ;; Chez-specific one, except perhaps that the Scheme examples are ;; assumed to be Chez-compatible. - (version (git-version "1.2.2" revision commit)) + (version (make-git-version "1.2.2" revision commit)) (source (origin (method git-fetch) @@ -976,7 +976,7 @@ (define-public chez-web (package (name "chez-web") ;; Release 2.0 is different and doesn't work. - (version (git-version "2.0" revision commit)) + (version (make-git-version "2.0" revision commit)) (source (origin (method git-fetch) @@ -1000,7 +1000,7 @@ (define-public chez-web #:make-flags #~(list (string-append "PREFIX=" #$output) (string-append "DOCDIR=" #$output "/share/doc/" - #$name "-" #$version) + #$name "-" #$(package-version this-package)) ;; lib/chez-scheme/chezweb ??? (string-append "LIBDIR=" #$output "/lib/chezweb") (string-append "TEXDIR=" #$output "/share/texmf-local")) @@ -1043,7 +1043,7 @@ (define-public chez-sockets (revision "1")) (package (name "chez-sockets") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -1116,7 +1116,9 @@ (define-public chez-sockets (install-file "sockets.pdf" (string-append #$output "/share/doc/" - #$name "-" #$version))))))) + #$name "-" + #$(package-version + this-package)))))))) (home-page "https://github.com/arcfide/chez-sockets") (synopsis "Extensible sockets library for Chez Scheme") (description "Chez-sockets is an extensible sockets library for diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 557b15c0ff6..b0f7f56d539 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -73,7 +73,7 @@ (define-public cuirass (revision "12")) (package (name "cuirass") - (version (git-version "1.2.0" revision commit)) + (version (make-git-version "1.2.0" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 608080954f3..3a4bc7ac9e2 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -74,7 +74,7 @@ (define-public cmake-shared (package (name "cmake-shared") (version - (git-version "1.1.0" revision commit)) + (make-git-version "1.1.0" revision commit)) (source (origin (method git-fetch) @@ -572,7 +572,7 @@ (define-public qmsetup (package (name "qmsetup") ;; The base version string is retrieved from the CMakeLists.txt file. - (version (git-version "0.0.1.5" revision commit)) + (version (make-git-version "0.0.1.5" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -614,7 +614,7 @@ (define-public tinycmmc (revision "0")) (package (name "tinycmmc") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -660,7 +660,7 @@ (define-public sanitizers-cmake (revision "0")) (package (name "sanitizers-cmake") - (version (git-version "0.0" revision commit)) + (version (make-git-version "0.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index c4c423c8466..d043f4b84d9 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -882,7 +882,7 @@ (define-public indent (revision "0")) (package (name "indent") - (version (git-version "2.2.13" revision commit)) + (version (make-git-version "2.2.13" revision commit)) (source (origin (method git-fetch) @@ -907,8 +907,8 @@ (define-public indent @set UPDATED @set EDITION ~a @set VERSION ~a" - #$version - #$version)))))))) + #$(package-version this-package) + #$(package-version this-package))))))))) (native-inputs (list autoconf-2.71 automake gettext-minimal texinfo)) (home-page "https://www.gnu.org/software/indent/") @@ -926,7 +926,7 @@ (define-public indent (define-public amalgamate (let* ((commit "c91f07eea1133aa184f652b8f1398eaf03586208") (revision "0") - (version (git-version "1.1.1" revision commit))) + (version (make-git-version "1.1.1" revision commit))) (package (name "amalgamate") (version version) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index b0fd58ccfba..868c45d7e78 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -426,7 +426,7 @@ (define-public lbzip2 (revision "0")) (package (name "lbzip2") - (version (git-version "2.5" revision commit)) + (version (make-git-version "2.5" revision commit)) (source (origin (method git-fetch) @@ -890,7 +890,7 @@ (define-public sfarkxtc (revision "1")) (package (name "sfarkxtc") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin ;; There are no release tarballs, so we just fetch the latest ;; commit at this time. @@ -2062,7 +2062,7 @@ (define-public ziptime (revision "0")) (package (name "ziptime") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -2091,7 +2091,8 @@ (define-public ziptime (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin")) - (doc (string-append out "/share/doc/" ,name "-" ,version))) + (doc (string-append out "/share/doc/" ,name "-" + ,(package-version this-package)))) (install-file "ziptime" bin) (install-file "README.txt" doc))))))) ;; There is no separate home page for this tiny bundled build tool. @@ -2636,7 +2637,7 @@ (define-public makeself-safeextract (let ((commit "1a95e121fa8e3c02d307ae37b9b7834e616c3683")) (package (name "makeself-safeextract") - (version (git-version "0.0.0" "1" commit)) + (version (make-git-version "0.0.0" "1" commit)) (home-page "https://github.com/ssokolow/makeself_safeextract") (source (origin diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index 3ef91ad78ac..1c33c104c62 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -139,7 +139,7 @@ (define-public proof-general (revision "2")) (package (name "proof-general") - (version (git-version "4.5" revision commit)) + (version (make-git-version "4.5" revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 1a991ac08c2..e61c6271995 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -139,7 +139,7 @@ (define-public argagg (let ((commit "79e4adfa2c6e2bfbe63da05cc668eb9ad5596748") (revision "0")) (package (name "argagg") - (version (git-version "0.4.6" revision commit)) + (version (make-git-version "0.4.6" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -180,7 +180,7 @@ (define-public argpp (revision "0")) (package (name "argpp") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -206,7 +206,7 @@ (define-public asmjit (revision "2")) (package (name "asmjit") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -647,7 +647,7 @@ (define-public rct (revision "2")) (package (name "rct") - (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 @@ -787,7 +787,7 @@ (define-public xdgpp (revision "0")) (package (name "xdgpp") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -853,7 +853,7 @@ (define-public icecream-cpp (revision "0")) (package (name "icecream-cpp") - (version (git-version "0.3.1" revision commit)) + (version (make-git-version "0.3.1" revision commit)) (source (origin (method git-fetch) @@ -1122,7 +1122,7 @@ (define-public frozen (revision "0")) (package (name "frozen") - (version (git-version "1.1.1" revision commit)) + (version (make-git-version "1.1.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1267,7 +1267,7 @@ (define-public jthread (revision "0")) (package (name "jthread") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -1327,7 +1327,8 @@ (define-public jthread (copy-file "tex/std.pdf" (string-append out #$name "-" - #$version ".pdf")))))))) + #$(package-version this-package) + ".pdf")))))))) (native-inputs (list perl (texlive-local-tree @@ -1618,7 +1619,7 @@ (define-public gperftools-for-friction (package (inherit gperftools) (name "gperftools") - (version (git-version base-version revision commit)) + (version (make-git-version base-version revision commit)) (source (origin (method git-fetch) @@ -2298,7 +2299,7 @@ (define-public lexy (revision "0")) (package (name "lexy") - (version (git-version "2022.12.1" revision commit)) + (version (make-git-version "2022.12.1" revision commit)) (source (origin (method git-fetch) @@ -2583,7 +2584,7 @@ (define-public immer (revision "0")) (package (name "immer") - (version (git-version "0.8.1" revision commit)) + (version (make-git-version "0.8.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -2871,7 +2872,7 @@ (define-public pcg-cpp (revision "3")) (package (name "pcg-cpp") - (version (git-version "0.98.1" revision commit)) + (version (make-git-version "0.98.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -2931,7 +2932,7 @@ (define-public libcppgenerate (revision "0")) (package (name "libcppgenerate") - (version (git-version "0.2" revision commit)) + (version (make-git-version "0.2" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -3466,7 +3467,7 @@ (define-public pocketfft-cpp (revision "0")) (package (name "pocketfft-cpp") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -3495,7 +3496,7 @@ (define-public priocpp (revision "0")) (package (name "priocpp") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -3525,7 +3526,7 @@ (define-public sajson (revision "0")) (package (name "sajson") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -3714,7 +3715,7 @@ (define-public wide-integer (revision "1314")) ; commit count (package (name "wide-integer") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -3746,7 +3747,7 @@ (define-public wdl (revision "0")) (package (name "wdl") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -4044,7 +4045,7 @@ (define-public sexp-cpp (revision "0")) (package (name "sexp-cpp") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -4092,7 +4093,7 @@ (define-public strutcpp (revision "0")) (package (name "strutcpp") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -4228,7 +4229,7 @@ (define-public tinygettext (revision "0")) (package (name "tinygettext") - (version (git-version "0.2.0" revision commit)) + (version (make-git-version "0.2.0" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 6b81eb2937e..5d1afed3bce 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5695,7 +5695,7 @@ (define-public r-plotly (url "https://github.com/daattali/jquery-colourpicker") (commit commit))) (file-name (git-file-name "jquery-colourpicker" - (git-version version revision commit))) + (make-git-version version revision commit))) (sha256 (base32 "0lg8amh8xh6p246j38rqghrljd7v5z34i169ra6403z8ga33wiqb"))))) @@ -5721,7 +5721,7 @@ (define-public r-plotly (url "https://github.com/inexorabletash/polyfill/") (commit commit))) (file-name (git-file-name "typedarray-polyfill" - (git-version version revision commit))) + (make-git-version version revision commit))) (sha256 (base32 "0f9np4mmyhny03n3xpwzs07rld30lnfqsnh97x1v7xm0qy0zjanf"))))))) @@ -6581,7 +6581,7 @@ (define-public r-waiter (revision "1")) (package (name "r-waiter") - (version (git-version "0.2.5" revision commit)) + (version (make-git-version "0.2.5" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -13434,7 +13434,7 @@ (define-public r-shinydashboardplus (url "https://github.com/DucThanhNguyen/MaterialAdminLTE") (commit commit))) (file-name (git-file-name "MaterialAdminLTE" - (git-version "0" "0" commit))) + (make-git-version "0" "0" commit))) (sha256 (base32 "0cn11hxpf25h7xj2lk473z24swgz979dz255zwk2m2fj00iljkn9")))))) @@ -13602,7 +13602,7 @@ (define-public r-sankeyd3 (revision "1")) (package (name "r-sankeyd3") - (version (git-version "0.3.2" revision commit)) + (version (make-git-version "0.3.2" revision commit)) (source (origin (method git-fetch) @@ -16643,7 +16643,7 @@ (define-public r-excelr ;; the contents of the JavaScript files point to this commit as the ;; most likely source. (let* ((commit "8af1960f76e6803bebc5750013d2ebe95354e88a") - (version (git-version "3.9.1" "0" commit))) + (version (make-git-version "3.9.1" "0" commit))) (origin (method git-fetch) (uri (git-reference @@ -39883,7 +39883,7 @@ (define-public r-soupx (revision "1")) (package (name "r-soupx") - (version (git-version "0.3.1" revision commit)) + (version (make-git-version "0.3.1" revision commit)) (source (origin (method git-fetch) @@ -50259,7 +50259,7 @@ (define-public r-seuratdisk (revision "1")) (package (name "r-seuratdisk") - (version (git-version "0.0.0.9021" revision commit)) + (version (make-git-version "0.0.0.9021" revision commit)) (source (origin (method git-fetch) @@ -50302,7 +50302,7 @@ (define-public r-seuratdata (revision "1")) (package (name "r-seuratdata") - (version (git-version "0.2.2.9001" revision commit)) + (version (make-git-version "0.2.2.9001" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 72943e9437a..527b54ceb69 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -851,7 +851,7 @@ (define-public b2sum (revision "0")) (package (name "b2sum") - (version (git-version "20190724" revision commit)) + (version (make-git-version "20190724" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1023,7 +1023,7 @@ (define-public asignify (revision "1")) (package (name "asignify") - (version (git-version "1.1" revision commit)) + (version (make-git-version "1.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1363,7 +1363,7 @@ (define-public hash-extender (revision "2")) (package (name "hash-extender") - (version (git-version "0.0" revision commit)) + (version (make-git-version "0.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1387,7 +1387,7 @@ (define-public hash-extender (bindir (string-append outdir "/bin")) (docdir (string-append outdir "/share/doc/hash-extender-" - ,version))) + ,(package-version this-package)))) (install-file "hash_extender" bindir) (install-file "README.md" docdir) #t)))))) diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 8322818b771..312f8019335 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -1012,7 +1012,7 @@ (define-public splix (revision "315")) (package (name "splix") - (version (git-version "2.0.0" revision commit)) + (version (make-git-version "2.0.0" revision commit)) (source (origin (method git-fetch)