From patchwork Sat Jul 26 02:39:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43292 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 6CDFE27BC4A; Sat, 26 Jul 2025 03:43:23 +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 821DC27BC4C for ; Sat, 26 Jul 2025 03:43:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufUsQ-0001rQ-3H; Fri, 25 Jul 2025 22:43:10 -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 1ufUsN-0001mn-RY for guix-patches@gnu.org; Fri, 25 Jul 2025 22:43:08 -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 1ufUsN-0005lP-Ib for guix-patches@gnu.org; Fri, 25 Jul 2025 22:43:07 -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=L4z/pfWGmMlQZbETAnLnJr1iZuo96/Bq7qEIfNLCN7Y=; b=WXge8jLl2o/tkNaSxgP1jMchunGoe22tfpYP5wFvQqPJduCXvVP58B6qxP0b3ozS5VgYRB8neIxqymyWwv6vLVyoaOMjFp/F8dldreDaU3PzwhWZ+bkAgYWOG0Jz5kdBYgpEOm5seK+bNHKxA4r+ZzRu7jUb8eIXkm5RksYQPFoRW2gV1q5gOlQBwWie4mJ+sqKjeTBUEU6c2OUL+Hk4krAGaDpD9IrmtAqKtFPPsbiAIuu3PPOWcXvxU+CzPHL0GpoOZAZEH/euuRAUl+07/WsO5RVBtY4WSH9JoTF9nPfktN3M+9/SDRq84mK+/dAv6UJnwHY4+xpS3UAmCALuYQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ufUsN-00082K-Cl for guix-patches@gnu.org; Fri, 25 Jul 2025 22:43:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79099] [PATCH 11/34] gnu/packages/b*.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:07 +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.175349774830730 (code B ref 79099); Sat, 26 Jul 2025 02:43:07 +0000 Received: (at 79099) by debbugs.gnu.org; 26 Jul 2025 02:42:28 +0000 Received: from localhost ([127.0.0.1]:38178 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ufUrd-0007yy-00 for submit@debbugs.gnu.org; Fri, 25 Jul 2025 22:42:27 -0400 Received: from 9.mo563.mail-out.ovh.net ([46.105.73.201]:46323) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ufUpX-0007f3-1B for 79099@debbugs.gnu.org; Fri, 25 Jul 2025 22:40:49 -0400 Received: from director3.derp.mail-out.ovh.net (director3.derp.mail-out.ovh.net [152.228.215.222]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4bppqr1ScWz5y8l; Sat, 26 Jul 2025 02:40:08 +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:08 +0000 (UTC) Received: from mta11.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.43.206]) by director3.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bppqq6lGjz5xQH; Sat, 26 Jul 2025 02:40:07 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.5]) by mta11.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 7D6879A3176; Sat, 26 Jul 2025 02:40:07 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-111S005a03c8c80-c9b9-4239-9293-8e6faf139803, 7BFD41D65738CBEA4850BE66907D66307393418F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sat, 26 Jul 2025 04:39:17 +0200 Message-ID: <20250726023951.11862-11-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: 4613656347443782370 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdekhedvfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeeuueeivdffhfefhfelhfffgefgheffhffgleevueduvdelieehkeevgfegiedvvdenucffohhmrghinhepghhithhhuhgsrdgtohhmpdhgohhoghhlvghsohhurhgtvgdrtghomhenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeeltdelleesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeifegmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=L4z/pfWGmMlQZbETAnLnJr1iZuo96/Bq7qEIfNLCN7Y=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1753497608; v=1; b=DXJGWRTz5gs39BopSRjD7E4rpCzvO4W+KxgHXT6BkhbVXSip2uMZbgtGRzckJkxSPMWgFhMF gPZLVFCCAwc+Xn30/cCRcikK3ypW8xnyaQ/TV9KhPh1FTwYvp8W5zNcS70r71LWamYw0f1BtqKk /+V7sfVyd1ENL4jNQ3SsX4nP+vSTjvtIzASyq6rrUS9cxFCfONFaEliJFRI143GHLXyHrdHJ55s 2NBAf3GfaB3OTKJOLcYPuGp2rDg/hkfUt6gWzfQBDOV2qvMD8bHu9Q8ahpJuE9LWCaoBZsKphmc HUll6lMpvdQebxZZwr4AehC5hVOIhxzX6Ekx1l7W25n0Q== 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 "b*.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/benchmark.scm | 4 +- gnu/packages/bioconductor.scm | 12 +- gnu/packages/bioinformatics.scm | 276 ++++++++++++++-------------- gnu/packages/bittorrent.scm | 2 +- gnu/packages/boost.scm | 4 +- gnu/packages/bootloaders.scm | 6 +- gnu/packages/bqn.scm | 4 +- gnu/packages/browser-extensions.scm | 4 +- gnu/packages/build-tools.scm | 10 +- 9 files changed, 161 insertions(+), 161 deletions(-) diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm index 07de4cae645..5d949d50598 100644 --- a/gnu/packages/benchmark.scm +++ b/gnu/packages/benchmark.scm @@ -685,7 +685,7 @@ (define-public clpeak (let ((commit "6d59cb64997a53c35207b77a63d2e9f0e84de5fd")) (package (name "clpeak") - (version (git-version "1.1.0" "0" commit)) + (version (make-git-version "1.1.0" "0" commit)) (source (origin (method git-fetch) (uri (git-reference @@ -870,7 +870,7 @@ (define-public vkmark (revision "0")) (package (name "vkmark") - (version (git-version "2017.08" revision commit)) + (version (make-git-version "2017.08" revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index e20b25c737e..f69dde66794 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -14846,7 +14846,7 @@ (define-public r-xcir (revision "1")) (package (name "r-xcir") - (version (git-version "1.8.0" revision commit)) + (version (make-git-version "1.8.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -17691,7 +17691,7 @@ (define-public r-sanssouci (revision "1")) (package (name "r-sanssouci") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -17726,7 +17726,7 @@ (define-public r-monocle3 (revision "1")) (package (name "r-monocle3") - (version (git-version "1.3.7" revision commit)) + (version (make-git-version "1.3.7" revision commit)) (source (origin (method git-fetch) @@ -21578,7 +21578,7 @@ (define-public r-cycombine (let ((commit "f18504bc83ff5daee2b5eb4b28f09abdaaa66698") (revision "1")) (package (name "r-cycombine") - (version (git-version "0.2.6" revision commit)) + (version (make-git-version "0.2.6" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -22375,7 +22375,7 @@ (define-public r-cicero-monocle3 (revision "1")) (package (inherit r-cicero) (name "r-cicero-monocle3") - (version (git-version "1.3.9" revision commit)) + (version (make-git-version "1.3.9" revision commit)) (source (origin (method git-fetch) @@ -22504,7 +22504,7 @@ (define-public r-cistopic-next (name "r-cistopic-next") ;; The DESCRIPTION file says this is version 0.3.0, which is a bit odd ;; since the previous release is 2.1.0. Oh well. - (version (git-version "0.3.0" revision commit)) + (version (make-git-version "0.3.0" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 0e8f05c8fc8..265badfb464 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -620,7 +620,7 @@ (define-public cellsnp-lite (revision "0")) (package (name "cellsnp-lite") - (version (git-version "1.2.2" revision commit)) + (version (make-git-version "1.2.2" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -739,7 +739,7 @@ (define-public r-anglemania (revision "1")) (package (name "r-anglemania") - (version (git-version "0.99.1" revision commit)) + (version (make-git-version "0.99.1" revision commit)) (source (origin (method git-fetch) @@ -781,7 +781,7 @@ (define-public r-anndatar (revision "1")) (package (name "r-anndatar") - (version (git-version "0.99.0" revision commit)) + (version (make-git-version "0.99.0" revision commit)) (source (origin (method git-fetch) @@ -818,7 +818,7 @@ (define-public r-anpan (revision "1")) (package (name "r-anpan") - (version (git-version "0.3.0" revision commit)) + (version (make-git-version "0.3.0" revision commit)) (source (origin (method git-fetch) @@ -871,7 +871,7 @@ (define-public r-bedtorch (revision "1")) (package (name "r-bedtorch") - (version (git-version "0.1.12.12" revision commit)) + (version (make-git-version "0.1.12.12" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -973,7 +973,7 @@ (define-public r-btools (revision "1")) (package (name "r-btools") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1011,7 +1011,7 @@ (define-public r-codeandroll2 (revision "1")) (package (name "r-codeandroll2") - (version (git-version "2.3.6" revision commit)) + (version (make-git-version "2.3.6" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1045,7 +1045,7 @@ (define-public r-conospanel (revision "1")) (package (name "r-conospanel") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -1069,7 +1069,7 @@ (define-public r-conqur (revision "1")) (package (name "r-conqur") - (version (git-version "2.0" revision commit)) + (version (make-git-version "2.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1110,7 +1110,7 @@ (define-public r-ewastools (revision "1")) (package (name "r-ewastools") - (version (git-version "1.7.2" revision commit)) + (version (make-git-version "1.7.2" revision commit)) (source (origin (method git-fetch) @@ -1158,7 +1158,7 @@ (define-public r-hdwgcna (revision "1")) (package (name "r-hdwgcna") - (version (git-version "0.4.00" revision commit)) + (version (make-git-version "0.4.00" revision commit)) (source (origin (method git-fetch) @@ -1352,7 +1352,7 @@ (define-public r-netid (revision "1")) (package (name "r-netid") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -1402,7 +1402,7 @@ (define-public r-p2data (revision "1")) (package (name "r-p2data") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -1425,7 +1425,7 @@ (define-public r-pizzarr (revision "1")) (package (name "r-pizzarr") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -1454,7 +1454,7 @@ (define-public r-rhtslib12 (revision "1")) (package (name "r-rhtslib12") - (version (git-version "1.23.2" revision commit)) + (version (make-git-version "1.23.2" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1481,7 +1481,7 @@ (define-public r-scdesign2 (revision "1")) (package (name "r-scdesign2") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -1508,7 +1508,7 @@ (define-public r-scenic (revision "1")) (package (name "r-scenic") - (version (git-version "1.3.1" revision commit)) + (version (make-git-version "1.3.1" revision commit)) (source (origin (method git-fetch) @@ -1545,7 +1545,7 @@ (define-public r-scent (revision "1")) (package (name "r-scent") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -1582,7 +1582,7 @@ (define-public r-saige (revision "1")) (package (name "r-saige") - (version (git-version "1.3.4" revision commit)) + (version (make-git-version "1.3.4" revision commit)) (source (origin (method git-fetch) @@ -1675,7 +1675,7 @@ (define-public r-singlet (revision "1")) (package (name "r-singlet") - (version (git-version "0.99.26" revision commit)) + (version (make-git-version "0.99.26" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1750,7 +1750,7 @@ (define-public r-stringendo (revision "1")) (package (name "r-stringendo") - (version (git-version "0.6.0" revision commit)) + (version (make-git-version "0.6.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1775,7 +1775,7 @@ (define-public r-readwriter (revision "1")) (package (name "r-readwriter") - (version (git-version "1.5.3" revision commit)) + (version (make-git-version "1.5.3" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1801,7 +1801,7 @@ (define-public r-streamgraph (revision "1")) (package (name "r-streamgraph") - (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 @@ -1836,7 +1836,7 @@ (define-public r-vitesscer (revision "1")) (package (name "r-vitesscer") - (version (git-version "0.99.0" revision commit)) + (version (make-git-version "0.99.0" revision commit)) (source (origin (method git-fetch) @@ -1877,7 +1877,7 @@ (define-public r-wasabi (revision "1")) (package (name "r-wasabi") - (version (git-version "1.0.1" revision commit)) + (version (make-git-version "1.0.1" revision commit)) (source (origin (method git-fetch) @@ -1953,7 +1953,7 @@ (define-public pbgzip (let ((commit "2b09f97b5f20b6d83c63a5c6b408d152e3982974")) (package (name "pbgzip") - (version (git-version "0.0.0" "0" commit)) + (version (make-git-version "0.0.0" "0" commit)) (source (origin (method git-fetch) (uri (git-reference @@ -2237,7 +2237,7 @@ (define bed-sample-files (let* ((name "bed-sample-files") (commit "a06dc0450e484090f15656ffd5d317813a5e1e01") (revision "0") - (version (git-version "0.0.0" revision commit))) + (version (make-git-version "0.0.0" revision commit))) (origin (method git-fetch) (uri (git-reference @@ -2476,7 +2476,7 @@ (define-public python-bulkvis (revision "2")) (package (name "python-bulkvis") - (version (git-version "2.0.0" revision commit)) + (version (make-git-version "2.0.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -3688,7 +3688,7 @@ (define-public python-pybio (revision "1")) (package (name "python-pybio") - (version (git-version "0.3.12" revision commit)) + (version (make-git-version "0.3.12" revision commit)) (source (origin (method git-fetch) @@ -3786,7 +3786,7 @@ (define bgen-sample-files (let* ((name "bgen-sample-files") (commit "7b1bc74f58b326ca19606fa5f3c6093d48367993") (revision "0") - (version (git-version "0.0.0" revision commit))) + (version (make-git-version "0.0.0" revision commit))) (origin (method git-fetch) (uri (git-reference @@ -3801,7 +3801,7 @@ (define pynsptools-examples-files ;; taken from pysnptools/util/pysnptools.hashdown.json (commit "ed14e050b2b75e7f4ddb73d512fbe928bbdb2b85") (revision "0") - (version (git-version "0.0.0" revision commit))) + (version (make-git-version "0.0.0" revision commit))) (origin (method git-fetch) (uri (git-reference @@ -4273,7 +4273,7 @@ (define-public python-whatshap (base-version "2.3")) (package (name "python-whatshap") - (version (git-version base-version revision commit)) + (version (make-git-version base-version revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -5606,7 +5606,7 @@ (define-public python-mofax (revision "1")) (package (name "python-mofax") - (version (git-version "0.3.7" revision commit)) + (version (make-git-version "0.3.7" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -9702,7 +9702,7 @@ (define-public isolator (revision "1")) (package (name "isolator") - (version (git-version "0.0.2" revision commit)) + (version (make-git-version "0.0.2" revision commit)) (source (origin (method git-fetch) @@ -10489,7 +10489,7 @@ (define-public music (revision "1")) (package (name "music") - (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 @@ -11017,7 +11017,7 @@ (define-public seek (revision "1")) (package (name "seek") - (version (git-version "1" revision commit)) + (version (make-git-version "1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -12221,7 +12221,7 @@ (define-public seqmagick (revision "0")) (package (name "seqmagick") - (version (git-version "0.8.6" revision commit)) + (version (make-git-version "0.8.6" revision commit)) (source (origin (method git-fetch) @@ -12769,7 +12769,7 @@ (define-public r-ggexpress (revision "1")) (package (name "r-ggexpress") - (version (git-version "0.6.6" revision commit)) + (version (make-git-version "0.6.6" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -12806,7 +12806,7 @@ (define-public r-gg3d (revision "1")) (package (name "r-gg3d") - (version (git-version "0.0.0.9000" revision commit)) + (version (make-git-version "0.0.0.9000" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -12838,7 +12838,7 @@ (define-public r-ggsankey (revision "1")) (package (name "r-ggsankey") - (version (git-version "0.0.99999" revision commit)) + (version (make-git-version "0.0.99999" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -12869,7 +12869,7 @@ (define-public r-gutils (revision "2")) (package (name "r-gutils") - (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 @@ -12903,7 +12903,7 @@ (define-public r-bamutils (revision "2")) (package (name "r-bamutils") - (version (git-version "0.0.0.9000" revision commit)) + (version (make-git-version "0.0.0.9000" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -12938,7 +12938,7 @@ (define-public r-gtrack (revision "1")) (package (name "r-gtrack") - (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 @@ -12976,7 +12976,7 @@ (define-public r-gchain (revision "1")) (package (name "r-gchain") - (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 @@ -13031,7 +13031,7 @@ (define-public r-skitools (revision "1")) (package (name "r-skitools") - (version (git-version "0.0.0.9000" revision commit)) + (version (make-git-version "0.0.0.9000" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -13079,7 +13079,7 @@ (define-public r-chromunity (revision "2")) (package (name "r-chromunity") - (version (git-version "0.0.2" revision commit)) + (version (make-git-version "0.0.2" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -13129,7 +13129,7 @@ (define-public r-cmdstanr (revision "1")) (package (name "r-cmdstanr") - (version (git-version "0.8.1.9000" revision commit)) + (version (make-git-version "0.8.1.9000" revision commit)) (source (origin (method git-fetch) @@ -13165,7 +13165,7 @@ (define-public r-dnamcrosshyb (revision "1")) (package (name "r-dnamcrosshyb") - (version (git-version "0.0.0.9000" revision commit)) + (version (make-git-version "0.0.0.9000" revision commit)) (source (origin (method git-fetch) @@ -13209,7 +13209,7 @@ (define-public r-doubletcollection (revision "1")) (package (name "r-doubletcollection") - (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 @@ -13256,7 +13256,7 @@ (define-public r-plsdabatch (revision "1")) (package (name "r-plsdabatch") - (version (git-version "0.2.3" revision commit)) + (version (make-git-version "0.2.3" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -13296,7 +13296,7 @@ (define-public r-psupertime (revision "1")) (package (name "r-psupertime") - (version (git-version "0.2.6" revision commit)) + (version (make-git-version "0.2.6" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -13406,7 +13406,7 @@ (define-public r-premessa (revision "1")) (package (name "r-premessa") - (version (git-version "0.3.4" revision commit)) + (version (make-git-version "0.3.4" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -13462,7 +13462,7 @@ (define-public r-projectils (revision "1")) (package (name "r-projectils") - (version (git-version "3.0.0" revision commit)) + (version (make-git-version "3.0.0" revision commit)) (source (origin (method git-fetch) @@ -13507,7 +13507,7 @@ (define-public r-presto (revision "1")) (package (name "r-presto") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -13543,7 +13543,7 @@ (define-public r-sccustomize (revision "1")) (package (name "r-sccustomize") - (version (git-version "2.0.1" revision commit)) + (version (make-git-version "2.0.1" revision commit)) (source (origin (method git-fetch) @@ -13600,7 +13600,7 @@ (define-public r-markdownhelpers (revision "1")) (package (name "r-markdownhelpers") - (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 @@ -13625,7 +13625,7 @@ (define-public r-markdownreports (revision "1")) (package (name "r-markdownreports") - (version (git-version "4.5.9" revision commit)) + (version (make-git-version "4.5.9" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -13664,7 +13664,7 @@ (define-public r-metacell (revision "1")) (package (name "r-metacell") - (version (git-version "0.3.41" revision commit)) + (version (make-git-version "0.3.41" revision commit)) (source (origin (method git-fetch) @@ -13725,7 +13725,7 @@ (define-public r-metadeconfoundr (revision "1")) (package (name "r-metadeconfoundr") - (version (git-version "0.3.0" revision commit)) + (version (make-git-version "0.3.0" revision commit)) (source (origin (method git-fetch) @@ -13765,7 +13765,7 @@ (define-public r-music (revision "2")) (package (name "r-music") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -13885,7 +13885,7 @@ (define-public r-tsis (revision "1")) (package (name "r-tsis") - (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 @@ -13917,7 +13917,7 @@ (define-public r-umi4cpackage (revision "1")) (package (name "r-umi4cpackage") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -13958,7 +13958,7 @@ (define-public r-shinycell (revision "1")) (package (name "r-shinycell") - (version (git-version "2.0.0" revision commit)) + (version (make-git-version "2.0.0" revision commit)) (source (origin (method git-fetch) @@ -13994,7 +13994,7 @@ (define-public r-archr (revision "1")) (package (name "r-archr") - (version (git-version "1.0.2" revision commit)) + (version (make-git-version "1.0.2" revision commit)) (source (origin (method git-fetch) @@ -14042,7 +14042,7 @@ (define-public r-azimuth (revision "1")) (package (name "r-azimuth") - (version (git-version "0.5.0" revision commit)) + (version (make-git-version "0.5.0" revision commit)) (source (origin (method git-fetch) @@ -14102,7 +14102,7 @@ (define-public r-icellnet (revision "1")) (package (name "r-icellnet") - (version (git-version "2.2.1" revision commit)) + (version (make-git-version "2.2.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -14189,7 +14189,7 @@ (define-public r-miamiplot (revision "1")) (package (name "r-miamiplot") - (version (git-version "1.1.0" revision commit)) + (version (make-git-version "1.1.0" revision commit)) (source (origin (method git-fetch) @@ -14295,7 +14295,7 @@ (define-public r-scseqcomm (revision "0")) (package (name "r-scseqcomm") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -14344,7 +14344,7 @@ (define-public r-shaman (revision "2")) (package (name "r-shaman") - (version (git-version release revision commit)) + (version (make-git-version release revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -14411,7 +14411,7 @@ (define-public r-demultiplex (revision "1")) (package (name "r-demultiplex") - (version (git-version "1.0.2" revision commit)) + (version (make-git-version "1.0.2" revision commit)) (source (origin (method git-fetch) @@ -14446,7 +14446,7 @@ (define-public r-demultiplex2 (revision "2")) (package (name "r-demultiplex2") - (version (git-version "1.0.2" revision commit)) + (version (make-git-version "1.0.2" revision commit)) (source (origin (method git-fetch) @@ -14487,7 +14487,7 @@ (define-public r-demuxmix (revision "1")) (package (name "r-demuxmix") - (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 @@ -14659,7 +14659,7 @@ (define-public r-pairwiseadonis ;; The versioning scheme of this package is inconsistent, with versions ;; progressing from 0.21 to 0.3 and then to 0.4.1, which does not follow ;; a standard numerical order or convention (e.g., semantic versioning). - (version (git-version "0.4.1" revision commit)) + (version (make-git-version "0.4.1" revision commit)) (source (origin (method git-fetch) @@ -15093,7 +15093,7 @@ (define-public r-phantompeakqualtools (revision "1")) (package (name "r-phantompeakqualtools") - (version (git-version "1.2.2" revision commit)) + (version (make-git-version "1.2.2" revision commit)) (source (origin (method git-fetch) @@ -15164,7 +15164,7 @@ (define-public rcas-web (revision "2")) (package (name "rcas-web") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -15213,7 +15213,7 @@ (define-public r-chipkernels (revision "1")) (package (name "r-chipkernels") - (version (git-version "1.1" revision commit)) + (version (make-git-version "1.1" revision commit)) (source (origin (method git-fetch) @@ -15281,7 +15281,7 @@ (define-public r-seraster (revision "1")) (package (name "r-seraster") - (version (git-version "0.99.0" revision commit)) + (version (make-git-version "0.99.0" revision commit)) (source (origin (method git-fetch) @@ -15382,7 +15382,7 @@ (define-public bits (name "bits") ;; The version is 2.13.0 even though no release archives have been ;; published as yet. - (version (git-version "2.13.0" revision commit)) + (version (make-git-version "2.13.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -15427,7 +15427,7 @@ (define-public piranha (commit "0466d364b71117d01e4471b74c514436cc281233")) (package (name "piranha") - (version (git-version "1.2.1" revision commit)) + (version (make-git-version "1.2.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -15490,7 +15490,7 @@ (define-public filevercmp (revision "1")) (package (name "filevercmp") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -15585,7 +15585,7 @@ (define-public r-chromvarmotifs (revision "1")) (package (name "r-chromvarmotifs") - (version (git-version "0.2.0" revision commit)) + (version (make-git-version "0.2.0" revision commit)) (source (origin (method git-fetch) @@ -15641,7 +15641,7 @@ (define-public r-rnacrosslinkoo (revision "1")) (package (name "r-rnacrosslinkoo") - (version (git-version "0.1.3" revision commit)) + (version (make-git-version "0.1.3" revision commit)) (source (origin (method git-fetch) @@ -15685,7 +15685,7 @@ (define-public r-rnaseqdtu (revision "1")) (package (name "r-rnaseqdtu") - (version (git-version "2.0" revision commit)) + (version (make-git-version "2.0" revision commit)) (source (origin (method git-fetch) @@ -15752,7 +15752,7 @@ (define-public r-cellchat (revision "1")) (package (name "r-cellchat") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -15817,7 +15817,7 @@ (define-public r-cellchat-2 (revision "1")) (package (name "r-cellchat") - (version (git-version "2.1.2" revision commit)) + (version (make-git-version "2.1.2" revision commit)) (source (origin (method git-fetch) @@ -15884,7 +15884,7 @@ (define-public r-copykat (revision "0")) (package (name "r-copykat") - (version (git-version "1.0.8" revision commit)) + (version (make-git-version "1.0.8" revision commit)) (source (origin (method git-fetch) @@ -15972,7 +15972,7 @@ (define-public r-rphyloxml (revision "1")) (package (name "r-rphyloxml") - (version (git-version "0.0-9000" revision commit)) + (version (make-git-version "0.0-9000" revision commit)) (source (origin (method git-fetch) @@ -16317,7 +16317,7 @@ (define-public tadbit (revision "2")) (package (name "tadbit") - (version (git-version "1.0.1" revision commit)) + (version (make-git-version "1.0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -16513,7 +16513,7 @@ (define-public skewer (revision "1")) (package (name "skewer") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -16549,7 +16549,7 @@ (define-public f-seq (revision "1")) (package (name "f-seq") - (version (git-version "1.1" revision commit)) + (version (make-git-version "1.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -17474,7 +17474,7 @@ (define-public python-multicore-tsne (revision "1")) (package (name "python-multicore-tsne") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -18606,7 +18606,7 @@ (define-public mantis (revision "2")) (package (name "mantis") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -18644,7 +18644,7 @@ (define-public sjcount (revision "1")) (package (name "sjcount") - (version (git-version "3.2" revision commit)) + (version (make-git-version "3.2" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -18983,7 +18983,7 @@ (define-public r-disgenet2r (revision "1")) (package (name "r-disgenet2r") - (version (git-version "0.99.2" revision commit)) + (version (make-git-version "0.99.2" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -19023,7 +19023,7 @@ (define-public r-dtmm (revision "1")) (package (name "r-dtmm") - (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 @@ -19122,7 +19122,7 @@ (define-public r-liana (revision "1")) (package (name "r-liana") - (version (git-version "0.1.14" revision commit)) + (version (make-git-version "0.1.14" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -19254,7 +19254,7 @@ (define-public r-domultibarheatmap (revision "1")) (package (name "r-domultibarheatmap") - (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 @@ -19279,7 +19279,7 @@ (define-public r-doubletfinder (revision "1")) (package (name "r-doubletfinder") - (version (git-version "2.0.3" revision commit)) + (version (make-git-version "2.0.3" revision commit)) (source (origin (method git-fetch) @@ -19313,7 +19313,7 @@ (define-public r-cytobackbone (revision "1")) (package (name "r-cytobackbone") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -19353,7 +19353,7 @@ (define-public r-cytoexplorer (revision "1")) (package (name "r-cytoexplorer") - (version (git-version "1.1.0" revision commit)) + (version (make-git-version "1.1.0" revision commit)) (source (origin (method git-fetch) @@ -19459,7 +19459,7 @@ (define-public r-cytoexplorerdata (revision "1")) (package (name "r-cytoexplorerdata") - (version (git-version "1.0.3" revision commit)) + (version (make-git-version "1.0.3" revision commit)) (source (origin (method git-fetch) @@ -19484,7 +19484,7 @@ (define-public r-giotto (revision "1")) (package (name "r-giotto") - (version (git-version "1.1.2" revision commit)) + (version (make-git-version "1.1.2" revision commit)) (source (origin (method git-fetch) @@ -19544,7 +19544,7 @@ (define-public r-illuminahumanmethylationepicmanifest-latest (revision "1")) (package (name "r-illuminahumanmethylationepicmanifest") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -19577,7 +19577,7 @@ (define-public r-illuminahumanmethylationepicanno-ilm10b5-hg38 (revision "1")) (package (name "r-illuminahumanmethylationepicanno-ilm10b5-hg38") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -19605,7 +19605,7 @@ (define-public r-maxprobes (revision "1")) (package (name "r-maxprobes") - (version (git-version "0.0.2" revision commit)) + (version (make-git-version "0.0.2" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -19633,7 +19633,7 @@ (define-public gffread (revision "1")) (package (name "gffread") - (version (git-version "0.9.12" revision commit)) + (version (make-git-version "0.9.12" revision commit)) (source (origin (method git-fetch) @@ -20032,7 +20032,7 @@ (define-public gffcompare (revision "1")) (package (name "gffcompare") - (version (git-version "0.10.15" revision commit)) + (version (make-git-version "0.10.15" revision commit)) (source (origin (method git-fetch) @@ -20064,7 +20064,7 @@ (define-public gffcompare ,(let ((commit "54917d0849c1e83cfb057b5f712e5cb6a35d948f") (revision "1") (name "gclib") - (version (git-version "0.10.3" revision commit))) + (version (make-git-version "0.10.3" revision commit))) (origin (method git-fetch) (uri (git-reference @@ -20094,7 +20094,7 @@ (define-public intervaltree (let ((commit "b90527f9e6d51cd36ecbb50429e4524d3a418ea5")) (package (name "intervaltree") - (version (git-version "0.0.0" "1" commit)) + (version (make-git-version "0.0.0" "1" commit)) (source (origin (method git-fetch) @@ -20733,7 +20733,7 @@ (define-public r-xbioc (commit "6ff0670a37ab3036aaf1d94aa4b208310946b0b5")) (package (name "r-xbioc") - (version (git-version "0.1.16" revision commit)) + (version (make-git-version "0.1.16" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -20766,7 +20766,7 @@ (define-public r-cssam (commit "9ec58c982fa551af0d80b1a266890d92954833f2")) (package (name "r-cssam") - (version (git-version "1.4" revision commit)) + (version (make-git-version "1.4" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -20797,7 +20797,7 @@ (define-public r-bseqsc (commit "fef3f3e38dcf3df37103348b5780937982b43b98")) (package (name "r-bseqsc") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -20844,7 +20844,7 @@ (define-public porechop (revision "1")) (package (name "porechop") - (version (git-version "0.2.3" revision commit)) + (version (make-git-version "0.2.3" revision commit)) (source (origin (method git-fetch) @@ -21113,7 +21113,7 @@ (define-public filtlong (revision "1")) (package (name "filtlong") - (version (git-version "0.2.0" revision commit)) + (version (make-git-version "0.2.0" revision commit)) (source (origin (method git-fetch) @@ -21817,7 +21817,7 @@ (define-public r-scopeloomr (revision "1")) (package (name "r-scopeloomr") - (version (git-version "0.13.0" revision commit)) + (version (make-git-version "0.13.0" revision commit)) (source (origin (method git-fetch) @@ -21870,7 +21870,7 @@ (define-public r-databaselinke-r (revision "1")) (package (name "r-databaselinke-r") - (version (git-version "1.7.0" revision commit)) + (version (make-git-version "1.7.0" revision commit)) (source (origin (method git-fetch) @@ -21898,7 +21898,7 @@ (define-public r-seurat-utils (revision "1")) (package (name "r-seurat-utils") - (version (git-version "2.5.0" revision commit)) + (version (make-git-version "2.5.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -21962,7 +21962,7 @@ (define-public r-seuratextend (revision "1")) (package (name "r-seuratextend") - (version (git-version "1.0.7" revision commit)) + (version (make-git-version "1.0.7" revision commit)) (source (origin (method git-fetch) @@ -22008,7 +22008,7 @@ (define-public r-seuratextenddata (revision "1")) (package (name "r-seuratextenddata") - (version (git-version "0.2.1" revision commit)) + (version (make-git-version "0.2.1" revision commit)) (source (origin (method git-fetch) @@ -22031,7 +22031,7 @@ (define-public r-seuratwrappers (revision "1")) (package (name "r-seuratwrappers") - (version (git-version "0.3.1" revision commit)) + (version (make-git-version "0.3.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -22154,7 +22154,7 @@ (define-public pyscenic (revision "1")) (package (name "pyscenic") - (version (git-version "0.12.1" revision commit)) + (version (make-git-version "0.12.1" revision commit)) (source (origin (method git-fetch) @@ -22355,7 +22355,7 @@ (define-public tbsp (revision "2")) (package (name "tbsp") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -22464,7 +22464,7 @@ (define-public smithwaterman (let ((commit "2610e259611ae4cde8f03c72499d28f03f6d38a7")) (package (name "smithwaterman") - (version (git-version "0.0.0" "2" commit)) + (version (make-git-version "0.0.0" "2" commit)) (source (origin (method git-fetch) (uri (git-reference @@ -22527,7 +22527,7 @@ (define-public smithwaterman Description: smith-waterman-gotoh alignment algorithm~@ Libs: -L${libdir} -lsmithwaterman~@ Cflags: -I${includedir}~%" - out #$version))))))))) + out #$(package-version this-package)))))))))) (home-page "https://github.com/ekg/smithwaterman") (synopsis "Implementation of the Smith-Waterman algorithm") (description "Implementation of the Smith-Waterman algorithm.") @@ -22617,7 +22617,7 @@ (define-public fsom (let ((commit "a6ef318fbd347c53189384aef7f670c0e6ce89a3")) (package (name "fsom") - (version (git-version "0.0.0" "1" commit)) + (version (make-git-version "0.0.0" "1" commit)) (source (origin (method git-fetch) (uri (git-reference @@ -22998,7 +22998,7 @@ (define-public r-hdf5dataframe (revision "1")) (package (name "r-hdf5dataframe") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -23027,7 +23027,7 @@ (define-public r-imagearray (revision "1")) (package (name "r-imagearray") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -23051,7 +23051,7 @@ (define-public r-velocyto (revision "1")) (package (name "r-velocyto") - (version (git-version "0.6" revision commit)) + (version (make-git-version "0.6" revision commit)) (source (origin (method git-fetch) @@ -23094,7 +23094,7 @@ (define-public r-voltron (revision "5")) (package (name "r-voltron") - (version (git-version "0.2.0" revision commit)) + (version (make-git-version "0.2.0" revision commit)) (source (origin (method git-fetch) @@ -23225,7 +23225,7 @@ (define-public r-zarrdataframe (revision "1")) (package (name "r-zarrdataframe") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -23254,7 +23254,7 @@ (define-public r-zarrarray (revision "1")) (package (name "r-zarrarray") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -24051,7 +24051,7 @@ (define-public r-signac (revision "1")) (package (name "r-signac") - (version (git-version "1.12.0" revision commit)) + (version (make-git-version "1.12.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -24140,7 +24140,7 @@ (define-public python-pyvcf3 (revision "0")) (package (name "python-pyvcf3") - (version (git-version "1.0.3" revision commit)) + (version (make-git-version "1.0.3" revision commit)) (source (origin (method git-fetch) @@ -24778,7 +24778,7 @@ (define-public r-catch (revision "1")) (package (name "r-catch") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -24806,7 +24806,7 @@ (define-public r-spacexr (revision "1")) (package (name "r-spacexr") - (version (git-version "2.2.1" revision commit)) + (version (make-git-version "2.2.1" revision commit)) (source (origin (method git-fetch) @@ -24926,7 +24926,7 @@ (define-public r-compgenomrdata (revision "1")) (package (name "r-compgenomrdata") - (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 @@ -24949,7 +24949,7 @@ (define-public r-cytonorm (revision "1")) (package (name "r-cytonorm") - (version (git-version "0.0.10" revision commit)) + (version (make-git-version "0.0.10" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -24987,7 +24987,7 @@ (define-public r-kbet (revision "1")) (package (name "r-kbet") - (version (git-version "0.99.6" revision commit)) + (version (make-git-version "0.99.6" revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index f11f8543751..a9667cc9b42 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -275,7 +275,7 @@ (define-public tremc (revision "1")) (package (name "tremc") - (version (git-version "0.9.3" revision commit)) + (version (make-git-version "0.9.3" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index d0899635182..6cb3a944ed6 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -385,7 +385,7 @@ (define-public boost-sync (revision "2")) (package (name "boost-sync") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -417,7 +417,7 @@ (define-public boost-signals2 (revision "0")) (package (name "boost-signals2") - (version (git-version (package-version boost) revision commit)) + (version (make-git-version (package-version boost) revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 1321b55df49..31f91bb1fc2 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -673,7 +673,7 @@ (define-public syslinux (let ((commit "bb41e935cc83c6242de24d2271e067d76af3585c")) (package (name "syslinux") - (version (git-version "6.04-pre" "1" commit)) + (version (make-git-version "6.04-pre" "1" commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1630,7 +1630,7 @@ (define u-boot-ts-mx6 (package (inherit u-boot) (name "u-boot-ts-mx6") - (version (git-version "2015.04_3" revision commit)) + (version (make-git-version "2015.04_3" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1944,7 +1944,7 @@ (define-public ipxe (revision "3")) (package (name "ipxe") - (version (git-version "1.21.1" revision commit)) + (version (make-git-version "1.21.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/bqn.scm b/gnu/packages/bqn.scm index fd090ad4336..3f60650fad6 100644 --- a/gnu/packages/bqn.scm +++ b/gnu/packages/bqn.scm @@ -39,7 +39,7 @@ (define-public dbqn (revision "1")) (package (name "dbqn") - (version (git-version "0.2.1" revision commit)) + (version (make-git-version "0.2.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -126,7 +126,7 @@ (define cbqn-bootstrap (commit "66584ce1491d300746963b8ed17170348b2a03e6")) (package (name "cbqn-bootstrap") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/browser-extensions.scm b/gnu/packages/browser-extensions.scm index 934466f9515..de422b484b5 100644 --- a/gnu/packages/browser-extensions.scm +++ b/gnu/packages/browser-extensions.scm @@ -97,7 +97,7 @@ (define ublock-main-assets (let* ((name "ublock-main-assets") (commit "4696d6a593755d34b28c073b0150f4b4bb000387") (revision "4") - (version (git-version "0" revision commit))) + (version (make-git-version "0" revision commit))) (origin (method git-fetch) (uri (git-reference @@ -113,7 +113,7 @@ (define ublock-prod-assets (let* ((name "ublock-prod-assets") (commit "bfeb222d20279afcc997d4b804fc4862f1364f95") (revision "4") - (version (git-version "0" revision commit))) + (version (make-git-version "0" revision commit))) (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 77c64fb1a37..b63829b95cf 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -235,7 +235,7 @@ (define-public gn (revision "2072")) ;as returned by `git describe`, used below (package (name "gn") - (version (git-version "0.0" revision commit)) + (version (make-git-version "0.0" revision commit)) (home-page "https://gn.googlesource.com/gn") (source (origin (method git-fetch) @@ -387,7 +387,7 @@ (define-public muon (revision "0")) (package (name "muon") - (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 @@ -831,7 +831,7 @@ (define-public genie (revision "0")) (package (name "genie") - (version (git-version "1170" revision commit)) + (version (make-git-version "1170" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -866,7 +866,7 @@ (define*-public (gnulib-checkout #:key "Return as a package the exact gnulib checkout." (package (name "gnulib") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -1114,7 +1114,7 @@ (define-public potato-make (revision "0")) (package (name "potato-make") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch)