From patchwork Sat Jul 26 02:39:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43296 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 6DBF327BC4B; Sat, 26 Jul 2025 03:51:13 +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 CC6FA27BC49 for ; Sat, 26 Jul 2025 03:51:11 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufUzm-00074T-JO; Fri, 25 Jul 2025 22:50:46 -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 1ufUxB-0004yb-1l for guix-patches@gnu.org; Fri, 25 Jul 2025 22:48: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 1ufUxA-0006NN-Na for guix-patches@gnu.org; Fri, 25 Jul 2025 22:48:04 -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=ZQaMkgDnKIJtX8KH/nGXqSlcmae1qGp7zqotx/NzzKs=; b=Xg57wxWCjyIjGemINU0NlPFgG28aq4N0hCvliqhSLfsAHo4OQnWdblpFzprqvFZ4Rmi1iF+2/62BcLE3CZSW26/YqnKJhEQaRtgg50gCZFoSWQAV/Rddk3P7NTXRVL80hQ85Vk0kWjdlQA3+fsz967uV3GJAzq5DWWO3uoSoqL5Y2sT3AQRVOu/V92IxMN4fNLQDA+NAKO3cTl1U5zvDY/Hk8yJV6wsZIYVg/CwVD3I/DBR8UJ5Bn0/Q8tn6I65bUfuDN8QbOY6OTn4+LRDyCjUAJKBsYPqxr0FCerUCNHI5bZLsUPyClhRz8LKNJXAcBNWJuVekaE4WWwrLGNWxFA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ufUxA-0008Q1-8z for guix-patches@gnu.org; Fri, 25 Jul 2025 22:48:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79099] [PATCH 25/34] gnu/packages/p*.scm: Use make-git-version. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Jul 2025 02:48:04 +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.175349807132262 (code B ref 79099); Sat, 26 Jul 2025 02:48:04 +0000 Received: (at 79099) by debbugs.gnu.org; 26 Jul 2025 02:47:51 +0000 Received: from localhost ([127.0.0.1]:38226 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ufUwq-0008O2-Tn for submit@debbugs.gnu.org; Fri, 25 Jul 2025 22:47:49 -0400 Received: from 7.mo562.mail-out.ovh.net ([46.105.55.234]:50921) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ufUwm-0008Ni-Eo for 79099@debbugs.gnu.org; Fri, 25 Jul 2025 22:47:42 -0400 Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net [79.137.60.37]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4bppr56ythz2blW; Sat, 26 Jul 2025 02:40:21 +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:21 +0000 (UTC) Received: from mta10.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.96.1]) by director4.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bppr55yYFz1xrj; Sat, 26 Jul 2025 02:40:21 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.5]) by mta10.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 79BF4783168; Sat, 26 Jul 2025 02:40:21 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-98R00204996cdd-aa68-4258-b15c-549d1149102e, 7BFD41D65738CBEA4850BE66907D66307393418F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sat, 26 Jul 2025 04:39:31 +0200 Message-ID: <20250726023951.11862-25-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: 4617596995420414690 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdekhedvfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvheelieffheetvdelhfffffejfefgudfhteekveehieetudeiudfgkeeutdehjeenucffohhmrghinhepghhithhhuhgsrdgtohhmnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgepvdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledtleelseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=ZQaMkgDnKIJtX8KH/nGXqSlcmae1qGp7zqotx/NzzKs=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1753497622; v=1; b=3u9IxaV/PVm781VZyoBq1mg1P5FZxNXi2QYG/90P24ba4gK8aGjfcckM4j7O+iWnlLKtzsHG 9CLojJAmoMD2eLmDvs0q1k3TPTj9Raf4mqNQHJsXe8Tq6TzCPamVbrSH+TiWhTouYnkCYUFQ0qc DOyrl7A6rP4fNKMP4P7gPKAOrwt157XcdD3dr42Sy/mzfzjWO1uOGOFdDg66r7rKzthtXpeg5g1 FdiedpyfUpPXNh73p6lsiRnYJcey/QuUxqEcawAUx62X9Up/fzEy4+Xo/CJFJoL+bQh7p2HRjOr VcCnan0Tsx5dsn7A7rmaOzwcENN5M/ppufCx2TEfRqBZg== 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 "p*.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/package-management.scm | 8 +++--- gnu/packages/parallel.scm | 13 ++++----- gnu/packages/password-utils.scm | 10 +++---- gnu/packages/patchutils.scm | 2 +- gnu/packages/pdf.scm | 4 +-- gnu/packages/perl6.scm | 16 +++++------ gnu/packages/phabricator.scm | 2 +- gnu/packages/photo.scm | 2 +- gnu/packages/piet.scm | 5 ++-- gnu/packages/plan9.scm | 6 ++--- gnu/packages/plotutils.scm | 2 +- gnu/packages/potassco.scm | 9 ++++--- gnu/packages/python-check.scm | 14 +++++----- gnu/packages/python-graphics.scm | 2 +- gnu/packages/python-science.scm | 11 ++++---- gnu/packages/python-web.scm | 11 ++++---- gnu/packages/python-xyz.scm | 42 ++++++++++++++--------------- 17 files changed, 80 insertions(+), 79 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 4ef1cd3ebbb..03e669b3c31 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1080,7 +1080,7 @@ (define-public bffe (revision "15")) (package (name "bffe") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1665,7 +1665,7 @@ (define-public gwl/next (package (inherit gwl) (name "gwl-next") - (version (git-version "0.5.0" revision commit)) + (version (make-git-version "0.5.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1681,7 +1681,7 @@ (define-public guix-build-coordinator (revision "131")) (package (name "guix-build-coordinator") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1936,7 +1936,7 @@ (define-public nar-herder (revision "41")) (package (name "nar-herder") - (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/parallel.scm b/gnu/packages/parallel.scm index 013ebd2fc0e..d07adafa399 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -529,7 +529,7 @@ (define-public python-slurm-magic (revision "0")) (package (name "python-slurm-magic") - (version (git-version "0.0" revision commit)) + (version (make-git-version "0.0" revision commit)) (home-page "https://github.com/NERSC/slurm-magic") (source (origin (method git-fetch) @@ -574,11 +574,10 @@ (define-public pthreadpool ;; This repository has only one tag, 0.1, which is older than what users ;; such as XNNPACK expect. (let ((commit "560c60d342a76076f0557a3946924c6478470044") - (version "0.1") (revision "3")) (package (name "pthreadpool") - (version (git-version version revision commit)) + (version (make-git-version "0.1" revision commit)) (home-page "https://github.com/Maratyszcza/pthreadpool") (source (origin (method git-fetch) @@ -602,12 +601,11 @@ (define-public pthreadpool (define-public cpuinfo ;; There's currently no tag on this repo. - (let ((version "0.0") - (revision "5") + (let ((revision "5") (commit "b73ae6ce38d5dd0b7fe46dbe0a4b5f4bab91c7ea")) (package (name "cpuinfo") - (version (git-version version revision commit)) + (version (make-git-version "0.0" revision commit)) (home-page "https://github.com/pytorch/cpuinfo") (source (origin (method git-fetch) @@ -678,11 +676,10 @@ (define-public clog (define-public psimd ;; There is currently no tag in this repo. (let ((commit "072586a71b55b7f8c584153d223e95687148a900") - (version "0.0") (revision "1")) (package (name "psimd") - (version (git-version version revision commit)) + (version (make-git-version "0.0" revision commit)) (home-page "https://github.com/Maratyszcza/Psimd") (source (origin (method git-fetch) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 7e5d6acbb73..68aa94f3002 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -495,7 +495,7 @@ (define-public pwsafe-cli (revision "0")) (package (name "pwsafe-cli") - (version (git-version "0.2.0" revision commit)) + (version (make-git-version "0.2.0" revision commit)) (source (origin (method git-fetch) @@ -1123,7 +1123,7 @@ (define-public rofi-pass (revision "0")) (package (name "rofi-pass") - (version (git-version "2.0.2" revision commit)) + (version (make-git-version "2.0.2" revision commit)) (source (origin (method git-fetch) @@ -1405,7 +1405,7 @@ (define-public secretsd (revision "0")) (package (name "secretsd") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -1883,7 +1883,7 @@ (define-public makepasswd (revision "1")) (package (name "makepasswd") - (version (git-version "0.5.4" revision commit)) + (version (make-git-version "0.5.4" revision commit)) (source (origin (method git-fetch) @@ -1919,7 +1919,7 @@ (define-public pass-tomb (revision "0")) (package (name "pass-tomb") - (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/patchutils.scm b/gnu/packages/patchutils.scm index 511f8bfead6..d0fb3fedcc0 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -71,7 +71,7 @@ (define-public coccinelle (commit "6608e45f85a10c57a3c910154cf049a5df4d98e4")) (package (name "coccinelle") - (version (git-version "1.1.1" revision commit)) + (version (make-git-version "1.1.1" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 58260fcf015..b4ea30e9f2e 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -253,7 +253,7 @@ (define-public diffpdf (revision "1")) (package (name "diffpdf") - (version (git-version "2.1.3.1" revision commit)) + (version (make-git-version "2.1.3.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1833,7 +1833,7 @@ (define-public sioyek (revision "1")) (package (name "sioyek") - (version (git-version "2.0.0" revision commit)) + (version (make-git-version "2.0.0" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/perl6.scm b/gnu/packages/perl6.scm index 317a1bd021b..2d59a2127ab 100644 --- a/gnu/packages/perl6.scm +++ b/gnu/packages/perl6.scm @@ -314,7 +314,7 @@ (define-public perl6-format-lisp (revision "0")) (package (name "perl6-format-lisp") - (version (git-version "0.0.2" revision commit)) + (version (make-git-version "0.0.2" revision commit)) (source (origin (method git-fetch) @@ -338,7 +338,7 @@ (define-public perl6-grammar-debugger (revision "1")) (package (name "perl6-grammar-debugger") - (version (git-version "1.0.1" revision commit)) + (version (make-git-version "1.0.1" revision commit)) (source (origin (method git-fetch) @@ -366,7 +366,7 @@ (define-public perl6-grammar-profiler-simple (revision "1")) (package (name "perl6-grammar-profiler-simple") - (version (git-version "0.02" revision commit)) + (version (make-git-version "0.02" revision commit)) (source (origin (method git-fetch) @@ -543,7 +543,7 @@ (define-public perl6-json-unmarshal (revision "1")) (package (name "perl6-json-unmarshal") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -670,7 +670,7 @@ (define-public perl6-svg (revision "1")) (package (name "perl6-svg") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -697,7 +697,7 @@ (define-public perl6-svg-plot (revision "1")) (package (name "perl6-svg-plot") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -795,7 +795,7 @@ (define-public perl6-test-mock (revision "0")) (package (name "perl6-test-mock") - (version (git-version "1.5" revision commit)) + (version (make-git-version "1.5" revision commit)) (source (origin (method git-fetch) @@ -848,7 +848,7 @@ (define-public perl6-xml-writer (revision "1")) (package (name "perl6-xml-writer") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/phabricator.scm b/gnu/packages/phabricator.scm index d6c0f03d013..beba9998f7e 100644 --- a/gnu/packages/phabricator.scm +++ b/gnu/packages/phabricator.scm @@ -31,7 +31,7 @@ (define-public arcanist (revision "2")) (package (name "arcanist") - (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/photo.scm b/gnu/packages/photo.scm index 3b671455bd3..3759c7893e6 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -657,7 +657,7 @@ (define-public ansel (revision "1")) (package (name "ansel") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/piet.scm b/gnu/packages/piet.scm index 326520adf30..14158a5e6f5 100644 --- a/gnu/packages/piet.scm +++ b/gnu/packages/piet.scm @@ -80,7 +80,7 @@ (define-public piet-toolchain (revision "0")) (package (name "piet-toolchain") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -110,7 +110,8 @@ (define-public piet-toolchain (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin")) (doc (string-append out "/share/doc/" - ,name "-" ,version))) + ,name "-" + ,(package-version this-package)))) (for-each (lambda (script) (install-file script bin) (wrap-program (string-append bin "/" script) diff --git a/gnu/packages/plan9.scm b/gnu/packages/plan9.scm index c60025b5458..e10c53ea3b9 100644 --- a/gnu/packages/plan9.scm +++ b/gnu/packages/plan9.scm @@ -44,7 +44,7 @@ (define-public diod (revision "1")) (package (name "diod") - (version (git-version "1.0.24" revision commit)) + (version (make-git-version "1.0.24" revision commit)) (source (origin (method git-fetch) @@ -76,7 +76,7 @@ (define-public drawterm (commit "f11139d4c918802a87730bc14d094670ee4ce572")) (package (name "drawterm") - (version (git-version "20240703" revision commit)) + (version (make-git-version "20240703" revision commit)) (source (origin (method git-fetch) @@ -131,7 +131,7 @@ (define-public plan9port (revision "1")) (package (name "plan9port") - (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 diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index 5276f96fea3..cf4794c94cd 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -215,7 +215,7 @@ (define-public guile-charting (revision "1")) (package (name "guile-charting") - (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/potassco.scm b/gnu/packages/potassco.scm index 9c6f42bdec6..38651b2e939 100644 --- a/gnu/packages/potassco.scm +++ b/gnu/packages/potassco.scm @@ -53,7 +53,7 @@ (define-public libpotassco (commit "2eecf5f066fe1f77c9122547f7e07ba1e8c1dcdf")) (package (name "libpotassco") - (version (git-version "0.0" revision commit)) + (version (make-git-version "0.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -354,7 +354,7 @@ (define-public emacs-pasp-mode (revision "1")) (package (name "emacs-pasp-mode") - (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 @@ -382,7 +382,8 @@ (define-public emacs-pasp-mode (beginning-of-line) (kill-sexp) (insert (format "(defconst emacs-pasp-version \"%s\" %s)" - #$version (cadr kill-ring))) + #$(package-version this-package) + (cadr kill-ring))) (basic-save-buffer))))) (add-after 'unpack 'hardcode-clingo (lambda* (#:key inputs #:allow-other-keys) @@ -544,7 +545,7 @@ (define-public python-asprin (commit "bc5a0cf7d9ba346cf91cba66282b5946dbf1331c")) (package (name "python-asprin") - (version (git-version "3.1.1" revision commit)) + (version (make-git-version "3.1.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index c7a9d315b1b..41ba9bfa7b5 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -149,7 +149,7 @@ (define-public python-assay (revision "0")) (package (name "python-assay") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -679,7 +679,7 @@ (define-public python-expecttest (revision "0")) (package (name "python-expecttest") - (version (git-version "0.2.1" revision commit)) + (version (make-git-version "0.2.1" revision commit)) (source (origin (method git-fetch) @@ -1076,7 +1076,7 @@ (define-public python-junit-xml (revision "0")) (package (name "python-junit-xml") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (home-page "https://github.com/kyrus/python-junit-xml") (source (origin (method git-fetch) @@ -2997,7 +2997,7 @@ (define-public python-pytest-shard (revision "0")) (package (name "python-pytest-shard") - (version (git-version "0.1.2" revision commit)) + (version (make-git-version "0.1.2" revision commit)) (source (origin (method git-fetch) @@ -3368,7 +3368,7 @@ (define-public python-pytest-vcr (revision "1")) (package (name "python-pytest-vcr") - (version (git-version "1.0.2" revision commit)) + (version (make-git-version "1.0.2" revision commit)) (source (origin (method git-fetch) @@ -3587,7 +3587,7 @@ (define-public python-scspell3k (revision "0")) (package (name "python-scspell3k") - (version (git-version "2.3.0" revision commit)) + (version (make-git-version "2.3.0" revision commit)) (source (origin (method git-fetch) @@ -3717,7 +3717,7 @@ (define-public python-sure (revision "0")) (package (name "python-sure") - (version (git-version "2.0.1" revision commit)) + (version (make-git-version "2.0.1" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/python-graphics.scm b/gnu/packages/python-graphics.scm index 3d03ce93c39..1ddf16fd5dc 100644 --- a/gnu/packages/python-graphics.scm +++ b/gnu/packages/python-graphics.scm @@ -138,7 +138,7 @@ (define-public python-glcontext (commit "f2875abdb18b24e785c3958cc22845c81725d5cd")) (package (name "python-glcontext") - (version (git-version "3.0.0" revision commit)) + (version (make-git-version "3.0.0" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index dbbd44db700..228afc267c2 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -353,7 +353,7 @@ (define-public python-apted (revision "0")) (package (name "python-apted") - (version (git-version "1.0.3" revision commit)) + (version (make-git-version "1.0.3" revision commit)) (source (origin (method git-fetch) @@ -991,7 +991,7 @@ (define-public python-deepdish (revision "0")) (package (name "python-deepdish") - (version (git-version "0.3.7" revision commit)) + (version (make-git-version "0.3.7" revision commit)) (source (origin (method git-fetch) @@ -1711,7 +1711,7 @@ (define-public python-mpsplines (revision "0")) (package (name "python-mpsplines") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -2875,7 +2875,7 @@ (define-public python-scikit-survival (commit "bceb53ebb8306f959c70fae2be9d552f33dd3f21")) (package (name "python-scikit-survival") - (version (git-version "0.22.2" revision commit)) + (version (make-git-version "0.22.2" revision commit)) (source (origin (method git-fetch) @@ -2896,7 +2896,8 @@ (define-public python-scikit-survival (add-before 'build 'set-version (lambda _ (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" - #$(version-major+minor version))))))) + #$(version-major+minor + (package-version this-package)))))))) (propagated-inputs (list python-ecos python-importlib-resources diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 3ecfe877608..ef10a606b19 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2736,7 +2736,7 @@ (define-public python-pyscss (revision "0")) (package (name "python-pyscss") - (version (git-version "1.4.0" revision commit)) + (version (make-git-version "1.4.0" revision commit)) (source (origin (method git-fetch) ; no tests in PyPI release @@ -3071,7 +3071,7 @@ (define-public python-flask-assets (revision "1")) (package (name "python-flask-assets") - (version (git-version "2.1.0" revision commit)) + (version (make-git-version "2.1.0" revision commit)) (source (origin (method git-fetch) @@ -3485,7 +3485,7 @@ (define-public python-omnipath (revision "0")) (package (name "python-omnipath") - (version (git-version "1.0.8" revision commit)) + (version (make-git-version "1.0.8" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -5416,7 +5416,7 @@ (define-public oauth2ms (revision "0")) (package (name "oauth2ms") - (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 @@ -5430,7 +5430,8 @@ (define-public oauth2ms (arguments (list #:install-plan #~`(("oauth2ms" "bin/oauth2ms") ("." #$(string-append "share/doc/" name "-" - version "/") + (package-version + this-package) "/") #:include-regexp ("\\.org$"))) #:phases #~(modify-phases %standard-phases (add-after 'install 'wrap-pythonpath diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6b7b3c9c01e..c392e1a4bae 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1959,7 +1959,7 @@ (define-public python-colored-traceback (revision "0")) (package (name "python-colored-traceback") - (version (git-version "0.4.2" revision commit)) + (version (make-git-version "0.4.2" revision commit)) (source (origin (method git-fetch) @@ -4037,7 +4037,7 @@ (define-public python-hdf5storage (revision "0")) (package (name "python-hdf5storage") - (version (git-version "0.1.19" revision commit)) + (version (make-git-version "0.1.19" revision commit)) (source (origin (method git-fetch) @@ -4073,7 +4073,7 @@ (define-public python-hjson (commit "1687b811fcbbc54b5ac71cfbaa99f805e406fbcb")) (package (name "python-hjson") - (version (git-version "3.1.0" revision commit)) + (version (make-git-version "3.1.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -8917,7 +8917,7 @@ (define-public python-robotframework-lint (revision "0")) (package (name "python-robotframework-lint") - (version (git-version "1.1" ;version taken from 'rflint/version.py' + (version (make-git-version "1.1" ;version taken from 'rflint/version.py' revision commit)) (source (origin @@ -12711,7 +12711,7 @@ (define-public python-ffmpeg-python (let ((commit "df129c7ba30aaa9ffffb81a48f53aa7253b0b4e6") (revision "0")) (package (name "python-ffmpeg-python") - (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 @@ -17878,7 +17878,7 @@ (define-public wfetch (revision "2")) (package (name "wfetch") - (version (git-version "0.1-pre" revision commit)) + (version (make-git-version "0.1-pre" revision commit)) (home-page "https://github.com/Gcat101/Wfetch") (source (origin @@ -20183,7 +20183,7 @@ (define-public python-args (revision "0")) (package (name "python-args") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -26867,7 +26867,7 @@ (define-public python-rfc6555 (revision "1")) (package (name "python-rfc6555") - (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 @@ -27898,7 +27898,7 @@ (define-public python-pyclibrary (revision "0")) (package (name "python-pyclibrary") - (version (git-version "0.2.2" revision commit)) + (version (make-git-version "0.2.2" revision commit)) (source (origin (method git-fetch) @@ -28315,7 +28315,7 @@ (define-public python-gyp (name "python-gyp") ;; Google does not release versions, ;; based on second most recent commit date. - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin ;; Google does not release tarballs, @@ -30721,7 +30721,7 @@ (define-public python-construct (revision "1")) (package (name "python-construct") - (version (git-version "2.10.70" revision commit)) + (version (make-git-version "2.10.70" revision commit)) (source (origin ;; There are no tests in the PyPI tarball. @@ -33061,7 +33061,7 @@ (define-public python-py-cpuinfo (revision "1")) (package (name "python-py-cpuinfo") - (version (git-version "8.0.0" revision commit)) + (version (make-git-version "8.0.0" revision commit)) (source (origin (method git-fetch) @@ -33351,7 +33351,7 @@ (define-public python-txsni (revision "0")) (package (name "python-txsni") - (version (git-version "0.1.9" revision commit)) + (version (make-git-version "0.1.9" revision commit)) (home-page "https://github.com/glyph/txsni") (source (origin @@ -34757,7 +34757,7 @@ (define-public python-version (revision "1")) (package (name "python-version") - (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 @@ -35832,7 +35832,7 @@ (define-public python-redo (revision "0")) (package (name "python-redo") - (version (git-version "2.0.4" revision commit)) + (version (make-git-version "2.0.4" revision commit)) (source (origin (method git-fetch) ; There are no tests in the PyPI release. @@ -36354,7 +36354,7 @@ (define-public python-peachpy (revision "3")) (package (name "python-peachpy") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (home-page "https://github.com/Maratyszcza/PeachPy") (source (origin (method git-fetch) @@ -36392,7 +36392,7 @@ (define-public python-sgmllib3k (package (name "python-sgmllib3k") (version - (git-version "1.0.0" revision commit)) + (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -36753,7 +36753,7 @@ (define-public date2name (revision "1")) (package (name "date2name") - (version (git-version "0.0" revision commit)) + (version (make-git-version "0.0" revision commit)) (source (origin (method git-fetch) @@ -37220,7 +37220,7 @@ (define-public python-fields (revision "0")) (package (name "python-fields") - (version (git-version "5.0.0" revision commit)) + (version (make-git-version "5.0.0" revision commit)) (source (origin (method git-fetch) @@ -38681,7 +38681,7 @@ (define-public python-flatten-json (revision "0")) (package (name "python-flatten-json") - (version (git-version "0.1.14" revision commit)) + (version (make-git-version "0.1.14" revision commit)) (source (origin (method git-fetch) ; no tests in PyPI release @@ -39405,7 +39405,7 @@ (define-public python-biblib (revision "1")) (package (name "python-biblib") - (version (git-version upstream-version revision commit)) + (version (make-git-version upstream-version revision commit)) (source (origin (method git-fetch)