From patchwork Sat Jul 26 02:39:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43271 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 0027227BC4B; Sat, 26 Jul 2025 03:41:38 +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 9DA5D27BC49 for ; Sat, 26 Jul 2025 03:41:36 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufUqh-00009n-CO; Fri, 25 Jul 2025 22:41:23 -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 1ufUqf-00008L-2q for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:21 -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 1ufUqe-0005Pz-Mr for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:20 -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:Date:From:To:In-Reply-To:References:Subject; bh=ZRGAsSpND4WIfJPBlX70PLZr5++lHyL5dAqYy36MTio=; b=T6FpnvI2XQtoZuNk9rvRTH5HYFSbE0hME6GF7laKl0UTSEA2yHpK14ZAaIt/+GTXXALzoWxjLukoxWxVYgnXqSIyQx9i0tF1Qzg3wn4oLAMo8j8IzNAzkWJxguRUmX6uxlgPRJWrtFEv6OP6c0CbWAVi5+lGWzevxtvaj8NxM1D2B9rIvDZsql0766a8D7Ixm97ltjsi66Gv52M/COrHADlMBDArmimdJv7Q4h9CloJcTt0RT2rkgi8XLCs2qfDgZTz3pvIaH8xpZQFnaFviaPuYv+tnmG5djf54OBFsI4EBkz7cuBuzUU8e/g8TrYwWTW93lJVOfPj4SmzI1KwJPQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ufUqe-0007tB-4L for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:20 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79099] [PATCH 01/34] gnu: packages: Use git-file-name. References: <20250726023730.10578-1-ngraves@ngraves.fr> In-Reply-To: <20250726023730.10578-1-ngraves@ngraves.fr> Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Jul 2025 02:41:19 +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.175349767030243 (code B ref 79099); Sat, 26 Jul 2025 02:41:19 +0000 Received: (at 79099) by debbugs.gnu.org; 26 Jul 2025 02:41:10 +0000 Received: from localhost ([127.0.0.1]:38118 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ufUqP-0007rK-A2 for submit@debbugs.gnu.org; Fri, 25 Jul 2025 22:41:09 -0400 Received: from 7.mo562.mail-out.ovh.net ([46.105.55.234]:59913) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ufUpK-0007dr-W0 for 79099@debbugs.gnu.org; Fri, 25 Jul 2025 22:40:30 -0400 Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net [79.137.60.36]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4bppqc6lpPz20Bj; Sat, 26 Jul 2025 02:39:56 +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:39:56 +0000 (UTC) Received: from mta3.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.0.122]) by director2.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bppqc5Pl2z1xpd; Sat, 26 Jul 2025 02:39:56 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.11]) by mta3.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 56136942E1A; Sat, 26 Jul 2025 02:39:56 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-111S005135cda44-186b-4f87-aae2-5dc1fee114ea, 7BFD41D65738CBEA4850BE66907D66307393418F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sat, 26 Jul 2025 04:39:07 +0200 Message-ID: <20250726023951.11862-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.50.1 MIME-Version: 1.0 X-Ovh-Tracer-Id: 4610560118861587170 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdekhedvfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpefgkeegudfghfetkeeukeelgfetvefgkeefueelheehgfekjefgvdegtdegteejvdenucffohhmrghinhepghhithhhuhgsrdgtohhmpdhgohhoghhlvghsohhurhgtvgdrtghomhdpfhhrrghmrghgihhtrdhorhhgpdhkhihlvggrmhdrtghomhdpshhfrdhnvghtpdgsihhtsghutghkvghtrdhorhhgpdhgnhhomhgvrdhorhhgpdgsrhgrnhgthhgrsghlvgdrtghomhdpkhgvrhhnvghlrdhorhhgnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledtleelseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=ZRGAsSpND4WIfJPBlX70PLZr5++lHyL5dAqYy36MTio=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1753497597; v=1; b=AxDBitbe4i7dHn8EPksFIqmL+y43LG483Ess4QgfkGcJC3NsVUSaY5ijgzsMD4xNc6eI2t+E YnmwHbr4BArzu4yYHeFnkc6Ncck/td0JSvkFweh+RVDD4SbsimuhcAOjg/scvEP85Zmr9hegtBa 3Gpmcyo0dYeofB7WnMsBUsML/MZ0t8CZb7u8GRK9CDOxA7gdK5zaWuho1iWMZmot34FJhFJgZK6 O/DAW9hVmWM23aySrK5OWZfoxWcdEWF4nlS8WzS6pqbJxaGwStv8SXkvSkr8CbAlFh+RVYI++1Z ojxM6okD7F7uEBRxVCtmb9CHgXkVS5KXaEqcB0cRQlYGw== 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 This is a prerequisite for the git-version proposition rewrite. I ran: find gnu/packages/ -type f -name "*.scm" -exec sed -i 's/(file-name (string-append name "-" version "-checkout"))/(file-name (git-file-name name version))/g' {} + Then I discarded changes when it was not a git-fetch. I don't think it's good idea to call git-file-name for vcs/svn/hg/bzr. * gnu/packages/admin.scm (novena-eeprom) * gnu/packages/algebra.scm (java-la4j) * gnu/packages/audio.scm (filteraudio, noise-repellent) * gnu/packages/bioinformatics.scm (java-htsjdk-latest, java-htsjdk-2.10.1, newick-utils, smithlab-cpp, libstadenio-for-salmon, java-forester, java-biojava-core, java-biojava-core-4.0, sjcount) * gnu/packages/bootloaders.scm (vboot-utils) * gnu/packages/databases.scm (guile-wiredtiger) * gnu/packages/debug.scm (seer-gdb) * gnu/packages/emacs-xyz.scm (emacs-piem) * gnu/packages/embedded.scm (openocd, binutils-vc4, ebusd) * gnu/packages/emulators.scm (exomizer, cc65) * gnu/packages/engineering.scm (openctm) * gnu/packages/fonts.scm (font-blackfoundry-inria) * gnu/packages/gnome.scm (blueprint-compiler, blueprint-compiler-0.4, byzanz) * gnu/packages/graph.scm (r-rbiofabric) * gnu/packages/graphics.scm (brdf-explorer) * gnu/packages/guile.scm (guile-gdbm-ffi, guile-sqlite3) * gnu/packages/idris.scm (idris-bifunctors) * gnu/packages/java.scm (jbr11, jbr17, jbr21, java-testng, java-jeromq): Use git-file-name. * gnu/packages/javascript.scm (js-json2) * gnu/packages/julia.scm (libwhich) * gnu/packages/kodi.scm (crossguid, libdvdnav/kodi, libdvdread/kodi, libdvdcss/kodi, kodi-cli) * gnu/packages/linux.scm (edac-utils) * gnu/packages/machine-learning.scm (fann) * gnu/packages/mail.scm (notmuch-addrlookup-c, dovecot-libsodium-plugin, esmtp) * gnu/packages/maths.scm (reducelcs, minisat) * gnu/packages/messaging.scm (libtoxcore, utox, python-librecaptcha, python-harmony) * gnu/packages/music.scm (libpd, jack-capture, gx-guvnor-lv2, gx-overdriver-lv2, gx-tone-mender-lv2, gx-push-pull-lv2, gx-suppa-tone-bender-lv2, gx-hyperion-lv2, gx-voodoo-fuzz-lv2, gx-super-fuzz-lv2, gx-vintage-fuzz-master-lv2, gx-slow-gear-lv2, gx-switchless-wah-lv2, mod-utilities, sonivox-eas) * gnu/packages/package-management.scm (bffe, guix-build-coordinator, nar-herder) * gnu/packages/pascal.scm (lazarus) * gnu/packages/pumpio.scm (pumpa) * gnu/packages/robotics.scm (enki, aseba) * gnu/packages/ruby-xyz.scm (ruby-minitar, ruby-tdiff, ruby-nokogiri-diff): Use git-file-name. * gnu/packages/scheme.scm (scheme48-rx, stalin, femtolisp) * gnu/packages/selinux.scm (python-setools) * gnu/packages/shells.scm (linenoise, s-shell) * gnu/packages/shellutils.scm (tran) * gnu/packages/sync.scm (casync) * gnu/packages/terminals.scm (cool-retro-term) * gnu/packages/version-control.scm (myrepos, grokmirror) * gnu/packages/vim.scm (vim-neosnippet-snippets, vim-neosnippet, vim-luna, vim-context-filetype, vim-commentary, vim-guile, vim-dhall-vim, vim-mundo, vim-zig, vim-plantuml-syntax) * gnu/packages/vulkan.scm (vkd3d) * gnu/packages/wm.scm (python-i3-py, quickswitch-i3, fbautostart): Use git-file-name. * gnu/packages/xdisorg.scm (xssproxy, xftwidth) * gnu/packages/zile.scm (zile-on-guile): Use git-file-name when equivalent. --- gnu/packages/admin.scm | 2 +- gnu/packages/algebra.scm | 2 +- gnu/packages/audio.scm | 4 ++-- gnu/packages/bioinformatics.scm | 18 ++++++++--------- gnu/packages/bootloaders.scm | 2 +- gnu/packages/databases.scm | 2 +- gnu/packages/debug.scm | 2 +- gnu/packages/emacs-xyz.scm | 2 +- gnu/packages/embedded.scm | 6 +++--- gnu/packages/emulators.scm | 4 ++-- gnu/packages/engineering.scm | 2 +- gnu/packages/fonts.scm | 2 +- gnu/packages/gnome.scm | 6 +++--- gnu/packages/graph.scm | 2 +- gnu/packages/graphics.scm | 2 +- gnu/packages/guile.scm | 4 ++-- gnu/packages/idris.scm | 2 +- gnu/packages/java.scm | 10 +++++----- gnu/packages/javascript.scm | 2 +- gnu/packages/julia.scm | 2 +- gnu/packages/kodi.scm | 10 +++++----- gnu/packages/linux.scm | 2 +- gnu/packages/machine-learning.scm | 2 +- gnu/packages/mail.scm | 6 +++--- gnu/packages/maths.scm | 4 ++-- gnu/packages/messaging.scm | 8 ++++---- gnu/packages/music.scm | 30 ++++++++++++++--------------- gnu/packages/package-management.scm | 6 +++--- gnu/packages/pascal.scm | 2 +- gnu/packages/pumpio.scm | 2 +- gnu/packages/robotics.scm | 4 ++-- gnu/packages/ruby-xyz.scm | 6 +++--- gnu/packages/scheme.scm | 6 +++--- gnu/packages/selinux.scm | 2 +- gnu/packages/shells.scm | 4 ++-- gnu/packages/shellutils.scm | 2 +- gnu/packages/sync.scm | 2 +- gnu/packages/terminals.scm | 2 +- gnu/packages/version-control.scm | 4 ++-- gnu/packages/vim.scm | 20 +++++++++---------- gnu/packages/vulkan.scm | 2 +- gnu/packages/wm.scm | 6 +++--- gnu/packages/xdisorg.scm | 4 ++-- gnu/packages/zile.scm | 2 +- 44 files changed, 108 insertions(+), 108 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 0c0139e10f4..cc57b1207ec 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -5704,7 +5704,7 @@ (define-public novena-eeprom (uri (git-reference (url "https://github.com/xobs/novena-eeprom.git") (commit (string-append "v" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "00pd71mg0g20v0820ggp3ghf9nyj5s4wavaz9mkmrmsr91hcnf7i")))) diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index ae90542fd76..fca970627ee 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -883,7 +883,7 @@ (define-public java-la4j (uri (git-reference (url "https://github.com/vkostyukov/la4j") (commit version))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1qir8dr978cfvz9k12m2kbdwpyf6cqdf1d0ilb7lnkhbgq5i53w3")))) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index bbfeff0cec4..e5d68b5c4e7 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -5644,7 +5644,7 @@ (define-public filteraudio (uri (git-reference (url "https://github.com/irungentoo/filter_audio") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "0hbb290n3wb23f2k692a6bhc23nnqmxqi9sc9j15pnya8wifw64g")))) @@ -5880,7 +5880,7 @@ (define-public noise-repellent (uri (git-reference (url "https://github.com/lucianodato/noise-repellent") (commit version))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "0hb89x9i2knzan46q4nwscf5zmnb2nwf4w13xl2c0y1mx1ls1mwl")))) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index c92a5c5298f..0e8f05c8fc8 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8888,7 +8888,7 @@ (define-public java-htsjdk-latest (uri (git-reference (url "https://github.com/samtools/htsjdk") (commit version))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1lmya1fdjy03mz6zmdmd86j9v9vfhqb3952mqq075navx1i6g4bc")))) @@ -8932,7 +8932,7 @@ (define-public java-htsjdk-2.10.1 (uri (git-reference (url "https://github.com/samtools/htsjdk") (commit version))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1kxh7slm2pm3x9p6jxa1wqsq9a31dhiiflhxnxqcisan4k3rwia2")))) @@ -10531,7 +10531,7 @@ (define-public newick-utils (uri (git-reference (url "https://github.com/tjunier/newick_utils") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1hkw21rq1mwf7xp0rmbb2gqc0i6p11108m69i7mr7xcjl268pxnb")))) @@ -11786,7 +11786,7 @@ (define-public smithlab-cpp (uri (git-reference (url "https://github.com/smithlabcode/smithlab_cpp") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "0d476lmj312xk77kr9fzrv7z1bv96yfyx0w7y62ycmnfbx32ll74")))) @@ -17027,7 +17027,7 @@ (define libstadenio-for-salmon (uri (git-reference (url "https://github.com/COMBINE-lab/staden-io_lib") (commit (string-append "v" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1x8kxxqxl892vwfbprlbyfwkkv7c34ggkc94892x9x0g37x5nbwx")))) @@ -17584,7 +17584,7 @@ (define-public java-forester (uri (git-reference (url "https://github.com/cmzmasek/forester") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "0vxavc1yrf84yrnf20dq26hi0lglidk8d382xrxsy4qmlbjd276z")) @@ -17751,7 +17751,7 @@ (define-public java-biojava-core (uri (git-reference (url "https://github.com/biojava/biojava") (commit (string-append "biojava-" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1bvryh2bpsvash8ln79cmc9sqm8qw72hz4xzwqxcrjm8ssxszhqk")))) @@ -17882,7 +17882,7 @@ (define-public java-biojava-core-4.0 (uri (git-reference (url "https://github.com/biojava/biojava") (commit (string-append "biojava-" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "13675f6y9aqi7bi2lk3s1z7a22ynccjiqwa8izh7p97xi9wsfmd8")))))) @@ -18650,7 +18650,7 @@ (define-public sjcount (uri (git-reference (url "https://github.com/pervouchine/sjcount-full") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "0gdgj35j249f04rqgq8ymcc1xg1vi9kzbajnjqpaq2wpbh8bl234")))) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index c4b721c9f56..1321b55df49 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1788,7 +1788,7 @@ (define-public vboot-utils (url (string-append "https://chromium.googlesource.com" "/chromiumos/platform/vboot_reference")) (commit (string-append "release-" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "0h0m3l69vp9dr6xrs1p6y7ilkq3jq8jraw2z20kqfv7lvc9l1lxj")) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 5deb363095a..e66b640ce79 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3426,7 +3426,7 @@ (define-public guile-wiredtiger (uri (git-reference (url "https://framagit.org/a-guile-mind/guile-wiredtiger.git") (commit "340ad4bc2ff4dcc6216a2f5c6f9172ca320ac66b"))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "15j36bvxxzil7qpwlmh1rffqpva3ynvrcpqhhqbj2c9208ayz595")))) diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index a0345d82784..f1bda7a1ea7 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -990,7 +990,7 @@ (define-public seer-gdb (uri (git-reference (url "https://github.com/epasveer/seer.git") (commit (string-append "v" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "0jdvyg2jab1pvf36pvkyrfsg2wyy8zp1qx0v2ksclgrnr1hja6k6")))) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3c9a3c195c5..0c7532a41b4 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10855,7 +10855,7 @@ (define-public emacs-piem (uri (git-reference (url "https://git.kyleam.com/piem") (commit (string-append "v" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "0smdb1iph2q1xvxix5c93llckcxh7kmhg6pxgyrm88j736m4l16q")))) (build-system emacs-build-system) diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index 999ac1875e0..73a8797aabe 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -982,7 +982,7 @@ (define-public openocd (uri (git-reference (url "https://git.code.sf.net/p/openocd/code") (commit (string-append "v" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "09wb11zlmrw6rx1bql3kafgi3ilzp9mhvb6j6rql216by06csing")))) @@ -1439,7 +1439,7 @@ (define-public binutils-vc4 (uri (git-reference (url "https://github.com/puppeh/binutils-vc4") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1kdrz6fki55lm15rwwamn74fnqpy0zlafsida2zymk76n3656c63")))) @@ -1870,7 +1870,7 @@ (define-public ebusd (uri (git-reference (url "https://github.com/john30/ebusd") (commit version))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1k85vzjhhya7r41nid5yylr7jyvl09455hpny6wrjkipz68icgdf")))) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 1f67e8cd63c..08fdb5f375d 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -4108,7 +4108,7 @@ (define-public exomizer (uri (git-reference (url "https://bitbucket.org/magli143/exomizer.git") (commit version))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "04795l75nlbz0g5gp1xx8kiwbrm5pv5pj24ja02cnan6mglj7j0w")))) @@ -4293,7 +4293,7 @@ (define-public cc65 (uri (git-reference (url "https://github.com/cc65/cc65.git") (commit (string-append "V" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "01a15yvs455qp20hri2pbg2wqvcip0d50kb7dibi9427hqk9cnj4")))) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 624c092a82e..45b9b2a996a 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -3828,7 +3828,7 @@ (define-public openctm (uri (svn-reference (url "https://svn.code.sf.net/p/openctm/code/trunk") (revision revision))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "01wb70m48xh5gwhv60a5brv4sxl0i0rh038w32cgnlxn5x86s9f1")))) (build-system gnu-build-system) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 53707f751c4..82d4d044bb6 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -2870,7 +2870,7 @@ (define-public font-blackfoundry-inria (sha256 (base32 "06775y99lyh6hj5hzvrx56iybdck8a8xfqkipqd5c4cldg0a9hh8")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (git-file-name name version)))) ;; XXX: There are .ufo directories (the "source") so in theory we should ;; be able to rebuild TTF and OTF files with FontForge. Unfortunately a ;; command like: diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3a02945f114..3be13944cad 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3406,7 +3406,7 @@ (define-public blueprint-compiler (url "https://gitlab.gnome.org/jwestman/blueprint-compiler") (commit (string-append "v" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1y40kf9yfrjlfr5ax27j7ksv27fsznl7jhvvkzbfifdymjv10wqn")))) @@ -3459,7 +3459,7 @@ (define-public blueprint-compiler-0.4 (url "https://gitlab.gnome.org/jwestman/blueprint-compiler") (commit (string-append "v" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "0hj7f4xhwjc4x32r3lswwclbw37fw3spy806g4plkmym25hz4ydy")))) @@ -10616,7 +10616,7 @@ (define-public byzanz (uri (git-reference (url "https://git.gnome.org/browse/byzanz") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1l60myzxf9cav27v5v3nsijlslz9r7ip6d5kiirfpkf9k0w26hz3")))) diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm index 2549889a11a..d396516bf4e 100644 --- a/gnu/packages/graph.scm +++ b/gnu/packages/graph.scm @@ -288,7 +288,7 @@ (define-public r-rbiofabric (uri (git-reference (url "https://github.com/wjrl/RBioFabric") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1yahqrcrqpbcywv73y9rlmyz8apdnp08afialibrr93ch0p06f8z")))) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 25fe0729364..1cb48fe21d3 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1995,7 +1995,7 @@ (define-public brdf-explorer (sha256 (base32 "06vzbiajzbi2xl8jlff5d45bc9wd68i3jdndfab1f3jgfrd8bsgx")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 7e82909151a..57cf6a365de 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -727,7 +727,7 @@ (define-public guile-gdbm-ffi (uri (git-reference (url "https://github.com/ijp/guile-gdbm") (commit "fa1d5b6231d0e4d096687b378c025f2148c5f246"))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (patches (search-patches "guile-gdbm-ffi-support-gdbm-1.14.patch")) (sha256 @@ -781,7 +781,7 @@ (define-public guile-sqlite3 (sha256 (base32 "0qqygvlpz63phdi2p5p8ncp80dci230qfa3pwds8yfxqqaablmhb")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs (list autoconf automake guile-3.0 pkg-config)) (inputs (list guile-3.0 sqlite)) diff --git a/gnu/packages/idris.scm b/gnu/packages/idris.scm index 85fb6cc2d2c..1837a8a8152 100644 --- a/gnu/packages/idris.scm +++ b/gnu/packages/idris.scm @@ -242,7 +242,7 @@ (define-public idris-bifunctors (uri (git-reference (url "https://github.com/HuwCampbell/Idris-Bifunctors") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "02vbsd3rmgnj0l1qq787709qcxjbr9890cbad4ykn27f77jk81h4")))) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 54a9aa9ba0b..c24bb0bdd87 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1864,7 +1864,7 @@ (define-public jbr11 (uri (git-reference (url "https://github.com/JetBrains/JetBrainsRuntime.git") (commit (string-append "jb" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1fnrdx0wb21ghm6jczjzk7b9fz9hbdzd62512xhwpzvca57v2z09")))) @@ -1897,7 +1897,7 @@ (define-public jbr17 (uri (git-reference (url "https://github.com/JetBrains/JetBrainsRuntime.git") (commit (string-append "jbr-release-" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "5bbf5z8faf9sdkig2fwkj06hb7hs9s3bpzzvbqn2i75lbwqk3bln")) @@ -1931,7 +1931,7 @@ (define-public jbr21 (uri (git-reference (url "https://github.com/JetBrains/JetBrainsRuntime.git") (commit (string-append "jbr-release-" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "03xkghbp0b1czc2ags9n8ilprf9sy4bhsma0wf8xfapqn6d2sfyd")) @@ -11089,7 +11089,7 @@ (define-public java-testng (uri (git-reference (url "https://github.com/cbeust/testng") (commit version))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "0y6vq30i5g276kw0v2bhbvci22ijg7ax49ap2611yqlhbs4d6dqv")))) @@ -11878,7 +11878,7 @@ (define-public java-jeromq (uri (git-reference (url "https://github.com/zeromq/jeromq") (commit (string-append "v" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1gxkp7lv2ahymgrqdw94ncq54bmp4m4sw5m1x9gkp7l5bxn0xsyj")) diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index 9ea7e815e92..29efcfa2e35 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -515,7 +515,7 @@ (define-public js-json2 (uri (git-reference (url "https://github.com/douglascrockford/JSON-js") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1fvb6b2y5sd3sqdgcj683sdxcbxdii34q0ysc9wg0dq1sy81l11v")))) diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm index 22457dd3f41..370ceb077f6 100644 --- a/gnu/packages/julia.scm +++ b/gnu/packages/julia.scm @@ -109,7 +109,7 @@ (define-public libwhich (url "https://github.com/vtjnash/libwhich") ;; fixes linux-vdso.so related tests (commit "87cffe10080c98e7b5786c5166e420bf1ada1d41"))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1bpa0fcqpa3ai3hm8mz0p13bf76fsq53wsfcx5qw302zh22108xr")))) diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm index 6e2c2c9a5ec..89f6273f618 100644 --- a/gnu/packages/kodi.scm +++ b/gnu/packages/kodi.scm @@ -102,7 +102,7 @@ (define-public crossguid (uri (git-reference (url "https://github.com/graeme-hill/crossguid") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1x3jc4q6di79x3nlx36394s03yv1j1j5k0x6zljyk5iq78y4mfyz")))) @@ -138,7 +138,7 @@ (define libdvdnav/kodi (uri (git-reference (url "https://github.com/xbmc/libdvdnav") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "190wp4czs4594496vc6ifswg24wijd7c1z0whdkjdaf26rff5xha")))) @@ -173,7 +173,7 @@ (define libdvdread/kodi (uri (git-reference (url "https://github.com/xbmc/libdvdread") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "0by70r55575xa9rl8dp8594lxhm475splslvafskqid30n9cpq8h")))) @@ -208,7 +208,7 @@ (define libdvdcss/kodi (uri (git-reference (url "https://github.com/xbmc/libdvdcss") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1xvs3vhdjjrm019rk907bd4lw7jh3wb7rh88zqd3xv8iq3apbcg6")))) @@ -533,7 +533,7 @@ (define-public kodi-cli (sha256 (base32 "1xjhasc5gngfxpr1dlzy6q24w0wpdfjx12p43fanjppxw4i49n5p")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (git-file-name name version)))) (build-system trivial-build-system) (inputs (list bash curl mps-youtube)) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 727269a7720..8a6538a7ee4 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -12028,7 +12028,7 @@ (define-public edac-utils (uri (git-reference (url "https://github.com/grondo/edac-utils.git") (commit version))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "04j686m58wsnyy5di7rz0sw9jahlm4ziwxjmgs31pjb87vzw3xgp")))) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 7ad25e80c65..aa1f88e8137 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -287,7 +287,7 @@ (define-public fann (uri (git-reference (url "https://github.com/libfann/fann") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "0ibwpfrjs6q2lijs8slxjgzb2llcl6rk3v2ski4r6215g5jjhg3x")))) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 68611d32f22..08c551d86a2 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1634,7 +1634,7 @@ (define-public notmuch-addrlookup-c (uri (git-reference (url "https://github.com/aperezdc/notmuch-addrlookup-c") (commit (string-append "v" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1j3zdx161i1x4w0nic14ix5i8hd501rb31daf8api0k8855sx4rc")))) @@ -2400,7 +2400,7 @@ (define-public dovecot-libsodium-plugin (uri (git-reference (url "https://github.com/LuckyFellow/dovecot-libsodium-plugin") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "13h07l7xy713zchnj2p9fhvq7fdl4zy1ai94li3ygkqjjj8hrgas")))) @@ -2734,7 +2734,7 @@ (define-public esmtp (sha256 (base32 "1ay282rrl92h0m0m8z5zzjnwiiagi7c78aq2qvhia5mw7prwfyw2")) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (patches (search-patches "esmtp-add-lesmtp.patch")))) (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index c6584330e63..5be65120279 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -8126,7 +8126,7 @@ (define-public reducelcs (uri (git-reference (url "https://github.com/gdv/Reduce-Expand-for-LCS") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1rllzcfwc042c336mhq262a8ha90x6afq30kvk60r7i4761j4yjm")))) @@ -9746,7 +9746,7 @@ (define-public minisat (uri (git-reference (url "https://github.com/niklasso/minisat") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "091hf3qkm197s5r7xcr3m07xsdwyz2rqk1hc9kj0hn13imz09irq")) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 4e120c3fad5..0ac125442f1 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1746,7 +1746,7 @@ (define-public libtoxcore (uri (git-reference (url "https://github.com/irungentoo/toxcore") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "11lqra4yd7v293cp286ynff5lqz1pprzg8vn3wq6vryj08g88zqb")))) @@ -1809,7 +1809,7 @@ (define-public utox (url "https://github.com/uTox/uTox") (commit (string-append "v" version)) (recursive? #t))) ;; Needed for 'minini' git submodule. - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "01rvlf94d4rkrygnnjak3cg16hrrqyi1rn9nx65y17qk2nbyh68g")))) @@ -3620,7 +3620,7 @@ (define-public python-librecaptcha (uri (git-reference (url "https://github.com/taylordotfish/librecaptcha") (commit version))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "0r35ws6vdf31j01kpacvpjplddm254r0cgy0npmhgnfxd5kpjf3s")))) @@ -3641,7 +3641,7 @@ (define-public python-harmony (uri (git-reference (url "https://github.com/taylordotfish/harmony.git") (commit version))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1bm9xcnzpnpj6rlhbrnl2abwclzl7ivgh1vb5644y9mnhcs489js")))) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index d11099d0c5f..680f8d488e8 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3127,7 +3127,7 @@ (define-public libpd (url "https://github.com/libpd/libpd") (commit version) (recursive? #t))) ; for the 'pure-data' submodule - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1bc1bqwviqddhh44cp2y2v2i6dnj92hwx8ld7bwcxgyp2zmlhiaz")))) @@ -3625,7 +3625,7 @@ (define-public jack-capture (uri (git-reference (url "https://github.com/kmatheussen/jack_capture") (commit version))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "0jcqky96q8xgya6wqv1p8pj9fkf2wh7ynl67ah7x5bn3basgfclf")))) @@ -4715,7 +4715,7 @@ (define-public gx-guvnor-lv2 (uri (git-reference (url "https://github.com/brummer10/GxGuvnor.lv2") (commit (string-append "v" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1wa5070j40p7f0b3kr259pzm99xb6cf2badr2capayjvgayd6gnm")))) @@ -4797,7 +4797,7 @@ (define-public gx-overdriver-lv2 (sha256 (base32 "13j614jh525fbkby79nnzwj0z1ac0c9wclyn5pfqvkmx6a7j24r8")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (git-file-name name version)))) (home-page "https://github.com/brummer10/GxOverDriver.lv2") (synopsis "Overdrive effect with level and tone control") (description "This package provides the LV2 plugin \"GxOverDriver\", an @@ -4817,7 +4817,7 @@ (define-public gx-tone-mender-lv2 (sha256 (base32 "07qdcfsvv2vdnfnjh91pfgvjdcs5y91nvwfm8c0z8fp6b4bk7a9q")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (git-file-name name version)))) (home-page "https://github.com/brummer10/GxToneMender.lv2") (synopsis "Clean boost with a 3-knob tonestack") (description "This package provides the LV2 plugin \"GxToneMender\", a @@ -4837,7 +4837,7 @@ (define-public gx-push-pull-lv2 (sha256 (base32 "12f5hwck2irph0gjbj8xy8jqcqdwb8l1hlwf29k0clz52h1jhb5q")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (git-file-name name version)))) (home-page "https://github.com/brummer10/GxPushPull.lv2") (synopsis "Octave up push pull transistor fuzz simulation") (description "This package provides the LV2 plugin \"GxPushPull\", a @@ -4852,7 +4852,7 @@ (define-public gx-suppa-tone-bender-lv2 (uri (git-reference (url "https://github.com/brummer10/GxSuppaToneBender.lv2") (commit (string-append "v" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "01x6bjmllkmvxfzc5xwdix7w021j26js71awv728cxsmkxgqw0zy")))) @@ -4891,7 +4891,7 @@ (define-public gx-hyperion-lv2 (uri (git-reference (url "https://github.com/brummer10/GxHyperion.lv2") (commit (string-append "v" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1vx79s6s9if117y2g0ppdja2sv2wcny6xcfl3j1z4cipahnildxf")))) @@ -4909,7 +4909,7 @@ (define-public gx-voodoo-fuzz-lv2 (uri (git-reference (url "https://github.com/brummer10/GxVoodoFuzz.lv2") (commit (string-append "v" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1v0scphivri1fk4hl20j13f92i48mnx1zsil4hgnadsmm4nsfw43")))) @@ -4929,7 +4929,7 @@ (define-public gx-super-fuzz-lv2 (uri (git-reference (url "https://github.com/brummer10/GxSuperFuzz.lv2") (commit (string-append "v" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1jlljd9hlgfflbiizq47lv1xbbgjyx3v835mf24zmh1q5zsw4np4")))) @@ -4949,7 +4949,7 @@ (define-public gx-vintage-fuzz-master-lv2 (uri (git-reference (url "https://github.com/brummer10/GxVintageFuzzMaster.lv2") (commit (string-append "v" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "02jb211z8rw2qr5r1z5mdxlqgiw6cbc319xpqplvn6k21c59mskv")))) @@ -4972,7 +4972,7 @@ (define-public gx-slow-gear-lv2 (sha256 (base32 "141mz69zkhk3lm54bb6wgpnghb92zm1ig7fv07240cmhydqji1q1")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (git-file-name name version)))) (home-page "https://github.com/brummer10/GxSlowGear.lv2") (synopsis "Slow gear audio effect") (description "This package provides the LV2 plugin \"GxSlowGear\", a @@ -4992,7 +4992,7 @@ (define-public gx-switchless-wah-lv2 (sha256 (base32 "04jqfpncmrrqn34p21w4v9m2x5a5wsqwbm4f3byxvq4vcibwxzk2")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (git-file-name name version)))) (home-page "https://github.com/brummer10/GxSwitchlessWah.lv2") (synopsis "Wah emulation with switchless activation") (description "This package provides the LV2 plugin \"GxSwitchlessWah\", @@ -5038,7 +5038,7 @@ (define-public mod-utilities (uri (git-reference (url "https://github.com/moddevices/mod-utilities") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1v55zmzmlg0ka7341x5lsvb44amy17vk27s669ps1basd1bk5s5v")))) @@ -6013,7 +6013,7 @@ (define-public sonivox-eas (uri (git-reference (url "https://github.com/pedrolcl/Linux-SonivoxEas") (commit (string-append "v" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1y67bi2vcwb1avwz18i41q85cmqx9svwx4q3kpmh951l49s9k8vz")))) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 30af5130cda..4ef1cd3ebbb 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1089,7 +1089,7 @@ (define-public bffe (sha256 (base32 "0h1nzlj6k9yhhsc1an72876p19yf8kszs2h7xww5ldcjs8vwxn9c")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs (list pkg-config @@ -1690,7 +1690,7 @@ (define-public guix-build-coordinator (sha256 (base32 "1ffa3bhg4nzif4gk26gydnw4jvm1gfidh3b6r1i36kydy3ms19fw")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments (list @@ -1945,7 +1945,7 @@ (define-public nar-herder (sha256 (base32 "0wd8nj2ji28jvs4wgshhbipxballpfmmwbxx82nk4bypbdpdwd5a")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments (list diff --git a/gnu/packages/pascal.scm b/gnu/packages/pascal.scm index 58b627c4149..5329b9e1179 100644 --- a/gnu/packages/pascal.scm +++ b/gnu/packages/pascal.scm @@ -332,7 +332,7 @@ (define-public lazarus (string-join (string-split version #\.) "_"))))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "0hpk6fxmy1h1q0df41jg1vnp8g8vynrg5v5ad43lv229nizfs3wj")))) diff --git a/gnu/packages/pumpio.scm b/gnu/packages/pumpio.scm index dc5e1ec7bb1..c4b70476d1a 100644 --- a/gnu/packages/pumpio.scm +++ b/gnu/packages/pumpio.scm @@ -40,7 +40,7 @@ (define-public pumpa (sha256 (base32 "14072vis539zjgryjr5a77j2cprxii5znyg3p01qbb11lijk9nj7")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments '(#:phases diff --git a/gnu/packages/robotics.scm b/gnu/packages/robotics.scm index f95aa2b3255..e8f6e1dee69 100644 --- a/gnu/packages/robotics.scm +++ b/gnu/packages/robotics.scm @@ -48,7 +48,7 @@ (define-public enki (sha256 (base32 "1d1901zzsfml97hb4mb3ah3ab1bk4kh7bn6m7xrj1rv0gk9wkhq7")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments '(#:configure-flags '("-DBUILD_SHARED_LIBS=ON"))) @@ -88,7 +88,7 @@ (define-public aseba (sha256 (base32 "0j31lmc9f0ksvkh0md2fgsz92hcsrwnrqqcynamizs2ah8iwlqi5")) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (modules '((guix build utils))) (snippet ;; Add missing Qt5::Network. diff --git a/gnu/packages/ruby-xyz.scm b/gnu/packages/ruby-xyz.scm index 1a2cd817fd8..b893d444bdd 100644 --- a/gnu/packages/ruby-xyz.scm +++ b/gnu/packages/ruby-xyz.scm @@ -6084,7 +6084,7 @@ (define-public ruby-minitar (uri (git-reference (url "https://github.com/halostatue/minitar") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1iywfx07jgjqcmixzkxk9zdwfmij1fyg1z2jlwzj15cj7s99qlfv")))) @@ -7993,7 +7993,7 @@ (define-public ruby-tdiff (uri (git-reference (url "https://github.com/postmodern/tdiff") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "0n3gq8rx49f7ln6zqlshqfg2mgqyy30rsdjlnki5mv307ykc7ad4")))) @@ -8018,7 +8018,7 @@ (define-public ruby-nokogiri-diff (uri (git-reference (url "https://github.com/postmodern/nokogiri-diff") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1ah2sfjh9n1p0ln2wkqzfl448ml7j4zfy6dhp1qgzq2m41php6rf")))) diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 2807b317070..81b948f8cf4 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -759,7 +759,7 @@ (define-public scheme48-rx (sha256 (base32 "1bvriavxw5kf2izjbil3999vr983vkk2xplfpinafr86m40b2cci")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (git-file-name name version)))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) @@ -1014,7 +1014,7 @@ (define-public stalin (uri (git-reference (url "https://github.com/barak/stalin") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "15a5gxj9v7jqlgkg0543gdflw0rbrir7fj5zgifnb33m074wiyhn")) @@ -1125,7 +1125,7 @@ (define-public femtolisp (uri (git-reference (url "https://github.com/JeffBezanson/femtolisp") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1fcyiqlqn27nd4wxi27km8mhmlzpzzsxzpwsl1bxbmhraq468njw")))) diff --git a/gnu/packages/selinux.scm b/gnu/packages/selinux.scm index c72dfa007ba..6a68ce56724 100644 --- a/gnu/packages/selinux.scm +++ b/gnu/packages/selinux.scm @@ -310,7 +310,7 @@ (define-public python-setools (uri (git-reference (url "https://github.com/SELinuxProject/setools") (commit version))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1qvd5j6zwq4fmlahg45swjplhif2z89x7s6pnp07gvcp2fbqdsh5")))) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 2a1fbe0a6cb..84e19254ad9 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -714,7 +714,7 @@ (define-public linenoise (uri (git-reference (url "https://github.com/antirez/linenoise") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "102gwq6bzjq2b1lf55wrpgym58yfhry56hkajbj339m0bs1xijhs")))) @@ -762,7 +762,7 @@ (define-public s-shell (uri (git-reference (url "https://github.com/rain-1/s") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "0qiny71ww5nhzy4mnc8652hn0mlxyb67h333gbdxp4j4qxsi13q4")))) diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index 040a9147264..4d611e7d969 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -736,7 +736,7 @@ (define-public tran (uri (git-reference (url "https://github.com/kilobyte/tran") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1kzr3lfhi5f8wpwjzrzlwkxjv9rasdr9ndjdns9kd16vsh0gl2rd")))) (build-system gnu-build-system) diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index 6bb754a079a..568f2e3de06 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -530,7 +530,7 @@ (define-public casync (sha256 (base32 "139g82rkwv1kzss6crfmw3p01xnyjzz66b1ckprpbfncxb24047w")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (git-file-name name version)))) (build-system meson-build-system) (arguments `(#:configure-flags diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index aa8aee0df29..0579ddb22af 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -698,7 +698,7 @@ (define-public cool-retro-term (version "1.2.0") (source (origin (method git-fetch) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (uri (git-reference (url (string-append "https://github.com/Swordfish90/" name)) (commit version) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 3b96d4f15e0..06d042a519d 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -3542,7 +3542,7 @@ (define-public myrepos (uri (git-reference (url "git://myrepos.branchable.com/myrepos") (commit version))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "0jphw61plm8cgklja6hs639xhdvxgvjwbr6jpvjwpp7hc5gmhms5")))) (build-system gnu-build-system) @@ -3592,7 +3592,7 @@ (define-public grokmirror (url (string-append "https://git.kernel.org/pub/scm/" "utils/grokmirror/grokmirror.git")) (commit (string-append "v" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "0c6nnfzzyl247r1dcjnsyx16d34nyra9ikjjhi0xzlrbiwnb0w32")))) (build-system python-build-system) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 89a001b51cd..ccd950d9c91 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -357,7 +357,7 @@ (define-public vim-neosnippet-snippets (uri (git-reference (url "https://github.com/Shougo/neosnippet-snippets") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "151wpvbj6jb9jdkbhj3b77f5sq7y328spvwfbqyj1y32rg4ifmc6")))) @@ -385,7 +385,7 @@ (define-public vim-neosnippet (uri (git-reference (url "https://github.com/Shougo/neosnippet.vim/") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "0k80syscmpnj38ks1fq02ds59g0r4jlg9ll7z4qc048mgi35alw5")))) @@ -441,7 +441,7 @@ (define-public vim-luna (uri (git-reference (url "https://github.com/notpratheek/vim-luna") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "0ka3qbhsh8lix1vyj4678j7dnchkd8khhirrnn3aylxxf8fpqyg8")))) @@ -467,7 +467,7 @@ (define-public vim-context-filetype (uri (git-reference (url "https://github.com/Shougo/context_filetype.vim") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "0alvrfhmd91zkd9h83s8wvgyq4iakcf6rybsyjd369qbgpcqky89")))) @@ -1671,7 +1671,7 @@ (define-public vim-commentary (uri (git-reference (url "https://github.com/tpope/vim-commentary") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "09kzc89iwkgsi4wvjxk56fis462kkz5chcl9sl4hdbmpa1f41wy0")))) (build-system vim-build-system) @@ -1701,7 +1701,7 @@ (define-public vim-guile (uri (git-reference (url "https://github.com/HiPhish/guile.vim") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1pqlhssdnpd8ngjc5bssma7ddjhffvh8hj67gchmyyxr5jfxwdq9")))) (build-system vim-build-system) @@ -1729,7 +1729,7 @@ (define-public vim-dhall-vim (uri (git-reference (url "https://github.com/vmchale/dhall-vim") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "0lwna4kcq7davfvh3535n8wl9jxkjm7cg6jgpisd17kvagihh8qw")))) (build-system vim-build-system) @@ -1755,7 +1755,7 @@ (define-public vim-mundo (uri (git-reference (url "https://github.com/simnalamburt/vim-mundo") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1dwrarcxrh8in78igm036lpvyww60c93vmmlk8h054i3v2p8vv59")))) (build-system vim-build-system) @@ -1779,7 +1779,7 @@ (define-public vim-zig (uri (git-reference (url "https://github.com/ziglang/zig.vim") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1nxwjyn3ps3c2abffai5cql3czl4kah4cin0g30damy1k99ypncb")))) (build-system vim-build-system) @@ -1805,7 +1805,7 @@ (define-public vim-plantuml-syntax (uri (git-reference (url "https://github.com/aklt/plantuml-syntax") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "0d2frv6knkj4bjavq2c2kx8qdnmcq0d8l04a5z7bpqwkmrrhd31f")))) (build-system vim-build-system) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 1df4e9d1c5d..2b1629f8715 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -546,7 +546,7 @@ (define-public vkd3d (sha256 (base32 "1n4a622drgnprvz5hjxzyzcsg2lp5rlf1sajki2vzf5gsx6fdpk8")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-spirv-tools") diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 52642760e0a..a660798e858 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -792,7 +792,7 @@ (define-public python-i3-py (sha256 (base32 "1nm719dc2xqlll7vj4c4m7mpjb27lpn3bg3c66gajvnrz2x1nmxs")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (git-file-name name version)))) (build-system python-build-system) (arguments `(#:tests? #f ; no tests yet @@ -976,7 +976,7 @@ (define-public quickswitch-i3 (base32 "0447077sama80jcdg5p64zjsvafmz5rbdrirhm1adcdjhkh6iqc5")) (patches (search-patches "quickswitch-fix-dmenu-check.patch")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (git-file-name name version)))) (build-system python-build-system) (arguments `(#:tests? #f ; no tests yet @@ -1440,7 +1440,7 @@ (define-public fbautostart (uri (git-reference (url "https://github.com/paultag/fbautostart.git") (commit version))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "13h6j5khi5axqhflzhayzgvyhxylmk5vsgin235ji440mzd516gz")))) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 0af511d4bb5..c396cf7c992 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -2084,7 +2084,7 @@ (define-public xssproxy (uri (git-reference (url "https://github.com/vincentbernat/xssproxy") (commit (string-append "v" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "19i5npmbd2kbs96wp2bb79crlwkcf9n0n8cd4v1myvczb0iwbz1q")))) @@ -2532,7 +2532,7 @@ (define-public xftwidth (sha256 (base32 "1jwl25785li24kbp0m1wxfwk4dgxkliynn03nsj813cjr34kq16h")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (inputs `(("freetype" ,freetype) ("libx11" ,libx11) diff --git a/gnu/packages/zile.scm b/gnu/packages/zile.scm index 3adf470853b..eae263694bc 100644 --- a/gnu/packages/zile.scm +++ b/gnu/packages/zile.scm @@ -122,7 +122,7 @@ (define-public zile-on-guile (sha256 (base32 "0wlli8hqal9ikmbl3a49kyhzyf164jk6mdbir3bclq2gxszs532d")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (git-file-name name version)))) (inputs (modify-inputs (package-inputs zile) (prepend guile-2.0))) From patchwork Sat Jul 26 02:39:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43301 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 8E23527BC49; Sat, 26 Jul 2025 03:42:43 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 305FD27BC4A for ; Sat, 26 Jul 2025 03:42:42 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufUqX-0008T6-N6; Fri, 25 Jul 2025 22:41:13 -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 1ufUqW-0008RZ-2d for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:12 -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 1ufUqV-0005Ok-Pv for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:11 -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=rRGA+YzMhDVJ2aR/BZ4fMVhmniTmcxOEz7TQNSGBciE=; b=MSny8UPMrg9n3v4HxP+1vUQGP1mXvnLbyQbNeNGZDKL423u5gpg7QIlKUXMsB83SYvmMa+XI83B0W3aP0fkVmIKHjS214cEJmuUvJrk6fH17X7uSUvpJkWyDCaUNZntrUfuda5PHZws+qNBMjVDck+lFBXUfqkEI0j6NhlNLHK3f2lsW4nABXAJoZulmjWVs7sZAY3++3LacmambA3nCPLgBPDyTTX/YMqp7awQw7obByTam2u/90FHjx+CbZLEDmRxPu2NoymO6glRVIC8/sWZQ+1/5QWks5WMvXQOpZRTnGb+Cy9qOz/SwjGMs3uQVexWoJALrFNifsrY40odGQg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ufUqV-0007rw-I2 for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79099] [PATCH 02/34] gnu: uxn: Use git-file-name. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Jul 2025 02:41:11 +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.175349765130124 (code B ref 79099); Sat, 26 Jul 2025 02:41:11 +0000 Received: (at 79099) by debbugs.gnu.org; 26 Jul 2025 02:40:51 +0000 Received: from localhost ([127.0.0.1]:38104 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ufUpu-0007m2-OU for submit@debbugs.gnu.org; Fri, 25 Jul 2025 22:40:50 -0400 Received: from 7.mo562.mail-out.ovh.net ([46.105.55.234]:44669) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ufUpL-0007dx-0H for 79099@debbugs.gnu.org; Fri, 25 Jul 2025 22:40:22 -0400 Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net [79.137.60.36]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4bppqf042Sz20JY; Sat, 26 Jul 2025 02:39:58 +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:39:57 +0000 (UTC) Received: from mta2.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.113.158]) by director2.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bppqd5lgdz1xpf; Sat, 26 Jul 2025 02:39:57 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.8]) by mta2.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 7D79F3E3062; Sat, 26 Jul 2025 02:39:57 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-100R003a9b2033d-2c3c-4714-849f-6f2683ba9271, 7BFD41D65738CBEA4850BE66907D66307393418F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sat, 26 Jul 2025 04:39:08 +0200 Message-ID: <20250726023951.11862-2-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: 4610841595384816354 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdekhedvfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeduhffhgfeiiefgffdtuddvfefhueeihfeuiefhvefhfeduudevfeetjefhtdefheenucffohhmrghinhepshhrrdhhthenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeeltdelleesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeivdgmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=rRGA+YzMhDVJ2aR/BZ4fMVhmniTmcxOEz7TQNSGBciE=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1753497598; v=1; b=JHqtmEz+DZPCMv/Eb8FLF2cmfCV897y0zJWEAbWZ3RU4SfKzPU+kCDJMkbcd5ubikkuv4IGf 9DSMJgu8RjFwvGyaPuFDSVSLxB8jBbxZUbKqsJONFGAS+rns1YmoMMZfNMutq2Pc/Ic0/SkrUfy zEKZY+iRlU22s/nM0gJUWNPBzANs22crDoCddpqybRPAcs4vL8EE2vQ61pxGRUmrdKizpp9Os1e G0tekEl5yo8IAItwQX+vo30ywGfbdov0kUfv51zUZPYnVIw2jyQGya8eYnsqycZJjh82l3GvjHg v+TUqBi3SpIqQ8fbiY6ntQlubVNa8QByMG+s0BLaYxGkA== 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 * gnu/packages/emulators.scm (uxn)[source]: Set it using git-file-name. --- gnu/packages/emulators.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 08fdb5f375d..f2a1d4811db 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -4331,7 +4331,7 @@ (define-public uxn (uri (git-reference (url "https://git.sr.ht/~rabbits/uxn") (commit commit))) - (file-name (string-append name "-" version)) + (file-name (git-file-name name version)) (sha256 (base32 "159qfz66k1jc43jhyl8by3yiphsr2dyiyclw1x7mkr3zciwc29z3")))) From patchwork Sat Jul 26 02:39:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43270 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 700C227BC4B; Sat, 26 Jul 2025 03:41:32 +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 367F927BC49 for ; Sat, 26 Jul 2025 03:41:32 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufUqd-000063-BI; Fri, 25 Jul 2025 22:41:19 -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 1ufUqc-0008WB-1s for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:18 -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 1ufUqb-0005PU-OS for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:17 -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=QjEpvNkOrr4idN3/XWkZI1yTYs6k4cWbxcPeBjnjuQE=; b=OmGY+31aoS73j94IcbXXhRozCFvxDdPTp23TPcUi/VRh4ePli1jEnkV4Ki/HqYfNecX5HNhyxvHdAb9C1YvvH2dQrxs2m7KJg9rTj92gkwawhJaipzamrLT1CuMWbv8S4kRX+v6n9h3lyQmLUUV/4fJx0Vnmh3SCFmSF4roacuWkPESRddvr/cigmUvqxc8/XetHQEoYa6wUELHhCBAKNscFlIRAtYbA+CHiPcUJhTGV/DBTP2R7dswPJ9f/PSi3R36XTH0kG8/R/dfQJySnLZjzmaMnJANBQGGQiF/XP5gmSEal7MtzdyYz5Dy43db7H1OX0rybx1phSn0FzgjgZw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ufUqa-0007sd-37 for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:17 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79099] [PATCH 03/34] gnu: sbcl-cl-xmlspam: Use git-file-name. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Jul 2025 02:41:15 +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.175349766430204 (code B ref 79099); Sat, 26 Jul 2025 02:41:15 +0000 Received: (at 79099) by debbugs.gnu.org; 26 Jul 2025 02:41:04 +0000 Received: from localhost ([127.0.0.1]:38114 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ufUqM-0007qv-LC for submit@debbugs.gnu.org; Fri, 25 Jul 2025 22:41:03 -0400 Received: from 8.mo562.mail-out.ovh.net ([46.105.60.65]:33797) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ufUpM-0007e2-KL for 79099@debbugs.gnu.org; Fri, 25 Jul 2025 22:40:25 -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 4bppqg0J0wz1yWq; Sat, 26 Jul 2025 02:39:59 +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:39:58 +0000 (UTC) Received: from mta11.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.43.206]) by director4.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bppqf6Thpz1xx9; Sat, 26 Jul 2025 02:39:58 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.6]) by mta11.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 916AB9A3176; Sat, 26 Jul 2025 02:39:58 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-99G0032a442cb5-b326-40c4-82aa-49220a1ff350, 7BFD41D65738CBEA4850BE66907D66307393418F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sat, 26 Jul 2025 04:39:09 +0200 Message-ID: <20250726023951.11862-3-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: 4611123069001261794 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdekhedvfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelffejteeutefhfeekfffffedvudekjeekgfeludeitdfhkeevhfeivdfhffeggeenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeeltdelleesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeivdgmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=QjEpvNkOrr4idN3/XWkZI1yTYs6k4cWbxcPeBjnjuQE=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1753497599; v=1; b=udOQ3UY4iST6PExkqJ52EJVgJodiiVIuwoS8GS9JlZhxGHNUJ3nKum2e5JfOTZf9LVqpZ/H/ e29DzTTG8GM1mR84Yj+ZW2izwl0HGTD0lhStbM82MKrl1+EgCAlqRtF32imcPv6BVJnZq6uFFBL xVDUlrBrdpWzmM3P95/+cOYGWuYI9+JXCu35NhM+zHQVNdSVOubDye+AQUELfwtCBReQs1Imyxt bbcp603KQ5TJJvsSJkWbeRLWCLMPpH0j1uhwySAcoY/9POi+sdvQaVLzcjuKWb036r9+AjiTvLX AlpRMGXmeWCqj7wDjTJhgmh2SjZzIE6OKuyPKx/WoY1qQ== 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 * gnu/packages/emulators.scm (sbcl-cl-xmlspam)[source]: Set it using git-file-name. --- gnu/packages/lisp-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index b1cee9b73d8..30a7fb34af4 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -11047,7 +11047,7 @@ (define-public sbcl-cl-xmlspam (uri (git-reference (url home-page) (commit commit))) - (file-name (string-append name "-" version)) + (file-name (git-file-name name version)) (sha256 (base32 "0w4rqvrgdgk3fwfq3kx4r7wwdr2bv3b6n3bdqwsiriw9psqzpz2s")))) From patchwork Sat Jul 26 02:39:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43279 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 D8F6627BC4B; Sat, 26 Jul 2025 03:42:50 +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 2E7EB27BC4D for ; Sat, 26 Jul 2025 03:42:50 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufUqp-0000Jz-5k; 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 1ufUqk-0000Ek-Ke for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:26 -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 1ufUqk-0005RP-Bd for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:26 -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=XC/0DGPZEuAco+0f4PlDOP96qV1K7oVgrSzbFdmH88g=; b=ZYxruwAg5TxTGdw91m/l1S58HU5ImQNazorMXPaIGjHyXkOg+UUz0Su7QLj5MIKbVUUGrlOqliSK5Gh7wh/xUhk8+C/cMHvdXXlau405ljiBnbIzvQJesn3PkhoG/VAM5I6OibvLAN/JsR2IAHOlG+xE1t1KGvjzXWQiGnGavf4LIe53rVgUkAVwqHZp4kMnKNtu0bYPoSkaR+p497p2SXn9GWWXIqt4boL/CRLGSMl2IhnxD4FgRE4GSu8SjvL/Nwc+Sxh/nnVLwOrhyRzUT1uwzmPdp2Ul1IEQtOElpFA+Qcen0FaSJU2U7OsEziaUpVS4qvCU4plCGftld1c+Lw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ufUqj-0007u5-Oi for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:26 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79099] [PATCH 04/34] POC git-version Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Jul 2025 02:41:25 +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.175349767730311 (code B ref 79099); Sat, 26 Jul 2025 02:41:25 +0000 Received: (at 79099) by debbugs.gnu.org; 26 Jul 2025 02:41:17 +0000 Received: from localhost ([127.0.0.1]:38129 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ufUqZ-0007sW-A3 for submit@debbugs.gnu.org; Fri, 25 Jul 2025 22:41:17 -0400 Received: from 10.mo563.mail-out.ovh.net ([46.105.78.6]:37599) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ufUpQ-0007eC-Fq for 79099@debbugs.gnu.org; Fri, 25 Jul 2025 22:40:33 -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 4bppqh30Rlz5xkp; Sat, 26 Jul 2025 02:40:00 +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:00 +0000 (UTC) Received: from mta3.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.0.122]) by director3.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bppqh0Nx2z5wFQ; Sat, 26 Jul 2025 02:40:00 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.6]) by mta3.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 97D22942E1A; Sat, 26 Jul 2025 02:39:59 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-114S008fd3a3c8a-7a1f-4693-9c49-681515cef854, 7BFD41D65738CBEA4850BE66907D66307393418F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sat, 26 Jul 2025 04:39:10 +0200 Message-ID: <20250726023951.11862-4-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: 4611686020151239394 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdekhedvfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvffdviedtheelfeetfeevtdffueffvddtgfejkefggfetgeeigfegudeijedvheenucffohhmrghinhepghhnuhdrohhrghenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeeltdelleesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeifegmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=XC/0DGPZEuAco+0f4PlDOP96qV1K7oVgrSzbFdmH88g=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1753497600; v=1; b=44ruGYiFFioB9+52Vlork4n13/VdT4CmZylZqOg8sU0w9zUiFlSL/9Xii+aSJJlI08V4kz94 BdNbC80yJkjCGx2akksMF0fSRlcOxPC03jG4hthXDq3xLp5+chaohKWK5EIVFYKPFwZtnm0oDbN PcejA3UAW20OFsIuh+R6i6y4Vjlo2Rgxh4OA3NadHC3XClXlljLyZz0kjhttHf3yy1cysZePaln uKUZgsiMwK7/bqws7AXjuXgQb6vUKt7R3ZOr3rBocKOYJx6J9/HopAdpCoLRz5GIFj4Zkiyidk4 Md3ORz7BlAWur+oOo0orSPlAETG/pCMUXSg34bc5Qe/ag== 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 --- guix/git-download.scm | 30 +++++++++++++++++++++---- guix/packages.scm | 51 ++++++++++++++++++++++++++++++++++++++----- 2 files changed, 72 insertions(+), 9 deletions(-) diff --git a/guix/git-download.scm b/guix/git-download.scm index ae2073ea06c..838bf336b97 100644 --- a/guix/git-download.scm +++ b/guix/git-download.scm @@ -22,6 +22,7 @@ ;;; along with GNU Guix. If not, see . (define-module (guix git-download) + #:use-module (guix deprecation) #:use-module (guix gexp) #:use-module (guix store) #:use-module (guix monads) @@ -59,7 +60,14 @@ (define-module (guix git-download) git-fetch/lfs git-version git-file-name - git-predicate)) + git-predicate + vc-version) + #:re-export (git-version* + git-version? + make-git-version + git-version-semantic + git-version-revision + git-version-commit)) ;;; Commentary: ;;; @@ -283,8 +291,8 @@ (define* (git-fetch ref hash-algo hash #:guile guile #:git git)))) -(define (git-version version revision commit) - "Return the version string for packages using git-download." +(define (vc-version version revision commit) + "Return the canonical version string for packages using version control." ;; git-version is almost exclusively executed while modules are being loaded. ;; This makes any errors hide their backtrace. Avoid the mysterious error ;; "Value out of range 0 to N: 7" when the commit ID is too short, which @@ -296,9 +304,23 @@ (define (git-version version revision commit) (&message (message "git-version: commit ID unexpectedly short"))))) (string-append version "-" revision "." (string-take commit 7))) +(define-deprecated (git-version version revision commit) + ;; XXX: Should actually recommend git-version* instead, but the macro + ;; expander doesn't like that. Still, it's OK to migrate to + ;; make-git-version in the meantime. + make-git-version + (vc-version version revision commit)) + (define (git-file-name name version) "Return the file-name for packages using git-download." - (string-append name "-" version "-checkout")) + (string-append + name "-" + (match version + (($ semantic revision commit) + (vc-version semantic revision commit)) + (semantic + semantic)) + "-checkout")) ;;; diff --git a/guix/packages.scm b/guix/packages.scm index 1d5986c5f42..a430f4ebc22 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -44,8 +44,9 @@ (define-module (guix packages) #:use-module (guix search-paths) #:use-module (guix sets) #:use-module (guix deprecation) - #:use-module ((guix diagnostics) - #:select (formatted-message define-with-syntax-properties)) + #:use-module ((guix diagnostics) #:select (define-with-syntax-properties + formatted-message + leave)) #:autoload (guix licenses) (license?) #:use-module (guix i18n) #:use-module (ice-9 match) @@ -201,7 +202,15 @@ (define-module (guix packages) package-file package->derivation package->cross-derivation - origin->derivation)) + origin->derivation + + + git-version* + git-version? + make-git-version + git-version-semantic + git-version-revision + git-version-commit)) ;; The 'source-module-closure' procedure ca. 1.2.0 did not recognize ;; #:re-export-and-replace: . @@ -614,7 +623,8 @@ (define-record-type* package? this-package (name package-name) ; string - (version package-version) ; string + (version %package-version ; instance or string + (sanitize warn-unexpected-package-version)) (source package-source) ; instance (build-system package-build-system) ; instance (arguments package-arguments ; arguments for the build method @@ -1786,7 +1796,9 @@ (define* (package->bag package #:optional ;; name from the package version in various user-facing parts ;; of Guix, checkStoreName (in nix/libstore/store-api.cc) ;; prohibits the use of "@", so use "-" instead. - (or (make-bag build-system (string-append name "-" version) + (or (make-bag build-system + (string-append name "-" + (package-version package)) #:system system #:target target #:source source @@ -2201,3 +2213,32 @@ (define package-source-derivation ;somewhat deprecated (add-to-store store (basename file) #t "sha256" file)) (_ (lower store source system)))))) + +(define-record-type* + git-version* ; TODO Rename to git-version at the end of the deprecation. + make-git-version + git-version? this-git-version + (semantic git-version-semantic) ; string + (revision git-version-revision) ; string + (commit git-version-commit)) ; string + +(define (package-version package) + "Return the canonical string version of the package." + (match (%package-version package) + (($ version revision commit) + ;; XXX: Copied from (@ (guix git-download) git-version). + (when (< (string-length commit) 7) + (raise + (condition + (&message (message "git-version: commit ID unexpectedly short"))))) + (string-append version "-" revision "." (string-take commit 7))) + (version + version))) + +(define-with-syntax-properties (warn-unexpected-package-version + (value properties)) + (unless (or (string? value) (git-version? value)) + (leave (source-properties->location properties) + (G_ "The package-version object's implementation field supports \ +only instances and strings."))) + value) From patchwork Sat Jul 26 02:39:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43281 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 45C0F27BC4F; Sat, 26 Jul 2025 03:42:59 +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 01AF327BC4D for ; Sat, 26 Jul 2025 03:42:59 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufUqm-0000Hi-PV; Fri, 25 Jul 2025 22:41:28 -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 1ufUqi-0000Ck-VF for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:25 -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 1ufUqi-0005Qr-LT for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:24 -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=MM+tVQYGZZauzf6qBjtwc2R+cth6zHagOgM2HV+hUdU=; b=Kx6MgRDxYAef/WxnhSILQSnhDgkW6drCu3hG2SSA1/aAHA34jY8DLqrwT2ABDNuuTBmJCa7FxUzEctF/5dd5mK5+L69RCJWXkswgw/I8wXkthG68HbUxG5mWh87kiYc13JTWf0pj/d8lQm9ps0aBSwiH9kTT5dgGJXq7s1ksfPAwiSDBWbSMwh8sJwzFieWFlptTguWq3BWFO4L2U/YQ6EmEJMg+i+y5zadDcJNDMQ32tZdwvHHriTJYDtiWDVbyly3rd0uaiAo6brsJMFAKVqTNgvqOf2E0FixSSPSQqxDkO00SS65yr+XNtRCDGYtXkweBdb+GWAb+GTxaSwFKqw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ufUqi-0007tt-Aw for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:24 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79099] [PATCH 05/34] gnu: orthanc-postgresql: Set version with vc-version. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Jul 2025 02:41:24 +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.175349767530289 (code B ref 79099); Sat, 26 Jul 2025 02:41:24 +0000 Received: (at 79099) by debbugs.gnu.org; 26 Jul 2025 02:41:15 +0000 Received: from localhost ([127.0.0.1]:38126 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ufUqY-0007sJ-Dp for submit@debbugs.gnu.org; Fri, 25 Jul 2025 22:41:15 -0400 Received: from 10.mo563.mail-out.ovh.net ([46.105.78.6]:49671) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ufUpQ-0007eE-FU for 79099@debbugs.gnu.org; Fri, 25 Jul 2025 22:40:33 -0400 Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net [51.68.80.175]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4bppqj2QlPz5xsL; Sat, 26 Jul 2025 02:40:01 +0000 (UTC) Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net. [127.0.0.1]) by director1.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79099@debbugs.gnu.org>; Sat, 26 Jul 2025 02:40:01 +0000 (UTC) Received: from mta2.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.188.184]) by director1.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bppqj0MmWz5wGM; Sat, 26 Jul 2025 02:40:01 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.7]) by mta2.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id A744D3E3062; Sat, 26 Jul 2025 02:40:00 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-99G003490557c5-61ed-45a0-9c90-9c2fcac1459a, 7BFD41D65738CBEA4850BE66907D66307393418F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sat, 26 Jul 2025 04:39:11 +0200 Message-ID: <20250726023951.11862-5-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: 4611967495350510306 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdekhedvfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelffejteeutefhfeekfffffedvudekjeekgfeludeitdfhkeevhfeivdfhffeggeenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeeltdelleesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeifegmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=MM+tVQYGZZauzf6qBjtwc2R+cth6zHagOgM2HV+hUdU=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1753497601; v=1; b=ulhhD5h7+D6EuLceSkhT+ezQND/njQhSK1iaLTRcZ45QdQnIWQY+ZCVyt0kp1kGfASPRhoAq lodpLOJ/VoMSLz7sZSpn+MfyVtFRZvd7cn9HDJcFX3EEeP4dryKLKwJ3alvMpOPN7a7mY1AHlKx f3db2YNqOPSkDSAZYD0OTfNT4BFwA9Mtd6r5NiAMy2+E11SlFPNuyvnHK0/pE/4c+4pr07aZgVf 196utxiwUQ1flh86s6pYNMCjoWy2ft5E07ta+WYuU/npzhV8l65mdyrO6BaR0zmvHJDi3nKyt1t MK/RPym7X5zWdNPSEtDSrOysGrVJXN/osCbwgoPglhiiQ== 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 * gnu/packages/medical.scm (orthanc-postgresql)[version]: Set it using vc-version. --- gnu/packages/medical.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/medical.scm b/gnu/packages/medical.scm index 7083d7c0577..a81706bf667 100644 --- a/gnu/packages/medical.scm +++ b/gnu/packages/medical.scm @@ -222,7 +222,7 @@ (define-public orthanc-postgresql (revision "0")) (package (name "orthanc-postgresql") - (version (git-version "7.2" revision changeset)) + (version (vc-version "7.2" revision changeset)) (source (origin (method hg-fetch) From patchwork Sat Jul 26 02:39:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43274 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 10CFE27BC4B; Sat, 26 Jul 2025 03:42:38 +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 C950027BC49 for ; Sat, 26 Jul 2025 03:42:37 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufUqq-0000ME-TI; Fri, 25 Jul 2025 22:41:33 -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 1ufUqm-0000Ht-UJ for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:28 -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 1ufUqm-0005Rd-LC for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:28 -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=7HgxuTxcfyqZOSul74VvbPzrszxo8Gl0xMeqHpngvIM=; b=eFfNc2pzw2uDEciy/QduSgBLrnVaDfKdbIoD4wyPMzPjLm9cc6lGu0mLi0Z+6D270rUtWoxyy+er/rZ0KPRnkCR55AmDoxDbl2hO4Gc5bsmRRayQa/0bFw3GFdj8qWcIo6/G6IXkxcZQEVz91B/ZBDHPIhw98aaB3AuCjTasX21CLzV5D6zltDvMffNGZnZjfUZUmfbX08nX/zDGORbZl+0I/AAUurGQ6w6rJbpOK5hg+84BGtvQ6BqwqLcY9tLw1VsBR8P7Z8NSUFdLZ2GrYWB8l53yXVqwTFKGG9FZq36S6LhLEbFSVnemK8x3OfXn/01N4w8DhLiIf2GzElFx0Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ufUqm-0007uV-6q for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:28 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79099] [PATCH 06/34] gnu: orthanc-mysql: Set version with vc-version. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Jul 2025 02:41:28 +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.175349768330356 (code B ref 79099); Sat, 26 Jul 2025 02:41:28 +0000 Received: (at 79099) by debbugs.gnu.org; 26 Jul 2025 02:41:23 +0000 Received: from localhost ([127.0.0.1]:38136 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ufUqf-0007tK-3B for submit@debbugs.gnu.org; Fri, 25 Jul 2025 22:41:21 -0400 Received: from 8.mo562.mail-out.ovh.net ([46.105.60.65]:50363) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ufUpQ-0007eJ-3p for 79099@debbugs.gnu.org; Fri, 25 Jul 2025 22:40:33 -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 4bppqk5ppFz1ySP; Sat, 26 Jul 2025 02:40:02 +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:02 +0000 (UTC) Received: from mta6.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.188.184]) by director4.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bppqk3dR1z251d; Sat, 26 Jul 2025 02:40:02 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.9]) by mta6.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 1901D8E31A7; Sat, 26 Jul 2025 02:40:01 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-107S001f272e838-bd87-4a01-9250-045e37f7da16, 7BFD41D65738CBEA4850BE66907D66307393418F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sat, 26 Jul 2025 04:39:12 +0200 Message-ID: <20250726023951.11862-6-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: 4612248971244790498 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdekhedvfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelffejteeutefhfeekfffffedvudekjeekgfeludeitdfhkeevhfeivdfhffeggeenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggeenucevlhhushhtvghrufhiiigvpedunecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeeltdelleesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeivdgmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=7HgxuTxcfyqZOSul74VvbPzrszxo8Gl0xMeqHpngvIM=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1753497603; v=1; b=nwuQJiuSmN+yB6wlXasneLbvuFvP3rOlFLFNJbTXYwaCRM6w3ys6ciLU+K5bLlnekbvMuBTq KNtZGyRdTfPzNKfwsLq874Pf7N+8sEQoLq+pmC65hS3vvoBATNS5P9/3syQ4yydSZqSAoQzvL1w dWak08k4hOWnUA+2hWwuvBbhU8SA/4/GXTsFmHmDUco6cKiT/nKQN6Yy3V2DkIooQ+YeEXev0F0 bBY6FkwT0BLBRG8c53M5JtbsgdNrLGpGWNIJccTkxrZoQYkuEqrhqa/HwQQml21EmEBjjCHS/+O /n5tQi1jXbeZDzxKwVUvIzRA8IU1ed8B+muRUaU9FZnNg== 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 * gnu/packages/medical.scm (orthanc-mysql)[version]: Set it using vc-version. --- gnu/packages/medical.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/medical.scm b/gnu/packages/medical.scm index a81706bf667..89352647052 100644 --- a/gnu/packages/medical.scm +++ b/gnu/packages/medical.scm @@ -301,7 +301,7 @@ (define-public orthanc-mysql (revision "0")) (package (name "orthanc-mysql") - (version (git-version "5.2" revision changeset)) + (version (vc-version "5.2" revision changeset)) (source (origin (method hg-fetch) From patchwork Sat Jul 26 02:39:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43276 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 1EA2F27BC4C; Sat, 26 Jul 2025 03:42:48 +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 CDA5A27BC49 for ; Sat, 26 Jul 2025 03:42:47 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufUqa-0008V6-VY; Fri, 25 Jul 2025 22:41:17 -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 1ufUqY-0008U4-RJ for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:14 -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 1ufUqY-0005PB-HH for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:14 -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=kUbAWI+NbZFcd0am8b0pSk362mU72r5F32onAoGYQAw=; b=BML0Gq28cOIg2NU2S/U6GiL5CXibkAc2RnxHG0eU4i5yI8pcUmZKZNbksOm7rVnuoWV83x1ZKNzm3JhbkQxo7QTtSD/N7RbaIKMrFV7kNzXPBWoJF4wrtVLHB87eYvgDzN6ld98R68Lh5toEhAtMZH+/inpzqfAWP0/1s2EkL12Gvd+K4yooRoVifnN+Ht5yy2/okKAteaFNqZvwrV9Th5Lvg9xpD8YBAFkjUWTWlm1bJmRVl6i/1z3iGXURbeXjKF6JAb5ai3oGFCjkZ47d0uYEqrvMBPmhR5ElQu51Bm6j58HGn2k0BEvwwtEPjqThRvfJDOmzhrNudzLbE9a78g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ufUqX-0007s8-55 for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:14 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79099] [PATCH 07/34] gnu: gemmlowp-for-tensorflow: Set version with vc-version. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Jul 2025 02:41:13 +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.175349766330195 (code B ref 79099); Sat, 26 Jul 2025 02:41:13 +0000 Received: (at 79099) by debbugs.gnu.org; 26 Jul 2025 02:41:03 +0000 Received: from localhost ([127.0.0.1]:38112 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ufUqL-0007qX-61 for submit@debbugs.gnu.org; Fri, 25 Jul 2025 22:41:02 -0400 Received: from 1.mo563.mail-out.ovh.net ([178.33.106.244]:54837) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ufUpU-0007ea-8f for 79099@debbugs.gnu.org; Fri, 25 Jul 2025 22:40:28 -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 4bppql4kzyz5yGF; Sat, 26 Jul 2025 02:40:03 +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:03 +0000 (UTC) Received: from mta7.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.58.3]) by director2.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bppql3dMKz1xrp; Sat, 26 Jul 2025 02:40:03 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.7]) by mta7.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 34977B831A1; Sat, 26 Jul 2025 02:40:03 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-106R00699a1b862-94c2-4d92-b5f4-93cfa5d481ed, 7BFD41D65738CBEA4850BE66907D66307393418F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sat, 26 Jul 2025 04:39:13 +0200 Message-ID: <20250726023951.11862-7-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: 4612530444375220962 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdekhedvfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeektdeuiedufeevhfekjeffhfdvtdfgkeefjeegtdefudejfffhudekkefhhfffteenucffohhmrghinhepsggriigvlhdrsghuihhlugenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeeltdelleesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeifegmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=kUbAWI+NbZFcd0am8b0pSk362mU72r5F32onAoGYQAw=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1753497603; v=1; b=pg1aHgnNp4fDoYHg8HkIsB6j7aYCUcI9fzUbeQAqlOsBQ/95cs98sPPm3HTWGc02oVFcQQvD h8d70+khYZvK3WUN9fwknXxuZAVC0pl+IBAgnEdaOLqZkl3fM68c6dhvZRR8l3VBSuwiY8RxQaA 3mK+8RFGBUQYAGn54mFFJnLznt1twyhSxNLP+302xSpnqa2poHglaWd2xIUhMtUGEV060HOsyQm a8QDrU+mFEFGqnp1+4TSj7KJGn9rKDmCDgOQcAIjEm6wb6go5H/fynIlvOpfMSplGevpR5/KQiq jGb7m1q0vNRn1A9J9T7Fofgp4oJ09K8GRsytRaJA/+iTg== 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 * gnu/packages/machine-learning.scm (gemmlowp-for-tensorflow) [version]: Set it with vc-version. --- gnu/packages/machine-learning.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index aa1f88e8137..d7ad9625ce8 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1874,7 +1874,7 @@ (define-public gemmlowp-for-tensorflow (revision "2")) (package (inherit gemmlowp) - (version (git-version "0" revision commit)) + (version (vc-version "0" revision commit)) (source (origin (method url-fetch) (uri (string-append "https://mirror.bazel.build/" From patchwork Sat Jul 26 02:39:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43284 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 19BD527BC4B; Sat, 26 Jul 2025 03:43:05 +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 B57D527BC49 for ; Sat, 26 Jul 2025 03:43:04 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufUqf-00008M-9R; Fri, 25 Jul 2025 22:41:21 -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 1ufUqd-00006B-Fy for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:19 -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 1ufUqd-0005Pk-0B for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:19 -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=tHlTbjlToiyEI9xbe+kJOXtraz237BwLhrii2Xsmetk=; b=bjhEet56aBuwhf8GfCHhEM9blnnfWebdT/UCVVrM6tiysonhKRORiOwqaxX+AXh7Ni1Byc0zxMRigYol2rf1dZ+lsWUxpQzLRJL2xyraVDJPOz5zjE2HYfsEpYXgVu40qurkJsIDI7VaT5uFelbINANs9+MH1p/51yHA8uVaN3+KX3T76cW4mdnOntcJlp2vaVDeGA9mbjyDH8H+3tk+k4bSb871q+0NJvduWK2MAE5bfsiM049rhMWU145P8rt42+RaNG/7mJ/A8CMVtWV5t58dcJi6zqTOVa5+KGkAvejMrWC7IZidFMW4I8cTtJT5xls82ZwXuCwQElGMpz0Nvw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ufUqc-0007t1-PK for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:18 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79099] [PATCH 08/34] gnu: t-todo-manager: Set version with vc-version. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Jul 2025 02:41:18 +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.175349766530217 (code B ref 79099); Sat, 26 Jul 2025 02:41:18 +0000 Received: (at 79099) by debbugs.gnu.org; 26 Jul 2025 02:41:05 +0000 Received: from localhost ([127.0.0.1]:38116 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ufUqO-0007r7-AN for submit@debbugs.gnu.org; Fri, 25 Jul 2025 22:41:04 -0400 Received: from 6.mo563.mail-out.ovh.net ([46.105.55.200]:33723) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ufUpU-0007ej-7q for 79099@debbugs.gnu.org; Fri, 25 Jul 2025 22:40:29 -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 4bppqm66Gmz5yLF; Sat, 26 Jul 2025 02:40:04 +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:04 +0000 (UTC) Received: from mta3.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.37.222]) by director3.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bppqm4Gvfz5wFQ; Sat, 26 Jul 2025 02:40:04 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.11]) by mta3.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 1DDEC942E1A; Sat, 26 Jul 2025 02:40:04 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-105G0064009ffad-553b-4654-b18f-b4a5ff77c647, 7BFD41D65738CBEA4850BE66907D66307393418F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sat, 26 Jul 2025 04:39:14 +0200 Message-ID: <20250726023951.11862-8-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: 4612811918972084962 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdekhedvfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelffejteeutefhfeekfffffedvudekjeekgfeludeitdfhkeevhfeivdfhffeggeenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeeltdelleesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeifegmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=tHlTbjlToiyEI9xbe+kJOXtraz237BwLhrii2Xsmetk=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1753497604; v=1; b=HqpDE44jhJ1UVzzFguucOpmmqoQCtT4qBPVub9K6wjrZA4vL1N2QNblyOsWa9hodLoc2QGMv 9swA+j7Y5y8fRScCwJ3loLJykw47KAx/LjTIl8UEzcsh/57St7OvxBWaVAtGlND0ZgyU96pK4Ey YGAigEpQADzulpCYHur/n6ABxeE9RWneo1p47XQXsYdG0uA8hmC5B0m27g/UUdGdFOmmG0kRc6d PcvoWdddZNOFoD0ve/FW5aenWmTJH7TNOqNE3eqqhzDaXWgKAUws3X81m7wHS7rUNIrBnb2X0CP aaulZ9D0kunscgHXUlUGpRpv0UH7Zz3bQayaUrKDIsM1g== 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 * gnu/packages/task-management.scm (t-todo-manager)[version]: Set it using vc-version. --- gnu/packages/task-management.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/task-management.scm b/gnu/packages/task-management.scm index 10205957180..4e6b8d147a7 100644 --- a/gnu/packages/task-management.scm +++ b/gnu/packages/task-management.scm @@ -167,7 +167,7 @@ (define-public t-todo-manager (revision "97")) (package (name "t-todo-manager") - (version (git-version "1.2.0" revision changeset)) + (version (vc-version "1.2.0" revision changeset)) (source (origin (method hg-fetch) From patchwork Sat Jul 26 02:39:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43272 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 2A51427BC4B; Sat, 26 Jul 2025 03:42:22 +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 BC95D27BC4A for ; Sat, 26 Jul 2025 03:42:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufUqr-0000Me-Vq; Fri, 25 Jul 2025 22:41:34 -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 1ufUqo-0000Iq-IS for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:30 -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 1ufUqo-0005Rl-1v for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:30 -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=bgVR9C4DlNFMg7gW6Afs/kRTzPrCbeflFqoeZoIVPTI=; b=NLTs4sq5SKH5wRPN4b4LMx6gLmDIgpFr58MlHi208pbxpxyYB2SpmUoascFH0hYYz3f+Gi/clHKlkc2uqNOUTyArZTyZ7qtyMpkB9ssIZV199FYwxpZb9bKj6imc0sTxCZEWREDt4mHrGPg1yMWm5tJlOclWuhhsoOGkIH+A+I1gxuLpMr/1dpua1/4wFHQV04yrRTRqoQ6kAbGldpBn6RzRZ93sVjarFem649vrFkV7adQDaOWDxFibtzz1qfVIMRQ+R9L+20OuEpa0cgoKa7qMYqpQeejqWX60MBMYO4JRwj4tfeOeOL0wPuScx6hfA7cheDgVF8g8eqlvQZdO5g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ufUqn-0007uk-My for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:29 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79099] [PATCH 09/34] gnu: emacs-company-box: Set version without git-version. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Jul 2025 02:41:29 +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.175349768430371 (code B ref 79099); Sat, 26 Jul 2025 02:41:29 +0000 Received: (at 79099) by debbugs.gnu.org; 26 Jul 2025 02:41:24 +0000 Received: from localhost ([127.0.0.1]:38138 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ufUqg-0007tZ-Mb for submit@debbugs.gnu.org; Fri, 25 Jul 2025 22:41:23 -0400 Received: from 4.mo563.mail-out.ovh.net ([46.105.53.192]:49505) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ufUpX-0007f1-1D for 79099@debbugs.gnu.org; Fri, 25 Jul 2025 22:40:36 -0400 Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net [51.68.80.175]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4bppqp0MGnz5xt8; Sat, 26 Jul 2025 02:40:06 +0000 (UTC) Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net. [127.0.0.1]) by director1.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79099@debbugs.gnu.org>; Sat, 26 Jul 2025 02:40:05 +0000 (UTC) Received: from mta7.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.109.254.103]) by director1.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bppqn5W0Bz5xTr; Sat, 26 Jul 2025 02:40:05 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.11]) by mta7.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 572CBB8315C; Sat, 26 Jul 2025 02:40:05 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-101G004ee24ecc1-f43e-4ddc-a1fe-f45f478f59dd, 7BFD41D65738CBEA4850BE66907D66307393418F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sat, 26 Jul 2025 04:39:15 +0200 Message-ID: <20250726023951.11862-9-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: 4613093395117695714 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdekhedvfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelffejteeutefhfeekfffffedvudekjeekgfeludeitdfhkeevhfeivdfhffeggeenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeeltdelleesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeifegmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=bgVR9C4DlNFMg7gW6Afs/kRTzPrCbeflFqoeZoIVPTI=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1753497606; v=1; b=phuk2tiM6yu3d2pH2J/EGkCp5Nv49gUzY6uTPXzPyzIb+1cAFlyqNyjIOJ++ao4I9zk3SE9p 3UVY4Kg5mBIeLBZmueBuSF8557kLaQEC/lBaB4hWLHZT9lIKb9zeak+qJ6iaDSdBFhSkwmxOFvk m/DYLG2cezrJkTIN0wgE/Udd5KQVbUsJyIAhW70vHuV7opZFGytipDhnranfPwxdxsMhrptNvS3 c0fA8cFbvzaCX6YNdfxvaltRk08tVaTMXWWVJlPWUu9CPub0K8/VprEUJS3uKD5P9uCviPZGd7k f/pfWM+rpGrUQ6FZlzuT88rfwU2K7EyzVh30BlRzwPXfg== 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 * gnu/packages/emacs-xyz.scm (emacs-company-box)[version]: Set it without using git-version. --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0c7532a41b4..187666abc6c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11156,7 +11156,7 @@ (define-public emacs-company-box (commit "be37a9a30dc112ab172af21af694e2cb04a74f85")) (package (name "emacs-company-box") - (version (git-version version revision commit)) + (version (string-append version "-" revision "." (string-take commit 7))) (source (origin (method (@@ (guix packages) computed-origin-method)) From patchwork Sat Jul 26 02:39:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43280 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 294D627BC4B; Sat, 26 Jul 2025 03:42:53 +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 27F3927BC49 for ; Sat, 26 Jul 2025 03:42:50 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufUqt-0000Nf-GP; Fri, 25 Jul 2025 22:41:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ufUqs-0000Mq-Ed for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:34 -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 1ufUqs-0005Sa-5o for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:34 -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=xrwv8PRr57YRo6uI+UNQ460N5HSPFmWI5V5ZtZ8rPWg=; b=FOnojZ1qwZfvtd1pdmCs/GfHbURkq5P2NBxMnBFtnR8GHSbExK0AwgHxuAuasuNbARoAjnn1EVOPgm80a6vvL5YdVgFUhJW1KNW1fSvo4w9oFNt5k3uz+14gGp9AYsqsY38fAAg9/e8zfK17+h0GZhkDbVbAHI4kNpOPAjpug8LhRoSLuAhtDi3dXn9EntE4B/JvWgcT1+4OIiZqOTXVlTF3oBwYUPaPyi9X2+yKWHiiR0PSIw1+/iHpBX6YjiFm1u90mBv0VQyZ2OQEtdbXgapxfzLim+H/5kvbB8K0vz5BGEa4nS6wHFJkOlA+IECB24bf5nBKwkL9U8v/WzQeyw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ufUqq-0007vK-U3 for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:33 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79099] [PATCH 10/34] gnu/packages/a*.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:32 +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.175349768830418 (code B ref 79099); Sat, 26 Jul 2025 02:41:32 +0000 Received: (at 79099) by debbugs.gnu.org; 26 Jul 2025 02:41:28 +0000 Received: from localhost ([127.0.0.1]:38144 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ufUqj-0007uB-Rh for submit@debbugs.gnu.org; Fri, 25 Jul 2025 22:41:28 -0400 Received: from 5.mo562.mail-out.ovh.net ([46.105.48.192]:41153) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ufUpX-0007f2-4n for 79099@debbugs.gnu.org; Fri, 25 Jul 2025 22:40:39 -0400 Received: from director3.derp.mail-out.ovh.net (director3.derp.mail-out.ovh.net [152.228.215.222]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4bppqp6bNcz2c3M; Sat, 26 Jul 2025 02:40:06 +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:06 +0000 (UTC) Received: from mta11.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.58.138]) by director3.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bppqp4bpMz5xQS; Sat, 26 Jul 2025 02:40:06 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.8]) by mta11.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 505F99A3197; Sat, 26 Jul 2025 02:40:06 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-95G0014dccc6be-fb87-4952-af9e-bb963f2ca22f, 7BFD41D65738CBEA4850BE66907D66307393418F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sat, 26 Jul 2025 04:39:16 +0200 Message-ID: <20250726023951.11862-10-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: 4613374871315538658 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdekhedvfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvheelieffheetvdelhfffffejfefgudfhteekveehieetudeiudfgkeeutdehjeenucffohhmrghinhepghhithhhuhgsrdgtohhmnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledtleelseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=xrwv8PRr57YRo6uI+UNQ460N5HSPFmWI5V5ZtZ8rPWg=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1753497607; v=1; b=A0IXo1BSacXCi85leKT+COKpKOfAM/lGbmRLgpVIy7ziO2it4ebg10j54A1/18hfgzbMgfaA CXlYl7+nl+EBkOxQ1MKU8XnFOwLA4/lX5zaQ+qjE+hO1/jQSokRQyAKBvAi88zUuLBJt7B/gJk/ 50y0D6Ql7dR4JDZsAYYn/rmuKFdeuM4cUaFRtVOugaV4E26qusUCuN6irjgCOqydYTPWC88J6Wg 0w3lDTefTYHVyk3ist5wle2Dsla9LlctYPKhVkjmHWH6cbhcoT4e0kPka2+8BILbflJzqRmn/Qc KkigjcsiM2o9pDL4odEVRMkJ3DeSiP7kFLUw2kOfPX4GA== 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 "a*.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/accessibility.scm | 2 +- gnu/packages/admin.scm | 20 ++++++++++--------- gnu/packages/agda.scm | 4 ++-- gnu/packages/aidc.scm | 2 +- gnu/packages/algebra.scm | 5 +++-- gnu/packages/animation.scm | 2 +- gnu/packages/appimage.scm | 5 +++-- gnu/packages/arcan.scm | 2 +- gnu/packages/assembly.scm | 2 +- gnu/packages/astronomy.scm | 24 +++++++++++------------ gnu/packages/audio.scm | 36 ++++++++++++++++++---------------- gnu/packages/autotools.scm | 2 +- gnu/packages/axoloti.scm | 2 +- 13 files changed, 57 insertions(+), 51 deletions(-) diff --git a/gnu/packages/accessibility.scm b/gnu/packages/accessibility.scm index bf1e56f6629..af777cd02eb 100644 --- a/gnu/packages/accessibility.scm +++ b/gnu/packages/accessibility.scm @@ -277,7 +277,7 @@ (define-public footswitch (revision "0")) (package (name "footswitch") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index cc57b1207ec..ca696bde341 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -995,7 +995,7 @@ (define-public ttyload (commit "f9495372801ce4b4dad98ad854203e694c31c1eb")) (package (name "ttyload") - (version (git-version "0.5.3" revision commit)) + (version (make-git-version "0.5.3" revision commit)) (source (origin (method git-fetch) @@ -3619,7 +3619,7 @@ (define-public nettop (commit "689d6557196e9fcc92cffba82e00fac0386419e5")) (package (name "nettop") - (version (git-version "0.5" revision commit)) + (version (make-git-version "0.5" revision commit)) (source (origin (method git-fetch) @@ -4063,7 +4063,7 @@ (define-public interrobang (commit "896543735e1c99144765fdbd7b6e6b5afbd8b881")) (package (name "interrobang") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -4598,7 +4598,7 @@ (define-public pfetch (revision "1")) (package (name "pfetch") - (version (git-version "0.7.0" revision commit)) + (version (make-git-version "0.7.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -4618,7 +4618,8 @@ (define-public pfetch (let* ((source (lambda (f) (string-append (assoc-ref %build-inputs "source") "/" f))) (output (assoc-ref %outputs "out")) - (docdir (string-append output "/share/doc/pfetch-" ,version))) + (docdir (string-append output "/share/doc/pfetch-" + ,(package-version this-package)))) (install-file (source "LICENSE.md") docdir) (install-file (source "README.md") docdir) (install-file (source "pfetch") (string-append output "/bin")) @@ -5329,7 +5330,7 @@ (define-public pam-uaccess (revision "0")) (package (name "pam-uaccess") - (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 @@ -5796,7 +5797,7 @@ (define-public lsofgraph (revision "1")) (package (name "lsofgraph") - (version (git-version "0.0.1" revision commit)) ;no upstream release + (version (make-git-version "0.0.1" revision commit)) ;no upstream release (source (origin (method git-fetch) (uri (git-reference @@ -5826,7 +5827,8 @@ (define-public lsofgraph ;; install phase (install-file "lsofgraph" (string-append %output "/bin")) (let ((doc (string-append - %output "/share/doc/" ,name "-" ,version))) + %output "/share/doc/" ,name "-" + ,(package-version this-package)))) (mkdir-p doc) (install-file "LICENSE" doc) (install-file "README.md" doc)) @@ -6400,7 +6402,7 @@ (define-public restartd (revision "1")) (package (name "restartd") - (version (git-version "0.2.3" revision commit)) + (version (make-git-version "0.2.3" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/agda.scm b/gnu/packages/agda.scm index ff232784690..2e9d38d7140 100644 --- a/gnu/packages/agda.scm +++ b/gnu/packages/agda.scm @@ -164,7 +164,7 @@ (define-public agda-ial (commit "ded30c410d5d40142249686572aa1acd1b2f8cc7")) (package (name "agda-ial") - (version (git-version "1.5.0" revision commit)) + (version (make-git-version "1.5.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/cedille/ial") @@ -298,7 +298,7 @@ (define-public agda-1lab (commit "afcf848d367f906d6d07d1612fbd41d7dd8c978e")) (package (name "agda-1lab") - (version (git-version "0.0" revision commit)) + (version (make-git-version "0.0" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/aidc.scm b/gnu/packages/aidc.scm index 24738a4c010..0aa4677cd8f 100644 --- a/gnu/packages/aidc.scm +++ b/gnu/packages/aidc.scm @@ -130,7 +130,7 @@ (define-public zxing-cpp-1.2a (commit "00783db7aa3bcf8620a301854ac71c0ceaaca0c1")) (package/inherit zxing-cpp (name "zxing-cpp") - (version (git-version "1.2.0" revision commit)) + (version (make-git-version "1.2.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index fca970627ee..00a5d78d01d 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -1939,7 +1939,7 @@ (define-public form (revision "0")) (package (name "form") - (version (git-version "4.3.0" revision commit)) + (version (make-git-version "4.3.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1972,7 +1972,8 @@ (define-public form (lambda _ (let ((doc (string-append #$output "/share/doc/" #$name "-" - #$version "/html"))) + #$(package-version this-package) + "/html"))) (mkdir-p doc) (copy-recursively "doc/doxygen/html" doc))))))) (native-inputs (list autoconf automake doxygen ruby)) diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm index 4fca759ef57..b9f77b1de9e 100644 --- a/gnu/packages/animation.scm +++ b/gnu/packages/animation.scm @@ -388,7 +388,7 @@ (define-public swftools (revision "2")) (package (name "swftools") - (version (git-version "0.9.2" revision commit)) + (version (make-git-version "0.9.2" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/appimage.scm b/gnu/packages/appimage.scm index 620628c053d..3872821a1d1 100644 --- a/gnu/packages/appimage.scm +++ b/gnu/packages/appimage.scm @@ -35,7 +35,7 @@ (define-public appimage-type2-runtime (commit "47b665594856b4e8928f8932adcf6d13061d8c30")) (package (name "appimage-type2-runtime") - (version (git-version "continuous" revision commit)) + (version (make-git-version "continuous" revision commit)) (source (origin (method git-fetch) @@ -52,7 +52,8 @@ (define-public appimage-type2-runtime (string-append "CC=" #$(cc-for-target)) (string-append "CFLAGS=" "-I" #$(this-package-input "fuse") "/include/fuse/" - " -DGIT_COMMIT='\"" "guix-" #$version "\"'" + " -DGIT_COMMIT='\"" + "guix-" #$(package-version this-package) "\"'" " -D_FILE_OFFSET_BITS=64" " -static" " -Wno-int-conversion")) diff --git a/gnu/packages/arcan.scm b/gnu/packages/arcan.scm index 49b5d04990a..74f6d348381 100644 --- a/gnu/packages/arcan.scm +++ b/gnu/packages/arcan.scm @@ -191,7 +191,7 @@ (define-public durden (revision "2")) (package (name "durden") - (version (git-version "0.6.1" revision commit)) + (version (make-git-version "0.6.1" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm index 572ad705d55..7c09a42aaa8 100644 --- a/gnu/packages/assembly.scm +++ b/gnu/packages/assembly.scm @@ -713,7 +713,7 @@ (define-public neon2sse (revision "1")) (package (name "neon2sse") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index d228b554c3c..c3a11bbb13d 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -191,7 +191,7 @@ (define-public aocommon (revision "2")) (package (name "aocommon") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -1533,7 +1533,7 @@ (define-public phd2 (revision "0")) (package (name "phd2") - (version (git-version "2.6.13" revision commit)) + (version (make-git-version "2.6.13" revision commit)) (source (origin (method git-fetch) @@ -1925,7 +1925,7 @@ (define-public python-asdf-compression (revision "2")) (package (name "python-asdf-compression") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -3110,7 +3110,7 @@ (define-public python-colossus (revision "0")) (package (name "python-colossus") - (version (git-version "1.3.8" revision commit)) + (version (make-git-version "1.3.8" revision commit)) (source (origin (method git-fetch) @@ -5597,7 +5597,7 @@ (define-public python-so-noise-models (revision "0")) (package (name "python-so-noise-models") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) ; no release on PyPI @@ -6956,7 +6956,7 @@ (define-public python-pysynphot (revision "0")) (package (name "python-pysynphot") - (version (git-version "2.0.0" revision commit)) + (version (make-git-version "2.0.0" revision commit)) (source (origin (method git-fetch) @@ -7213,7 +7213,7 @@ (define-public python-asdf-fits-schemas (revision "2")) (package (name "python-asdf-fits-schemas") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -8730,7 +8730,7 @@ (define-public sgp4 (revision "2")) (package (name "sgp4") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -9061,7 +9061,7 @@ (define-public stellarium (revision "2")) (package (name "stellarium") - (version (git-version "25.1" revision commit)) + (version (make-git-version "25.1" revision commit)) (source (origin (method git-fetch) @@ -9160,7 +9160,7 @@ (define-public sunclock (revision "1")) (package (name "sunclock") - (version (git-version "3.57" revision commit)) + (version (make-git-version "3.57" revision commit)) (source (origin (method git-fetch) @@ -9365,7 +9365,7 @@ (define-public unsio (revision "1")) (package (name "unsio") - (version (git-version "1.3.3" revision commit)) + (version (make-git-version "1.3.3" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -9464,7 +9464,7 @@ (define-public uranimator (revision "0")) (package (name "uranimator") - (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/audio.scm b/gnu/packages/audio.scm index e5d68b5c4e7..3ec8bae7039 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -289,7 +289,7 @@ (define-public alsa-midi-latency-test (commit "07e43f8a1e6fd6d3bd97a00f2ee5afb74cb66f95")) (package (name "alsa-midi-latency-test") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -460,7 +460,7 @@ (define-public fmsynth-lv2 (revision "0")) (package (name "fmsynth-lv2") - (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 @@ -1516,7 +1516,7 @@ (define-public azr3 (revision "1")) (package (name "azr3") - (version (git-version "1.2.3" revision commit)) + (version (make-git-version "1.2.3" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1544,7 +1544,9 @@ (define-public azr3 (lambda (port) (display "" port))) (substitute* "Makefile" (("^PACKAGE_VERSION =.*") - (string-append "PACKAGE_VERSION = \"" #$version "\"\n"))))) + (string-append "PACKAGE_VERSION = \"" + #$(package-version this-package) + "\"\n"))))) (add-before 'install 'fix-timestamp (lambda _ (let ((early-1980 315619200)) ; 1980-01-02 UTC @@ -1893,7 +1895,7 @@ (define-public omins-lv2 (name "omins-lv2") ;; No release despite being perfectly usable. 0.0.0 seems to be the only ;; version the author ever specified: - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) (uri @@ -2117,7 +2119,7 @@ (define-public tao-synth (revision "1")) (package (name "tao-synth") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -2181,7 +2183,7 @@ (define-public midicomp (revision "1")) (package (name "midicomp") - (version (git-version "0.0.8" revision commit)) + (version (make-git-version "0.0.8" revision commit)) (source (origin (method git-fetch) @@ -3848,7 +3850,7 @@ (define-public lvtk-2 (revision "0")) (package (name "lvtk") - (version (git-version "2" revision commit)) + (version (make-git-version "2" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -3877,7 +3879,7 @@ (define-public lvtk-1 (revision "0")) (package (name "lvtk") - (version (git-version "1.2.0" revision commit)) + (version (make-git-version "1.2.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -4706,7 +4708,7 @@ (define-public stargate-sbsms (revision "0")) (package/inherit libsbsms (name "stargate-sbsms") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (home-page "https://github.com/stargatedaw/stargate-sbsms") (source (origin @@ -4800,7 +4802,7 @@ (define-public wstsound (revision "0")) (package (name "wstsound") - (version (git-version "0.3.0" revision commit)) + (version (make-git-version "0.3.0" revision commit)) (source (origin (method git-fetch) @@ -4829,7 +4831,7 @@ (define-public libmixed (revision "1")) (package (name "libmixed") - (version (git-version "2.0" revision commit)) + (version (make-git-version "2.0" revision commit)) (source (origin (method git-fetch) @@ -4990,7 +4992,7 @@ (define-public stargate-soundtouch (revision "0")) (package/inherit soundtouch (name "stargate-soundtouch") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (home-page "https://github.com/stargatedaw/stargate-soundtouch") (source (origin @@ -5919,7 +5921,7 @@ (define-public lv2-speech-denoiser (revision "1")) (package (name "lv2-speech-denoiser") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -6500,7 +6502,7 @@ (define-public carla-2.6 (package (inherit carla) (name "carla") - (version (git-version "2.6.0" revision commit)) + (version (make-git-version "2.6.0" revision commit)) (source (origin (method git-fetch) @@ -6794,7 +6796,7 @@ (define-public mbelib (revision "1")) (package (name "mbelib") - (version (git-version "1.3.0" revision commit)) + (version (make-git-version "1.3.0" revision commit)) (source (origin (method git-fetch) @@ -7353,7 +7355,7 @@ (define-public cubeb (revision "1")) (package (name "cubeb") - (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/autotools.scm b/gnu/packages/autotools.scm index 273a75509e8..0c121ef82ca 100644 --- a/gnu/packages/autotools.scm +++ b/gnu/packages/autotools.scm @@ -541,7 +541,7 @@ (define-public config (commit "c8ddc8472f8efcadafc1ef53ca1d863415fddd5f")) (package (name "config") - (version (git-version "0.0.0" revision commit)) ;no release tag + (version (make-git-version "0.0.0" revision commit)) ;no release tag (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/axoloti.scm b/gnu/packages/axoloti.scm index 75087359fd4..1a45c215f60 100644 --- a/gnu/packages/axoloti.scm +++ b/gnu/packages/axoloti.scm @@ -354,7 +354,7 @@ (define-public ksoloti-runtime (commit "b7ae4753b33532597db232285f4f3c1808f516b4")) (package (name "ksoloti-runtime") - (version (git-version "1.1.0" revision commit)) + (version (make-git-version "1.1.0" revision commit)) (source (origin (method git-fetch) 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) 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) From patchwork Sat Jul 26 02:39:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43282 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 169E427BC49; Sat, 26 Jul 2025 03:43:01 +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 DC90827BC4B for ; Sat, 26 Jul 2025 03:42:58 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufUqp-0000KK-Fa; 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 1ufUqh-0000Ak-AW for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:23 -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 1ufUqh-0005QS-0B for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:23 -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=h1Da40J6HaC4ziQR5XQq3G6mj6myzvo9Y2WHUeEcfbw=; b=fQaUPkxIpcbpfW4uqYjZh/2k3e9bdr+A+CKfUpmiz6H+qFO6ft/v7emzXmJXBQoVXSlYVOysScTghKgNrMV0578InwJJlUwT2ZFOBDYMY7msMFUiAHL7Wqix2G2fgBsOb3uCnELYrAizYeIzIMYeE+kBFDZILv75UOGx3V2LtjnBLVxds2xVGzJksoi9L0yCnzif0Mz3adYjMjTtRTwM+DTn5n6pe/hoC7LVatNDAJ8bwYn0QptMOXlDly2JxOls8ZvfGMIu6sXHAgIcCozRcfU2VGsfToi8FZhKNSaoiXKeuuEmG/UYB32lK9SQDMEOgl6ku9rXjpuQxtneb04UxQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ufUqg-0007tV-G4 for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:22 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79099] [PATCH 13/34] gnu/packages/d*.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:21 +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.175349767430273 (code B ref 79099); Sat, 26 Jul 2025 02:41:21 +0000 Received: (at 79099) by debbugs.gnu.org; 26 Jul 2025 02:41:14 +0000 Received: from localhost ([127.0.0.1]:38121 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ufUqU-0007rj-8y for submit@debbugs.gnu.org; Fri, 25 Jul 2025 22:41:12 -0400 Received: from 6.mo563.mail-out.ovh.net ([46.105.55.200]:52147) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ufUpW-0007f8-Sp 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 4bppqs6N9fz6NZy; 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:09 +0000 (UTC) Received: from mta7.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.54.88]) by director2.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bppqs5M6Pz1xpf; Sat, 26 Jul 2025 02:40:09 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.6]) by mta7.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 6DF55B8315C; Sat, 26 Jul 2025 02:40:09 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-98R0020b4a91c0-386f-4a07-a901-05cf757dec2d, 7BFD41D65738CBEA4850BE66907D66307393418F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sat, 26 Jul 2025 04:39:19 +0200 Message-ID: <20250726023951.11862-13-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: 4614219296145662690 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdekhedvfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeeggfdvkeffudejiefhfeelteekjeeivdekvdfhveehgfeutdelgeffffetvefgjeenucffohhmrghinhepphhusghlihgtshhufhhfihigrdhorhhgpdhgihhthhhusgdrtghomhenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeeltdelleesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeifegmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=h1Da40J6HaC4ziQR5XQq3G6mj6myzvo9Y2WHUeEcfbw=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1753497610; v=1; b=0E0Tjj0P7pNhrABNulSRwSpNChthtnTjZXaMVLHYYu1G8RvccimbkPMO2492cl7+SixpIdjJ WI5Y7h7a8APc+qXwBiWD/HizSWDVF2Zn1hYTPMsBAwM2djpfFxk6cDCDSX0UV+ZukzhKudMWEwH J+HTQBDMz++29fLISKusnq6LPO/KTzbpo46u2EWn2y/qGWELYeo0py8aXfZHSVTSmMsLOxhCvxh 5Zo8iLdjFA5wH5ZHBH6c74tCl+1LexyKby68S2MnoTnjkq0BWba/zLWz9kmsSHP7Uu7IM7rQr01 RVrsbPKsVobuYlIVwkMSxP5/xW/5MUnr3c6PvONQP1caA== 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 "d*.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/darwin.scm | 6 +++--- gnu/packages/databases.scm | 2 +- gnu/packages/datastructures.scm | 5 +++-- gnu/packages/debian.scm | 2 +- gnu/packages/debug.scm | 8 ++++---- gnu/packages/dictionaries.scm | 4 ++-- gnu/packages/disk.scm | 8 ++++---- gnu/packages/display-managers.scm | 8 ++++---- gnu/packages/djvu.scm | 4 ++-- gnu/packages/dlang.scm | 2 +- gnu/packages/dns.scm | 7 ++++--- gnu/packages/docbook.scm | 5 +++-- gnu/packages/docker.scm | 2 +- gnu/packages/documentation.scm | 2 +- gnu/packages/dotnet.scm | 8 ++++---- 15 files changed, 38 insertions(+), 35 deletions(-) diff --git a/gnu/packages/darwin.scm b/gnu/packages/darwin.scm index 88990d04042..42d4868323a 100644 --- a/gnu/packages/darwin.scm +++ b/gnu/packages/darwin.scm @@ -35,9 +35,9 @@ (define-public cctools (commit "04663295d0425abfac90a42440a7ec02d7155fea")) (package (name "cctools") - (version (git-version (string-append cctools-version - "-ld64-" - ld64-version) + (version (make-git-version (string-append cctools-version + "-ld64-" + ld64-version) revision commit)) (source diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index e66b640ce79..4977b778939 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2208,7 +2208,7 @@ (define-public sqlcrush (revision "2")) (package (name "sqlcrush") - (version (git-version "0.1.5" revision commit)) + (version (make-git-version "0.1.5" revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/datastructures.scm b/gnu/packages/datastructures.scm index 485cd03b7dc..8cf5544491b 100644 --- a/gnu/packages/datastructures.scm +++ b/gnu/packages/datastructures.scm @@ -45,7 +45,7 @@ (define-public coucal (revision "1")) (package (name "coucal") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -74,7 +74,8 @@ (define-public coucal (replace 'install ;no install target (lambda _ (let ((doc (string-append #$output - "/share/doc/" #$name "-" #$version))) + "/share/doc/" #$name "-" + #$(package-version this-package)))) (install-file "README.md" doc)) (for-each (lambda (f) (install-file f #$output)) (find-files "." "(coucal|murmurhash)")))) diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm index c54473f6f1c..2b66148c243 100644 --- a/gnu/packages/debian.scm +++ b/gnu/packages/debian.scm @@ -593,7 +593,7 @@ (define-public apt-mirror (revision "1")) (package (name "apt-mirror") - (version (git-version "0.5.4" revision commit)) + (version (make-git-version "0.5.4" revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index f1bda7a1ea7..e05003bd46d 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -134,7 +134,7 @@ (define-public c-reduce (revision "0")) (package (name "c-reduce") - (version (git-version "2.10.0" revision commit)) + (version (make-git-version "2.10.0" revision commit)) (source (origin (method git-fetch) @@ -606,7 +606,7 @@ (define-public stress-make (revision "2")) ;No official source distribution (package (name "stress-make") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -838,7 +838,7 @@ (define-public libbacktrace (commit "cdb64b688dda93bbbacbc2b1ccf50ce9329d4748")) (package (name "libbacktrace") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -951,7 +951,7 @@ (define-public mspdebug (revision "0")) (package (name "mspdebug") - (version (git-version "0.25" revision commit)) + (version (make-git-version "0.25" revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm index f51ed24111c..cfeadf45d8c 100644 --- a/gnu/packages/dictionaries.scm +++ b/gnu/packages/dictionaries.scm @@ -441,7 +441,7 @@ (define-public skk-jisyo (revision "0")) (package (name "skk-jisyo") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -529,7 +529,7 @@ (define-public freedict-dictionaries (revision "0")) (package (name "freedict-dictionaries") - (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/disk.scm b/gnu/packages/disk.scm index a4df50bd4b6..cdff1707693 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -134,7 +134,7 @@ (define-public bcache-tools (revision "0")) (package (name "bcache-tools") - (version (git-version "1.1" revision commit)) + (version (make-git-version "1.1" revision commit)) (source (origin (method git-fetch) @@ -419,7 +419,7 @@ (define-public gpart (revision "0")) (package (name "gpart") - (version (git-version "0.3" revision commit)) + (version (make-git-version "0.3" revision commit)) (source (origin (method git-fetch) @@ -433,7 +433,7 @@ (define-public gpart (arguments `(#:configure-flags (list (string-append "--docdir=" (assoc-ref %outputs "out") "/share/doc/" - ,name "-" ,version)) + ,name "-" ,(package-version this-package))) #:phases (modify-phases %standard-phases (add-after 'unpack 'skip-premature-configuration @@ -1663,7 +1663,7 @@ (define-public mmc-utils (revision "1")) (package (name "mmc-utils") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index 2ec3cb70e1c..f6c4f263951 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -175,7 +175,7 @@ (define-public abstractdark-sddm-theme (revision "0")) (package (name "abstractdark-sddm-theme") - (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 @@ -200,7 +200,7 @@ (define-public dexy-color-sddm-theme (revision "0")) (package (name "dexy-color-sddm-theme") - (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 @@ -551,7 +551,7 @@ (define-public lightdm-mini-greeter (package (name "lightdm-mini-greeter") ;; Version 0.5.1 release in 2021, so we use a recent commit. - (version (git-version "0.5.1" revision commit)) + (version (make-git-version "0.5.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -600,7 +600,7 @@ (define-public lightdm-tiny-greeter (package (name "lightdm-tiny-greeter") ;; Version 1.2 release in 2021, so we use a recent commit. - (version (git-version "1.2" revision commit)) + (version (make-git-version "1.2" revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/djvu.scm b/gnu/packages/djvu.scm index 324febbf10f..b51c1f09196 100644 --- a/gnu/packages/djvu.scm +++ b/gnu/packages/djvu.scm @@ -296,7 +296,7 @@ (define-public didjvu (commit "43e2735d0b3575ca04e82a427dca88bc68fa4931")) (package (name "didjvu") - (version (git-version "0.10.2" revision commit)) + (version (make-git-version "0.10.2" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -357,7 +357,7 @@ (define-public ocrodjvu (commit "0dd3364462fc77d5674b4457fcc8230835323c30")) (package (name "ocrodjvu") - (version (git-version "0.12" revision commit)) + (version (make-git-version "0.12" revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/dlang.scm b/gnu/packages/dlang.scm index 1fd1c8d58cb..18d1a1c7a67 100644 --- a/gnu/packages/dlang.scm +++ b/gnu/packages/dlang.scm @@ -111,7 +111,7 @@ (define-public gdmd (revision "1")) (package (name "gdmd") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 7cb86ad1448..7e754f13b25 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -100,7 +100,7 @@ (define-public cloudflare-cli (revision "1")) (package (name "cloudflare-cli") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -1156,7 +1156,7 @@ (define-public public-suffix-list (let ((commit "d2d3e2e36a8f2b68c4f09e8c87f4f1d685cbf5e7")) (package (name "public-suffix-list") - (version (git-version "0" "2" commit)) + (version (make-git-version "0" "2" commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1175,7 +1175,8 @@ (define-public public-suffix-list ;; so that if multiple versions are ever installed in the same ;; profile, they will not conflict. #~'(("public_suffix_list.dat" - #$(string-append "/share/public-suffix-list-" version "/"))))) + #$(string-append "/share/public-suffix-list-" + (package-version this-package) "/"))))) (home-page "https://publicsuffix.org/") (synopsis "Database of current and historical DNS suffixes") (description "This is the Public Suffix List maintained by Mozilla. A diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index 49bea0daa13..49f85ec9f8f 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -352,7 +352,7 @@ (define-public docbook-xsl (base-version "1.79.2")) (package (name "docbook-xsl") - (version (git-version base-version revision commit)) + (version (make-git-version base-version revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -381,7 +381,8 @@ (define-public docbook-xsl (sxml simple)) #:phases #~(let ((dest-path (format #f "~a/xml/xsl/~a-~a" - #$output #$name #$version))) + #$output #$name + #$(package-version this-package)))) (modify-phases %standard-phases (replace 'configure (lambda _ diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index a0c90ac5aa0..39577c7aaf4 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -288,7 +288,7 @@ (define docker-libnetwork (revision "3")) (package (name "docker-libnetwork") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index dc01277976d..1acceae766b 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -512,7 +512,7 @@ (define-public stddoc (revision "1")) (package (name "stddoc") - (version (git-version "1.0.2" revision commit)) + (version (make-git-version "1.0.2" revision commit)) (home-page "https://github.com/r-lyeh/stddoc.c") (source (origin diff --git a/gnu/packages/dotnet.scm b/gnu/packages/dotnet.scm index b22721075a7..14326801078 100644 --- a/gnu/packages/dotnet.scm +++ b/gnu/packages/dotnet.scm @@ -71,7 +71,7 @@ (define-public pnet-git (revision "0")) (package (name "pnet-git") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -188,7 +188,7 @@ (define-public pnetlib-git (revision "0")) (package (name "pnetlib-git") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1394,7 +1394,7 @@ (define-public mono-pre-5.8.0 (revision "0")) (package (inherit mono-5.4.0) - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (name "mono") (source (origin (method git-fetch) @@ -1598,7 +1598,7 @@ (define-public mono-pre-5.10.0 (revision "0")) (package (inherit mono-5.8.0) - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (name "mono") (source (origin (method git-fetch) From patchwork Sat Jul 26 02:39:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43269 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 E34C427BC4B; Sat, 26 Jul 2025 03:41:16 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1689827BC49 for ; Sat, 26 Jul 2025 03:41:14 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufUqT-0008P8-A3; Fri, 25 Jul 2025 22:41:09 -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 1ufUqR-0008OI-7Y for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:07 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ufUqQ-0005OL-Rj for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=D8jm7wNynGt4AZq/mnR7UERLiqMrQLmEHfU/BYEFBu0=; b=m5Mpr5Aigh/Yio5N1wrm5cmTkcHwLDFyyJRB35CIaEmfiQ2qsEBLry8BvCPzkqWi9mrQ+2f/qv6vPkTHbpXw5gqyyI7ssHzjSSpk+3mSG7Z9xovrXYK8kCJAU+BGTrUaIGYbquABTkSeG4SXzd2EFqU3PLrkM1zT0DnvAUemW43xg1E1fmPqpLP8EDFGnTGPrJsFkBrZZV/jjKpNGnITofSz/JCtUUL/rI3d2J8FUu/PSSHLkBI6MrgxsFop49j6Kug8281+HgobtFwHmAi0IF9Bbx7uTn0DtY5aPriIY6UOFcYXt5/aHXHFZDqPKNugNT6Z2de+CPe9/2r94bBB9g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ufUqQ-0007rU-Gi for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79099] [PATCH 14/34] gnu/packages/e*.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:06 +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.175349763229849 (code B ref 79099); Sat, 26 Jul 2025 02:41:06 +0000 Received: (at 79099) by debbugs.gnu.org; 26 Jul 2025 02:40:32 +0000 Received: from localhost ([127.0.0.1]:38102 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ufUpr-0007lD-RH for submit@debbugs.gnu.org; Fri, 25 Jul 2025 22:40:31 -0400 Received: from 2.mo563.mail-out.ovh.net ([46.105.33.33]:40843) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ufUpY-0007fP-LP for 79099@debbugs.gnu.org; Fri, 25 Jul 2025 22:40:14 -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 4bppqv1R8qz5yZr; Sat, 26 Jul 2025 02:40:11 +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:11 +0000 (UTC) Received: from mta2.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.164.115]) by director3.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bppqt70mkz5xQQ; Sat, 26 Jul 2025 02:40:10 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.11]) by mta2.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 9EBE63E3062; Sat, 26 Jul 2025 02:40:10 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-109S003de0ca215-a796-4276-8d0c-cfb9c6f81f42, 7BFD41D65738CBEA4850BE66907D66307393418F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sat, 26 Jul 2025 04:39:20 +0200 Message-ID: <20250726023951.11862-14-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: 4614500771792151266 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdekhedvfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvheelieffheetvdelhfffffejfefgudfhteekveehieetudeiudfgkeeutdehjeenucffohhmrghinhepghhithhhuhgsrdgtohhmnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledtleelseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehieefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=D8jm7wNynGt4AZq/mnR7UERLiqMrQLmEHfU/BYEFBu0=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1753497611; v=1; b=44nlKrNZT/dKnqAYV63CcR0cTNUshJwvWW6CTUCBeq9lhv/5d53ErrnfnfoCOExBnqLXYfaz 6GzUFqrF9SzqPoF/Badr2X8P/g0iILxSwR5uFMWrTf4rFf8Dz7Z0ZzzX1aJpZEpRI9CgLEGxzh4 CfNASBU6g+xznHkFP8TcSvkiOM8iEWbEfBzRNQQL90Z6zbghQtbhiKemW9Lk7h0kHUj8KP8IOR9 Hgn7Y0Z+wuk1UVpmyR2VbOvIzdHCefLukOKTkY61bDFTppMe3qUEPwC+uq58mcs9Lguxz3uZh7r VlmI2n7q1INctv53MI3eTXrW2ozZjE4chBjVfUN2LjJjg== 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 "e*.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/education.scm | 4 +- gnu/packages/efi.scm | 2 +- gnu/packages/electronics.scm | 12 +- gnu/packages/elm.scm | 2 +- gnu/packages/emacs-build.scm | 6 +- gnu/packages/emacs-xyz.scm | 1013 +++++++++++++++++----------------- gnu/packages/emacs.scm | 4 +- gnu/packages/embedded.scm | 14 +- gnu/packages/emulators.scm | 35 +- gnu/packages/engineering.scm | 46 +- gnu/packages/erlang.scm | 2 +- gnu/packages/esolangs.scm | 2 +- 12 files changed, 573 insertions(+), 569 deletions(-) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index c27ca88c73a..61df93fee85 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -282,7 +282,7 @@ (define-public gotypist (commit "03f8618f8e23acdaa94cda3bcf197da520db8dd4")) (package (name "gotypist") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -753,7 +753,7 @@ (define-public kanatest (revision "0")) (package (name "kanatest") - (version (git-version "0.4.10" revision commit)) + (version (make-git-version "0.4.10" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/efi.scm b/gnu/packages/efi.scm index 99b41e91693..92edcb388b2 100644 --- a/gnu/packages/efi.scm +++ b/gnu/packages/efi.scm @@ -68,7 +68,7 @@ (define-public efi-analyzer (revision "0")) (package (name "efi-analyzer") - (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/electronics.scm b/gnu/packages/electronics.scm index b1a02f8f9e2..5978ad626b9 100644 --- a/gnu/packages/electronics.scm +++ b/gnu/packages/electronics.scm @@ -123,7 +123,7 @@ (define-public libsigrok (revision "2")) (package (name "libsigrok") - (version (git-version "0.5.2" revision commit)) + (version (make-git-version "0.5.2" revision commit)) (source (origin (method git-fetch) @@ -196,7 +196,7 @@ (define-public libsigrokdecode (revision "1")) (package (name "libsigrokdecode") - (version (git-version "0.5.3" revision commit)) + (version (make-git-version "0.5.3" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -430,7 +430,7 @@ (define-public prjtrellis (revision "0")) (package (name "prjtrellis") - (version (git-version "1.4" revision commit)) + (version (make-git-version "1.4" revision commit)) (source (origin (method git-fetch) @@ -488,7 +488,7 @@ (define-public opensta (package (name "opensta") ;; The version string is taken from the CMakeLists.txt. - (version (git-version "2.6.2" revision commit)) + (version (make-git-version "2.6.2" revision commit)) (source (origin (method git-fetch) @@ -603,7 +603,7 @@ (define-public python-cocotb-bus (revision "0")) (package (name "python-cocotb-bus") - (version (git-version "0.2.1" revision commit)) + (version (make-git-version "0.2.1" revision commit)) (source (origin (method git-fetch) @@ -824,7 +824,7 @@ (define-public sigrok-firmware-fx2lafw (revision "1")) (package (name "sigrok-firmware-fx2lafw") - (version (git-version "0.1.7" revision commit)) + (version (make-git-version "0.1.7" revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/elm.scm b/gnu/packages/elm.scm index a74d294ae54..5f280659b89 100644 --- a/gnu/packages/elm.scm +++ b/gnu/packages/elm.scm @@ -511,7 +511,7 @@ (define-public elm-todomvc (revision "1")) (package (name "elm-todomvc") - (version (git-version "1" revision commit)) + (version (make-git-version "1" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/emacs-build.scm b/gnu/packages/emacs-build.scm index f92eb05c8e4..1af3d75aa18 100644 --- a/gnu/packages/emacs-build.scm +++ b/gnu/packages/emacs-build.scm @@ -37,7 +37,7 @@ (define-public emacs-ansi (revision "2")) (package (name "emacs-ansi") - (version (git-version "0.4.1" revision commit)) + (version (make-git-version "0.4.1" revision commit)) (source (origin (method git-fetch) @@ -269,7 +269,7 @@ (define-public emacs-el-mock (revision "1")) (package (name "emacs-el-mock") - (version (git-version "1.25.1" revision commit)) + (version (make-git-version "1.25.1" revision commit)) (source (origin (method git-fetch) @@ -528,7 +528,7 @@ (define-public makel (revision "0")) (package (name "makel") - (version (git-version "0.8.0" revision commit)) + (version (make-git-version "0.8.0" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 187666abc6c..a823cf92d51 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -323,7 +323,7 @@ (define-public emacs-0x0 (revision "0")) (package (name "emacs-0x0") - (version (git-version "1.0.1" revision commit)) + (version (make-git-version "1.0.1" revision commit)) (source (origin (method git-fetch) @@ -348,7 +348,7 @@ (define-public emacs-ac-ispell (revision "1")) (package (name "emacs-ac-ispell") - (version (git-version "0.07" revision commit)) + (version (make-git-version "0.07" revision commit)) (source (origin (method git-fetch) @@ -371,7 +371,7 @@ (define-public emacs-elisp-autofmt (revision "0")) (package (name "emacs-elisp-autofmt") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -441,7 +441,7 @@ (define-public emacs-ace-jump-helm-line (revision "0")) (package (name "emacs-ace-jump-helm-line") - (version (git-version "0.5.0" revision commit)) + (version (make-git-version "0.5.0" revision commit)) (source (origin (method git-fetch) @@ -686,7 +686,7 @@ (define-public emacs-gptel-quick (revision "1")) (package (name "emacs-gptel-quick") - (version (git-version "0.0.5" revision commit)) + (version (make-git-version "0.0.5" revision commit)) (source (origin (uri (git-reference @@ -792,7 +792,7 @@ (define-public emacs-ac-geiser (revision "0")) (package (name "emacs-ac-geiser") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (uri (git-reference @@ -818,7 +818,7 @@ (define-public emacs-geiser-gauche (revision "0")) (package (name "emacs-geiser-gauche") - (version (git-version "0.14" revision commit)) + (version (make-git-version "0.14" revision commit)) (source (origin (method git-fetch) @@ -1016,7 +1016,7 @@ (define-public emacs-inspector (revision "1")) (package (name "emacs-inspector") - (version (git-version "0.38" revision commit)) + (version (make-git-version "0.38" revision commit)) (source (origin (uri (git-reference @@ -1046,7 +1046,7 @@ (define-public emacs-inspirehep (revision "0")) (package (name "emacs-inspirehep") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -1212,7 +1212,7 @@ (define-public emacs-hgignore-mode (package (name "emacs-hgignore-mode") ;; `Version:' header says 0.1.20150329 - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1348,7 +1348,7 @@ (define-public emacs-vline (revision "0")) (package (name "emacs-vline") - (version (git-version "1.11" revision commit)) + (version (make-git-version "1.11" revision commit)) (source (origin (method git-fetch) @@ -1376,7 +1376,7 @@ (define-public emacs-xhair (package (name "emacs-xhair") ;; No tag, version comes from source code - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -1426,7 +1426,7 @@ (define-public emacs-hg-histedit (revision "0")) (package (name "emacs-hg-histedit") - (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 @@ -1500,7 +1500,7 @@ (define-public emacs-puni (revision "3")) (package (name "emacs-puni") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1630,7 +1630,7 @@ (define-public emacs-snow (revision "1")) (package (name "emacs-snow") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -1653,7 +1653,7 @@ (define-public emacs-spongebob (revision "0")) (package (name "emacs-spongebob") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -1741,7 +1741,7 @@ (define-public emacs-project-mode-line-tag (revision "0")) (package (name "emacs-project-mode-line-tag") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1765,7 +1765,7 @@ (define-public emacs-project-tab-groups (revision "1")) (package (name "emacs-project-tab-groups") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -1877,7 +1877,7 @@ (define-public emacs-golden-ratio (revision "0")) (package (name "emacs-golden-ratio") - (version (git-version "1.0.1" revision commit)) + (version (make-git-version "1.0.1" revision commit)) (source (origin (method git-fetch) @@ -1968,7 +1968,7 @@ (define-public emacs-libgit (revision "1")) (package (name "emacs-libgit") - (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 @@ -2415,7 +2415,7 @@ (define-public emacs-fzf (revision "1")) (package (name "emacs-fzf") - (version (git-version "0.2" revision commit)) + (version (make-git-version "0.2" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -2447,7 +2447,7 @@ (define-public emacs-ezf (revision "0")) (package (name "emacs-ezf") - (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 @@ -2610,7 +2610,7 @@ (define-public emacs-acme-theme (revision "0")) (package (name "emacs-acme-theme") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -2633,7 +2633,7 @@ (define-public emacs-catppuccin-theme (revision "2")) (package (name "emacs-catppuccin-theme") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -2811,7 +2811,7 @@ (define-public emacs-typing (revision "0")) (package (name "emacs-typing") - (version (git-version "1.1.4" revision commit)) + (version (make-git-version "1.1.4" revision commit)) (source (origin (method git-fetch) @@ -2910,7 +2910,7 @@ (define-public emacs-graphql-mode (revision "1")) (package (name "emacs-graphql-mode") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -3039,7 +3039,7 @@ (define-public emacs-scribble-mode (revision "2")) (package (name "emacs-scribble-mode") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -3108,7 +3108,7 @@ (define-public emacs-solidity (revision "0")) (package (name "emacs-solidity") - (version (git-version "0.1.10" revision commit)) + (version (make-git-version "0.1.10" revision commit)) (source (origin (method git-fetch) @@ -3133,7 +3133,7 @@ (define-public emacs-unpackaged (revision "4")) (package (name "emacs-unpackaged") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -3167,7 +3167,7 @@ (define-public emacs-haskell-mode (revision "0")) (package (name "emacs-haskell-mode") - (version (git-version "17.5" revision commit)) + (version (make-git-version "17.5" revision commit)) (source (origin (method git-fetch) @@ -3238,7 +3238,8 @@ (define emacs-prefix? (cut string-prefix? "emacs-" <>)) (let* ((out (assoc-ref outputs "out")) (el-dir (emacs:elpa-directory out)) (doc (string-append - out "/share/doc/haskell-mode-" #$version)) + out "/share/doc/haskell-mode-" + #$(package-version this-package))) (info (string-append out "/share/info"))) (define (copy-to-dir dir files) (for-each (lambda (f) @@ -3421,7 +3422,7 @@ (define-public emacs-flycheck-clj-kondo (revision "1")) (package (name "emacs-flycheck-clj-kondo") - (version (git-version "0.0.4" revision commit)) + (version (make-git-version "0.0.4" revision commit)) (source (origin (method git-fetch) @@ -3492,7 +3493,7 @@ (define-public emacs-flymake-clippy (revision "0")) (package (name "emacs-flymake-clippy") - (version (git-version "1.1.0" revision commit)) + (version (make-git-version "1.1.0" revision commit)) (source (origin (uri (git-reference @@ -3582,7 +3583,7 @@ (define-public emacs-flymake-perlcritic (revision "1")) (package (name "emacs-flymake-perlcritic") - (version (git-version "1.0.3" revision commit)) + (version (make-git-version "1.0.3" revision commit)) (source (origin (method git-fetch) @@ -3666,7 +3667,7 @@ (define-public emacs-flymake-quickdef (commit "150c5839768a3d32f988f9dc08052978a68f2ad7")) (package (name "emacs-flymake-quickdef") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -3709,7 +3710,7 @@ (define-public emacs-flymake-shellcheck (revision "1")) (package (name "emacs-flymake-shellcheck") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -3815,7 +3816,7 @@ (define-public emacs-ahg (revision "0")) (package (name "emacs-ahg") - (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 @@ -3873,7 +3874,7 @@ (define-public emacs-world-time-mode (revision "0")) (package (name "emacs-world-time-mode") - (version (git-version "0.0.6" revision commit)) + (version (make-git-version "0.0.6" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -3975,7 +3976,7 @@ (define-public emacs-ample-regexps (revision "2")) (package (name "emacs-ample-regexps") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -4025,7 +4026,7 @@ (define-public emacs-ample-theme (revision "1")) (package (name "emacs-ample-theme") - (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 @@ -4094,7 +4095,7 @@ (define-public emacs-rescript-mode (revision "0")) (package (name "emacs-rescript-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 @@ -4166,7 +4167,7 @@ (define-public emacs-relative-buffers (commit "9762fe268e9ff150dcec2e2e45d862d82d5c4008")) (package (name "emacs-relative-buffers") - (version (git-version release revision commit)) + (version (make-git-version release revision commit)) (source (origin (method git-fetch) @@ -4221,7 +4222,7 @@ (define-public emacs-bug-hunter (revision "1")) (package (name "emacs-bug-hunter") - (version (git-version "1.3.1" revision commit)) + (version (make-git-version "1.3.1" revision commit)) (source (origin (method git-fetch) @@ -4372,7 +4373,7 @@ (define-public emacs-dnt (revision "1")) (package (name "emacs-dnt") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -4640,7 +4641,7 @@ (define-public emacs-eradio (revision "0")) (package (name "emacs-eradio") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -4695,7 +4696,7 @@ (define-public emacs-app-launcher (revision "0")) (package (name "emacs-app-launcher") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -4801,7 +4802,7 @@ (define-public emacs-read-only-cfg (revision "0")) (package (name "emacs-read-only-cfg") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -4826,7 +4827,7 @@ (define-public emacs-rebecca-theme (revision "0")) (package (name "emacs-rebecca-theme") - (version (git-version "1.3.2" revision commit)) + (version (make-git-version "1.3.2" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -4849,7 +4850,7 @@ (define-public emacs-reverso (revision "0")) (package (name "emacs-reverso") - (version (git-version "0.1.2" revision commit)) + (version (make-git-version "0.1.2" revision commit)) (source (origin (method git-fetch) @@ -4900,7 +4901,7 @@ (define-public emacs-bbdb-vcard (commit "113c66115ce68316e209f51ebce56de8dded3606")) (package (name "emacs-bbdb-vcard") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -5026,7 +5027,7 @@ (define-public emacs-bar-cursor (commit "78f195b6db63459033c4f1c7e7add5d82f3ce424")) (package (name "emacs-bar-cursor") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -5075,7 +5076,7 @@ (define-public emacs-carp (revision "0")) (package (name "emacs-carp") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (uri (git-reference @@ -5304,7 +5305,7 @@ (define-public emacs-dhall-mode (commit "484bcf8f78f1183ef45c3b04a362bb73690c6b9b")) (package (name "emacs-dhall-mode") - (version (git-version "0.1.3" revision commit)) + (version (make-git-version "0.1.3" revision commit)) (source (origin (method git-fetch) @@ -5339,7 +5340,7 @@ (define-public emacs-link-hint (revision "4")) (package (name "emacs-link-hint") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -5409,7 +5410,7 @@ (define-public emacs-aio (commit "289c1e9530b59b4e2fd88f87f303547b23f2a3e3")) (package (name "emacs-aio") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -5522,7 +5523,7 @@ (define-public emacs-latex-extra (revision "0")) (package (name "emacs-latex-extra") - (version (git-version "1.14" revision commit)) + (version (make-git-version "1.14" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -5782,7 +5783,7 @@ (define-public emacs-campus (revision "0")) (package (name "emacs-campus") - (version (git-version "0.0" revision commit)) + (version (make-git-version "0.0" revision commit)) (source (origin (method git-fetch) @@ -5827,7 +5828,7 @@ (define-public emacs-chocolate-theme (revision "0")) (package (name "emacs-chocolate-theme") - (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 @@ -6244,7 +6245,7 @@ (define-public emacs-font-lock+ (revision "0")) (package (name "emacs-font-lock+") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -6294,7 +6295,7 @@ (define-public emacs-font-utils (revision "0")) (package (name "emacs-font-utils") - (version (git-version "0.7.8" revision commit)) + (version (make-git-version "0.7.8" revision commit)) (source (origin (method git-fetch) @@ -6367,7 +6368,7 @@ (define-public emacs-xcscope (revision "0")) (package (name "emacs-xcscope") - (version (git-version "1.5" revision commit)) + (version (make-git-version "1.5" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -6400,7 +6401,7 @@ (define-public emacs-ggtags (revision "0")) (package (name "emacs-ggtags") - (version (git-version "0.9.0" revision commit)) + (version (make-git-version "0.9.0" revision commit)) (source (origin (method git-fetch) @@ -6504,7 +6505,7 @@ (define-public emacs-google-maps (revision "1")) (package (name "emacs-google-maps") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -6526,7 +6527,7 @@ (define-public emacs-geoclue (revision "1")) (package (name "emacs-geoclue") - (version (git-version "0.8.1" revision commit)) + (version (make-git-version "0.8.1" revision commit)) (source (origin (method git-fetch) @@ -6548,7 +6549,7 @@ (define-public emacs-nominatim (commit "f814e16f8f4e2cfd633f52b29699a009ab704fbf")) (package (name "emacs-nominatim") - (version (git-version "0.9.3" revision commit)) + (version (make-git-version "0.9.3" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -6570,7 +6571,7 @@ (define-public emacs-org-street (commit "17913afe01504ee0cbcf83abaca18c5c618f9b33")) (package (name "emacs-org-street") - (version (git-version "0.7.1" revision commit)) + (version (make-git-version "0.7.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -6648,7 +6649,7 @@ (define-public emacs-imenu-list (version "0.9")) (package (name "emacs-imenu-list") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -6845,7 +6846,7 @@ (define-public emacs-djvu3 (package (name "emacs-djvu3") ;; `Version:' header says 1.0 - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -7002,7 +7003,7 @@ (define-public emacs-org-pdftools (commit "5613b7ae561e0af199f25aacc0a9c34c16638408")) (package (name "emacs-org-pdftools") - (version (git-version "1.1" revision commit)) + (version (make-git-version "1.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -7036,7 +7037,7 @@ (define-public emacs-sage-shell-mode (revision "1")) (package (name "emacs-sage-shell-mode") - (version (git-version "0.3" revision commit)) + (version (make-git-version "0.3" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -7108,7 +7109,7 @@ (define-public emacs-pdfgrep (revision "1")) (package (name "emacs-pdfgrep") - (version (git-version "1.4" revision commit)) + (version (make-git-version "1.4" revision commit)) (source (origin (method git-fetch) @@ -7168,7 +7169,7 @@ (define-public emacs-guix (revision "8")) (package (name "emacs-guix") - (version (git-version "0.5.2" revision commit)) + (version (make-git-version "0.5.2" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -7277,7 +7278,7 @@ (define-public emacs-extempore-mode (revision "2")) (package (name "emacs-extempore-mode") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -7330,7 +7331,7 @@ (define-public emacs-kakoune (revision "0")) (package (name "emacs-kakoune") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -7359,7 +7360,7 @@ (define-public emacs-kana (revision "0")) (package (name "emacs-kana") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -7384,7 +7385,7 @@ (define-public emacs-kanji (revision "0")) (package (name "emacs-kanji") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -7409,7 +7410,7 @@ (define-public emacs-migemo (revision "0")) (package (name "emacs-migemo") - (version (git-version "1.9.2" revision commit)) + (version (make-git-version "1.9.2" revision commit)) (source (origin (method git-fetch) @@ -7439,7 +7440,7 @@ (define-public emacs-kbd (revision "1")) (package (name "emacs-kbd") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -7541,7 +7542,7 @@ (define-public emacs-ligature (revision "1")) (package (name "emacs-ligature") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -7615,7 +7616,7 @@ (define-public emacs-undo-fu (revision "0")) (package (name "emacs-undo-fu") - (version (git-version "0.5" revision commit)) + (version (make-git-version "0.5" revision commit)) (source (origin (method git-fetch) @@ -7641,7 +7642,7 @@ (define-public emacs-undo-fu-session (revision "0")) (package (name "emacs-undo-fu-session") - (version (git-version "0.6" revision commit)) + (version (make-git-version "0.6" revision commit)) (source (origin (method git-fetch) @@ -7791,7 +7792,7 @@ (define-public emacs-sx (commit "8c1c28f33d714fc8869e49f5642e1a585c8c85af")) (package (name "emacs-sx") - (version (git-version "0.3" revision commit)) + (version (make-git-version "0.3" revision commit)) (source (origin (method git-fetch) @@ -7873,7 +7874,7 @@ (define-public emacs-toml-mode (commit "f6c61817b00f9c4a3cab1bae9c309e0fc45cdd06")) (package (name "emacs-toml-mode") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -7947,7 +7948,7 @@ (define-public emacs-fringe-helper (revision "1")) (package (name "emacs-fringe-helper") - (version (git-version "1.0.1" revision commit)) + (version (make-git-version "1.0.1" revision commit)) (source (origin (method git-fetch) @@ -8001,7 +8002,7 @@ (define-public emacs-git-gutter-fringe (revision "2")) (package (name "emacs-git-gutter-fringe") - (version (git-version "0.23" revision commit)) + (version (make-git-version "0.23" revision commit)) (source (origin (method git-fetch) @@ -8239,7 +8240,7 @@ (define-public emacs-spark (revision "1")) (package (name "emacs-spark") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -8263,7 +8264,7 @@ (define-public emacs-spray (commit "74d9dcfa2e8b38f96a43de9ab0eb13364300cb46")) (package (name "emacs-spray") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -8336,7 +8337,7 @@ (define-public emacs-explain-pause-mode (revision "0")) (package (name "emacs-explain-pause-mode") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -8608,7 +8609,7 @@ (define-public emacs-chruby (revision "0")) (package (name "emacs-chruby") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -8632,7 +8633,7 @@ (define-public emacs-zeno-theme (revision "0")) (package (name "emacs-zeno-theme") - (version (git-version "1.0.2" revision commit)) + (version (make-git-version "1.0.2" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -8655,7 +8656,7 @@ (define-public emacs-zig-mode (revision "2")) (package (name "emacs-zig-mode") - (version (git-version "0.0.8" revision commit)) + (version (make-git-version "0.0.8" revision commit)) (source (origin (method git-fetch) @@ -8764,7 +8765,7 @@ (define-public emacs-erc-status-sidebar (revision "1")) (package (name "emacs-erc-status-sidebar") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -8887,7 +8888,7 @@ (define-public emacs-litable (let ((commit "b0278f3f8dcff424bfbdfdefb545b1fbff33206f")) (package (name "emacs-litable") - (version (git-version "0.1" "0" commit)) + (version (make-git-version "0.1" "0" commit)) (source (origin (method git-fetch) (uri (git-reference @@ -8931,7 +8932,7 @@ (define-public emacs-calc-currency (revision "0")) (package (name "emacs-calc-currency") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -8963,7 +8964,7 @@ (define-public emacs-literate-calc-mode (revision "2")) (package (name "emacs-literate-calc-mode") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -9142,7 +9143,7 @@ (define-public emacs-org-chef (revision "0")) (package (name "emacs-org-chef") - (version (git-version "0.1.3" revision commit)) + (version (make-git-version "0.1.3" revision commit)) (source (origin (method git-fetch) @@ -9223,7 +9224,7 @@ (define-public emacs-comment-tags (revision "1")) (package (name "emacs-comment-tags") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -9268,7 +9269,7 @@ (define-public emacs-org-fancy-priorities (revision "1")) (package (name "emacs-org-fancy-priorities") - (version (git-version "1.1" revision commit)) + (version (make-git-version "1.1" revision commit)) (source (origin (method git-fetch) @@ -9317,7 +9318,7 @@ (define-public emacs-ob-erlang (commit "a029c23902b4ad73b84f262a7fc5b98d87b63dfd")) (package (name "emacs-ob-erlang") - (version (git-version "20210321" revision commit)) + (version (make-git-version "20210321" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -9339,7 +9340,7 @@ (define-public emacs-ob-go (revision "0")) (package (name "emacs-ob-go") - (version (git-version "0.02" revision commit)) + (version (make-git-version "0.02" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -9373,7 +9374,7 @@ (define-public emacs-ob-restclient (let ((commit "1b021ce1c67c97fa1aa4d2c0816edb7add129e48")) (package (name "emacs-ob-restclient") - (version (git-version "0.02" "3" commit)) + (version (make-git-version "0.02" "3" commit)) (source (origin (method git-fetch) @@ -9396,7 +9397,7 @@ (define-public emacs-org-now (let ((commit "8f6b277a73f1c66e58ccb4b7f40d406851befc91")) (package (name "emacs-org-now") - (version (git-version "0.1-pre" "1" commit)) + (version (make-git-version "0.1-pre" "1" commit)) (source (origin (method git-fetch) @@ -9610,7 +9611,7 @@ (define-public emacs-rspec (revision "1")) (package (name "emacs-rspec") - (version (git-version "1.11" revision commit)) + (version (make-git-version "1.11" revision commit)) (source (origin (method git-fetch) @@ -9745,7 +9746,7 @@ (define-public emacs-mode-line-idle (revision "0")) (package (name "emacs-mode-line-idle") - (version (git-version "0.2" revision commit)) + (version (make-git-version "0.2" revision commit)) (source (origin (method git-fetch) @@ -9830,7 +9831,7 @@ (define-public emacs-sqlite (package (name "emacs-sqlite") (build-system emacs-build-system) - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -9909,7 +9910,7 @@ (define-public emacs-pretty-speedbar (revision "0")) (package (name "emacs-pretty-speedbar") - (version (git-version "0.2" revision commit)) + (version (make-git-version "0.2" revision commit)) (source (origin (uri (git-reference (url "https://github.com/kcyarn/pretty-speedbar") @@ -9935,7 +9936,7 @@ (define-public emacs-sr-speedbar (revision "0")) (package (name "emacs-sr-speedbar") - (version (git-version "20161025" revision commit)) + (version (make-git-version "20161025" revision commit)) (source (origin (method git-fetch) @@ -10004,7 +10005,7 @@ (define-public emacs-shx (revision "1")) (package (name "emacs-shx") - (version (git-version "1.5.0" revision commit)) + (version (make-git-version "1.5.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -10042,7 +10043,7 @@ (define-public emacs-names (revision "8")) (package (name "emacs-names") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -10089,7 +10090,7 @@ (define-public emacs-nano-theme (revision "0")) (package (name "emacs-nano-theme") - (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 @@ -10166,7 +10167,7 @@ (define-public emacs-evil-textobj-syntax (revision "1")) (package (name "emacs-evil-textobj-syntax") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -10192,7 +10193,7 @@ (define-public emacs-flycheck-flow (revision "1")) (package (name "emacs-flycheck-flow") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -11046,7 +11047,7 @@ (define-public emacs-combobulate (revision "2")) (package (name "emacs-combobulate") - (version (git-version "0.2" revision commit)) + (version (make-git-version "0.2" revision commit)) (source (origin (method git-fetch) @@ -11083,7 +11084,7 @@ (define-public emacs-companion-mode (package (name "emacs-companion-mode") ;; Version is extracted from the main file. - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -11512,7 +11513,7 @@ (define-public emacs-compdef (revision "2")) (package (name "emacs-compdef") - (version (git-version "0.2" revision commit)) + (version (make-git-version "0.2" revision commit)) (source (origin (method git-fetch) @@ -11556,7 +11557,7 @@ (define-public emacs-handle (revision "2")) (package (name "emacs-handle") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -11603,7 +11604,7 @@ (define-public emacs-phi-search (revision "1")) (package (name "emacs-phi-search") - (version (git-version "20160630" revision commit)) + (version (make-git-version "20160630" revision commit)) (source (origin (method git-fetch) @@ -11625,7 +11626,7 @@ (define-public emacs-phi-search-mc (revision "1")) (package (name "emacs-phi-search-mc") - (version (git-version "2.2.1" revision commit)) + (version (make-git-version "2.2.1" revision commit)) (source (origin (method git-fetch) @@ -11674,7 +11675,7 @@ (define-public emacs-multifiles (revision "1")) (package (name "emacs-multifiles") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -11771,7 +11772,7 @@ (define-public emacs-typo (revision "0")) (package (name "emacs-typo") - (version (git-version "1.1" revision commit)) + (version (make-git-version "1.1" revision commit)) (home-page "https://github.com/jorgenschaefer/typoel") (source (origin (method git-fetch) @@ -11877,7 +11878,7 @@ (define-public emacs-9lc-mode (revision "1")) (package (name "emacs-9lc-mode") - (version (git-version "0.7" revision commit)) + (version (make-git-version "0.7" revision commit)) (source (origin (method git-fetch) @@ -11899,7 +11900,7 @@ (define-public emacs-tl1-mode (revision "1")) (package (name "emacs-tl1-mode") - (version (git-version "1.3" revision commit)) + (version (make-git-version "1.3" revision commit)) (source (origin (method git-fetch) @@ -11951,7 +11952,7 @@ (define-public emacs-scel (commit "aeea3ad4be9306d14c3a734a4ff54fee10ac135b")) (package (name "emacs-scel") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -12004,7 +12005,7 @@ (define-public emacs-soothe-theme (revision "0")) (package (name "emacs-soothe-theme") - (version (git-version "20141027.2233" revision commit)) + (version (make-git-version "20141027.2233" revision commit)) (source (origin (method git-fetch) @@ -12029,7 +12030,7 @@ (define-public emacs-company-auctex (revision "1")) (package (name "emacs-company-auctex") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -12239,7 +12240,7 @@ (define-public emacs-popup-kill-ring (revision "0")) (package (name "emacs-popup-kill-ring") - (version (git-version "0.2.8" revision commit)) + (version (make-git-version "0.2.8" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -12284,7 +12285,7 @@ (define-public emacs-pydoc (revision "0")) (package (name "emacs-pydoc") - (version (git-version "0.2" revision commit)) + (version (make-git-version "0.2" revision commit)) (source (origin (uri (git-reference @@ -12398,7 +12399,7 @@ (define-public emacs-pythonic (revision "1")) (package (name "emacs-pythonic") - (version (git-version "0.2" revision commit)) + (version (make-git-version "0.2" revision commit)) (source (origin (method git-fetch) @@ -12425,7 +12426,7 @@ (define-public emacs-anaconda-mode (revision "0")) (package (name "emacs-anaconda-mode") - (version (git-version "0.1.16" revision commit)) + (version (make-git-version "0.1.16" revision commit)) (source (origin (method git-fetch) @@ -12460,7 +12461,7 @@ (define-public emacs-jack (revision "0")) (package (name "emacs-jack") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -12655,7 +12656,7 @@ (define-public emacs-cov (revision "0")) (package (name "emacs-cov") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -12723,7 +12724,7 @@ (define-public emacs-purescript-mode (commit "0acd1af446424ba855153161fe07a20f67dc0a89")) (package (name "emacs-purescript-mode") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -12757,7 +12758,7 @@ (define-public emacs-new-purescript-mode (revision "0")) (package (name "emacs-new-purescript-mode") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -12910,7 +12911,7 @@ (define-public emacs-company-cabal (revision "1")) (package (name "emacs-company-cabal") - (version (git-version "0.3.0" revision commit)) + (version (make-git-version "0.3.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -13009,7 +13010,7 @@ (define-public emacs-feature-mode (commit "11ae1671629bfedaa553c7b819676d64eb320992")) (package (name "emacs-feature-mode") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -13079,7 +13080,7 @@ (define-public emacs-org-dailies (revision "2")) (package (name "emacs-org-dailies") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -13134,7 +13135,7 @@ (define-public emacs-anki-editor (version "0.3.3")) (package (name "emacs-anki-editor") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -13258,7 +13259,7 @@ (define-public emacs-org-pandoc-import (revision "0")) (package (name "emacs-org-pandoc-import") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -13298,7 +13299,7 @@ (define-public emacs-org-pomodoro (revision "1")) (package (name "emacs-org-pomodoro") - (version (git-version "2.1.0" revision commit)) + (version (make-git-version "2.1.0" revision commit)) (source (origin (method git-fetch) @@ -13418,7 +13419,7 @@ (define-public emacs-org-tanglesync (revision "3")) (package (name "emacs-org-tanglesync") - (version (git-version "1.1" revision commit)) + (version (make-git-version "1.1" revision commit)) (source (origin (method git-fetch) @@ -13444,7 +13445,7 @@ (define-public emacs-company-flow (revision "1")) (package (name "emacs-company-flow") - (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 @@ -13468,7 +13469,7 @@ (define-public emacs-habitica (revision "1")) (package (name "emacs-habitica") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -13491,7 +13492,7 @@ (define-public emacs-atom-one-dark-theme (revision "0")) (package (name "emacs-atom-one-dark-theme") - (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 @@ -13512,7 +13513,7 @@ (define-public emacs-atomic-chrome (revision "1")) (package (name "emacs-atomic-chrome") - (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 @@ -13639,7 +13640,7 @@ (define-public emacs-color-theme-solarized (revision "0")) (package (name "emacs-color-theme-solarized") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -13673,7 +13674,7 @@ (define-public emacs-color-identifiers-mode (revision "0")) (package (name "emacs-color-identifiers-mode") - (version (git-version "1.1" revision commit)) + (version (make-git-version "1.1" revision commit)) (source (origin (method git-fetch) @@ -13697,7 +13698,7 @@ (define-public emacs-poet-theme (revision "1")) (package (name "emacs-poet-theme") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -13745,7 +13746,7 @@ (define-public emacs-color-theme-modern (revision "1")) (package (name "emacs-color-theme-modern") - (version (git-version "0.0.3" revision commit)) + (version (make-git-version "0.0.3" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -13795,7 +13796,7 @@ (define-public emacs-spacegray-theme (revision "0")) (package (name "emacs-spacegray-theme") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -13820,7 +13821,7 @@ (define-public emacs-org-cv (revision "0")) (package (name "emacs-org-cv") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -13919,7 +13920,7 @@ (define-public emacs-4clojure (revision "1")) (package (name "emacs-4clojure") - (version (git-version "0.2.1" revision commit)) + (version (make-git-version "0.2.1" revision commit)) (source (origin (method git-fetch) @@ -14260,7 +14261,7 @@ (define-public emacs-consult-mu (revision "0")) (package (name "emacs-consult-mu") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -14291,7 +14292,7 @@ (define-public emacs-consult-notes (revision "0")) (package (name "emacs-consult-notes") - (version (git-version "0.7" revision commit)) + (version (make-git-version "0.7" revision commit)) (source (origin (method git-fetch) @@ -14343,7 +14344,7 @@ (define-public emacs-consult-org-roam (revision "1")) (package (name "emacs-consult-org-roam") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -14472,7 +14473,7 @@ (define-public emacs-consult-xdg-recent-files (revision "0")) (package (name "emacs-consult-xdg-recent-files") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -14503,7 +14504,7 @@ (define-public emacs-consult-yasnippet (revision "0")) (package (name "emacs-consult-yasnippet") - (version (git-version "0.2" revision commit)) + (version (make-git-version "0.2" revision commit)) (source (origin (method git-fetch) @@ -14567,7 +14568,7 @@ (define-public emacs-smartparens (revision "1")) (package (name "emacs-smartparens") - (version (git-version "1.11.0" revision commit)) + (version (make-git-version "1.11.0" revision commit)) (source (origin (method git-fetch) @@ -14637,7 +14638,7 @@ (define-public emacs-dumbparens (revision "1")) (package (name "emacs-dumbparens") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -14668,7 +14669,7 @@ (define-public emacs-highlight-symbol (revision "1")) (package (name "emacs-highlight-symbol") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -14901,7 +14902,7 @@ (define-public emacs-eyebrowse (revision "0")) (package (name "emacs-eyebrowse") - (version (git-version "0.7.8" revision commit)) + (version (make-git-version "0.7.8" revision commit)) (source (origin (method git-fetch) @@ -14992,7 +14993,7 @@ (define-public emacs-loccur (revision "1")) (package (name "emacs-loccur") - (version (git-version "1.2.5" revision commit)) + (version (make-git-version "1.2.5" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -15081,7 +15082,7 @@ (define-public emacs-rmsbolt (version "0.1.2")) (package (name "emacs-rmsbolt") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -15106,7 +15107,7 @@ (define-public emacs-request (revision "1")) (package (name "emacs-request") - (version (git-version "0.3.2" revision commit)) + (version (make-git-version "0.3.2" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -15133,7 +15134,7 @@ (define-public emacs-ruby-electric (commit "c53376da891713e0c49f01aad2ff64d4fbb0b812")) (package (name "emacs-ruby-electric") - (version (git-version "2.3.3" revision commit)) + (version (make-git-version "2.3.3" revision commit)) (source (origin (method git-fetch) @@ -15359,7 +15360,7 @@ (define-public emacs-sway (revision "0")) (package (name "emacs-sway") - (version (git-version "0.7" revision commit)) + (version (make-git-version "0.7" revision commit)) (source (origin (method git-fetch) @@ -15384,7 +15385,7 @@ (define-public emacs-sweet-theme (revision "0")) (package (name "emacs-sweet-theme") - (version (git-version "4" revision commit)) + (version (make-git-version "4" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -15430,7 +15431,7 @@ (define-public emacs-ivy-xref (revision "1")) (package (name "emacs-ivy-xref") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -15455,7 +15456,7 @@ (define-public emacs-ivy-pass (revision "1")) (package (name "emacs-ivy-pass") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -15481,7 +15482,7 @@ (define-public emacs-ivy-yasnippet (revision "2")) (package (name "emacs-ivy-yasnippet") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -15594,7 +15595,7 @@ (define-public emacs-windsize (commit "62c2846bbe95b0a73e996c75e4a644d05f57aaaa")) (package (name "emacs-windsize") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -15750,7 +15751,7 @@ (define-public emacs-lispy (let ((commit "df1b7e614fb0f73646755343e8892ddda310f427")) (package (name "emacs-lispy") - (version (git-version "0.27.0" "3" commit)) + (version (make-git-version "0.27.0" "3" commit)) (home-page "https://github.com/abo-abo/lispy") (source (origin (method git-fetch) @@ -15817,7 +15818,7 @@ (define-public emacs-lispyville (revision "3")) (package (name "emacs-lispyville") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (home-page "https://github.com/noctuid/lispyville") (source (origin (method git-fetch) @@ -15846,7 +15847,7 @@ (define-public emacs-function-args (revision "0")) (package (name "emacs-function-args") - (version (git-version "0.6.0" revision commit)) + (version (make-git-version "0.6.0" revision commit)) (source (origin (method git-fetch) @@ -15873,7 +15874,7 @@ (define-public emacs-lpy (revision "6")) (package (name "emacs-lpy") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -15927,7 +15928,7 @@ (define-public emacs-clj-deps-new (revision "0")) (package (name "emacs-clj-deps-new") - (version (git-version "1.1" revision commit)) + (version (make-git-version "1.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -15995,7 +15996,7 @@ (define-public emacs-clojure-snippets (commit "6068dca90467a0f4ebc2cd39338a173d6f5ddc04")) (package (name "emacs-clojure-snippets") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -16023,7 +16024,7 @@ (define-public emacs-anakondo (commit "c48518560815c49d8d78fb9069906d17e883385e")) (package (name "emacs-anakondo") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -16094,7 +16095,7 @@ (define-public emacs-counsel-notmuch (revision "0")) (package (name "emacs-counsel-notmuch") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -16319,7 +16320,7 @@ (define-public emacs-sphinx-doc (revision "1")) (package (name "emacs-sphinx-doc") - (version (git-version "0.3.0" revision commit)) + (version (make-git-version "0.3.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -16443,7 +16444,7 @@ (define-public emacs-julia-mode (revision "0")) (package (name "emacs-julia-mode") - (version (git-version "1.0.2" revision commit)) + (version (make-git-version "1.0.2" revision commit)) (source (origin (method git-fetch) @@ -16784,7 +16785,7 @@ (define-public emacs-evil-markdown (revision "2")) (package (name "emacs-evil-markdown") - (version (git-version "0.0.2" revision commit)) + (version (make-git-version "0.0.2" revision commit)) (source (origin (method git-fetch) @@ -16867,7 +16868,7 @@ (define-public emacs-skeletor (revision "1")) (package (name "emacs-skeletor") - (version (git-version "1.6.1" revision commit)) + (version (make-git-version "1.6.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -16981,7 +16982,7 @@ (define-public emacs-elfeed-org (revision "0")) (package (name "emacs-elfeed-org") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -17354,7 +17355,7 @@ (define-public emacs-highlight-indent-guides (commit "c2c9de4d01edfb89609c91d4d7f1d81312015a2c")) (package (name "emacs-highlight-indent-guides") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -17383,7 +17384,7 @@ (define-public emacs-highlight-indentation (revision "1")) (package (name "emacs-highlight-indentation") - (version (git-version "0.7.0" revision commit)) + (version (make-git-version "0.7.0" revision commit)) (source (origin (method git-fetch) @@ -17417,7 +17418,7 @@ (define-public emacs-elpy (revision "2")) (package (name "emacs-elpy") - (version (git-version "1.35.0" revision commit)) + (version (make-git-version "1.35.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -17538,7 +17539,7 @@ (define-public emacs-railscasts-theme (revision "0")) (package (name "emacs-railscasts-theme") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -17661,7 +17662,7 @@ (define-public emacs-ryo-modal (revision "0")) (package (name "emacs-ryo-modal") - (version (git-version "0.45" revision commit)) + (version (make-git-version "0.45" revision commit)) (source (origin (method git-fetch) @@ -17740,7 +17741,7 @@ (define-public emacs-visual-replace (name "emacs-visual-replace") ;; XXX: when updating version, please ensure substitution in install-info ;; phase is still accurate. - (version (git-version "1.2" revision commit)) + (version (make-git-version "1.2" revision commit)) (source (origin (method git-fetch) @@ -17959,7 +17960,7 @@ (define-public emacs-yari (commit "de61285ceb21f56c29f4be12e2e65b2aa2bccf56")) (package (name "emacs-yari") - (version (git-version "0.8" revision commit)) + (version (make-git-version "0.8" revision commit)) (source (origin (method git-fetch) @@ -18153,7 +18154,7 @@ (define-public emacs-helm-org (revision "3")) (package (name "emacs-helm-org") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -18277,7 +18278,7 @@ (define-public emacs-taskrunner (revision "1")) (package (name "emacs-taskrunner") - (version (git-version "0.6" revision commit)) + (version (make-git-version "0.6" revision commit)) (source (origin (method git-fetch) @@ -18325,7 +18326,7 @@ (define-public emacs-ivy-taskrunner (revision "1")) (package (name "emacs-ivy-taskrunner") - (version (git-version "0.9" revision commit)) + (version (make-git-version "0.9" revision commit)) (source (origin (method git-fetch) @@ -18350,7 +18351,7 @@ (define-public emacs-helm-taskrunner (revision "1")) (package (name "emacs-helm-taskrunner") - (version (git-version "0.9" revision commit)) + (version (make-git-version "0.9" revision commit)) (source (origin (method git-fetch) @@ -18375,7 +18376,7 @@ (define-public emacs-helm-make (revision "0")) (package (name "emacs-helm-make") - (version (git-version "0.2.0" revision commit)) + (version (make-git-version "0.2.0" revision commit)) (source (origin (method git-fetch) @@ -18533,7 +18534,7 @@ (define-public emacs-sly ;; important fixes. (package (name "emacs-sly") - (version (git-version "1.0.43" revision commit)) + (version (make-git-version "1.0.43" revision commit)) (source (origin (method git-fetch) @@ -18557,7 +18558,9 @@ (define-public emacs-sly (lambda _ (let* ((info-dir (string-append #$output "/share/info")) (doc-dir (string-append #$output "/share/doc/" - #$name "-" #$version)) + #$name "-" + #$(package-version + this-package))) (doc-files '( ;; "doc/sly-refcard.pdf" ; See sly-refcard.pdf below. "README.md" "NEWS.md" "PROBLEMS.md" "CONTRIBUTING.md"))) @@ -18616,7 +18619,7 @@ (define-public emacs-sly-quicklisp (revision "1")) (package (name "emacs-sly-quicklisp") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (home-page "https://github.com/joaotavora/sly-quicklisp") (source (origin @@ -18675,7 +18678,7 @@ (define-public emacs-sly-named-readtables (revision "1")) (package (name "emacs-sly-named-readtables") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (home-page "https://github.com/joaotavora/sly-named-readtables") (source (origin @@ -18709,7 +18712,7 @@ (define-public emacs-sly-macrostep (revision "2")) (package (name "emacs-sly-macrostep") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (home-page "https://github.com/joaotavora/sly-macrostep") (source (origin @@ -18741,7 +18744,7 @@ (define-public emacs-sly-stepper (let ((commit "da84e3bba8466c2290c2dc7c27d7f4c48c27b39e")) (package (name "emacs-sly-stepper") - (version (git-version "0.0.0" "2" commit)) + (version (make-git-version "0.0.0" "2" commit)) (source (origin (method git-fetch) @@ -18791,7 +18794,7 @@ (define-public emacs-sly-package-inferred (revision "1")) (package (name "emacs-sly-package-inferred") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (home-page "https://github.com/40ants/sly-package-inferred") (source (origin @@ -18824,7 +18827,7 @@ (define-public emacs-lua-mode (revision "1")) (package (name "emacs-lua-mode") - (version (git-version "20221027" revision commit)) + (version (make-git-version "20221027" revision commit)) (source (origin (method git-fetch) @@ -18893,7 +18896,7 @@ (define-public emacs-ebuku (commit "0c6cf404a49bd68800221446df186fffa0139325")) (package (name "emacs-ebuku") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -18918,7 +18921,7 @@ (define-public emacs-evil (revision "0")) (package (name "emacs-evil") - (version (git-version "1.15.0" revision commit)) + (version (make-git-version "1.15.0" revision commit)) (source (origin (method git-fetch) @@ -18993,7 +18996,7 @@ (define-public emacs-evil-goggles (revision "0")) (package (name "emacs-evil-goggles") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -19073,7 +19076,7 @@ (define-public emacs-evil-owl (revision "3")) (package (name "emacs-evil-owl") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -19135,7 +19138,7 @@ (define-public emacs-evil-args (revision "1")) (package (name "emacs-evil-args") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -19185,7 +19188,7 @@ (define-public emacs-evil-exchange (revision "1")) (package (name "emacs-evil-exchange") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -19221,7 +19224,7 @@ (define-public emacs-evil-replace-with-register (revision "1")) (package (name "emacs-evil-replace-with-register") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -19247,7 +19250,7 @@ (define-public emacs-evil-indent-plus (revision "1")) (package (name "emacs-evil-indent-plus") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -19274,7 +19277,7 @@ (define-public emacs-evil-text-object-python (revision "1")) (package (name "emacs-evil-text-object-python") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -19298,7 +19301,7 @@ (define-public emacs-evil-lion (revision "1")) (package (name "emacs-evil-lion") - (version (git-version "0.0.2" revision commit)) + (version (make-git-version "0.0.2" revision commit)) (source (origin (method git-fetch) @@ -19325,7 +19328,7 @@ (define-public emacs-evil-expat (revision "1")) (package (name "emacs-evil-expat") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -19412,7 +19415,7 @@ (define-public emacs-evil-visualstar (revision "1")) (package (name "emacs-evil-visualstar") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -19549,7 +19552,7 @@ (define-public emacs-writefreely (revision "0")) (package (name "emacs-writefreely") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -19725,7 +19728,7 @@ (define-public emacs-org-count-words (revision "0")) (package (name "emacs-org-count-words") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -19819,7 +19822,7 @@ (define-public emacs-org-pretty-table (revision "0")) (package (name "emacs-org-pretty-table") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -19842,7 +19845,7 @@ (define-public emacs-ob-sclang (revision "1")) (package (name "emacs-ob-sclang") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -19940,7 +19943,7 @@ (define-public emacs-afternoon-theme (revision "0")) (package (name "emacs-afternoon-theme") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -20205,7 +20208,7 @@ (define-public emacs-cl-print (revision "1")) (package (name "emacs-cl-print") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -20228,7 +20231,7 @@ (define-public emacs-el-search (revision "2")) (package (name "emacs-el-search") - (version (git-version "1.12.6.1" revision commit)) + (version (make-git-version "1.12.6.1" revision commit)) (source (origin (method git-fetch) @@ -20727,7 +20730,7 @@ (define-public emacs-bazel (revision "0")) (package (name "emacs-bazel") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -20751,7 +20754,7 @@ (define-public emacs-clue (revision "0")) (package (name "emacs-clue") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -20847,7 +20850,7 @@ (define-public emacs-mu4e-alert (revision "1")) (package (name "emacs-mu4e-alert") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -20932,7 +20935,7 @@ (define-public emacs-mu4e-jump-to-list (revision "1")) (package (name "emacs-mu4e-jump-to-list") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -21008,7 +21011,7 @@ (define-public emacs-message-view-patch (revision "2")) (package (name "emacs-message-view-patch") - (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 @@ -21094,7 +21097,7 @@ (define-public emacs-tempel-collection (revision "2")) (package (name "emacs-tempel-collection") - (version (git-version "0.2" revision commit)) + (version (make-git-version "0.2" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -21192,7 +21195,7 @@ (define-public emacs-doom-snippets (commit "bc613f448eed1bd363e61c41691a61e9fd139534")) (package (name "emacs-doom-snippets") - (version (git-version release revision commit)) + (version (make-git-version release revision commit)) (source (origin (method git-fetch) @@ -21307,7 +21310,7 @@ (define-public emacs-dired-git-info (revision "0")) (package (name "emacs-dired-git-info") - (version (git-version "0.3.1" revision commit)) + (version (make-git-version "0.3.1" revision commit)) (source (origin (method git-fetch) @@ -21353,7 +21356,7 @@ (define-public emacs-diss (revision "1")) (package (name "emacs-diss") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -21376,7 +21379,7 @@ (define-public emacs-dired-toggle-sudo (revision "0")) (package (name "emacs-dired-toggle-sudo") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -21525,7 +21528,7 @@ (define-public emacs-idle-highlight (revision "0")) (package (name "emacs-idle-highlight") - (version (git-version "1.1.4" revision commit)) + (version (make-git-version "1.1.4" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -21737,7 +21740,7 @@ (define-public emacs-diminish (revision "1")) (package (name "emacs-diminish") - (version (git-version "0.46" revision commit)) + (version (make-git-version "0.46" revision commit)) (source (origin (method git-fetch) @@ -21887,7 +21890,7 @@ (define-public emacs-exotica-theme (revision "0")) (package (name "emacs-exotica-theme") - (version (git-version "1.0.2" revision commit)) + (version (make-git-version "1.0.2" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -22039,7 +22042,7 @@ (define-public emacs-cal-china-x (commit "94005e678a1d2522b7a00299779f40c5c77286b8")) (package (name "emacs-cal-china-x") - (version (git-version "2.6b" revision commit)) + (version (make-git-version "2.6b" revision commit)) (source (origin (method git-fetch) @@ -22154,7 +22157,7 @@ (define-public emacs-vala-mode (revision "0")) (package (name "emacs-vala-mode") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -22240,7 +22243,7 @@ (define-public emacs-composer (revision "0")) (package (name "emacs-composer") - (version (git-version "0.2.0" revision commit)) + (version (make-git-version "0.2.0" revision commit)) (source (origin (method git-fetch) @@ -22267,7 +22270,7 @@ (define-public emacs-pippel (revision "0")) (package (name "emacs-pippel") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -22466,7 +22469,7 @@ (define-public emacs-mini-frame (revision "0")) (package (name "emacs-mini-frame") - (version (git-version "1.19" revision commit)) + (version (make-git-version "1.19" revision commit)) (source (origin (uri (git-reference @@ -22965,7 +22968,7 @@ (define-public emacs-transpose-mark (revision "0")) (package (name "emacs-transpose-mark") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -23240,7 +23243,7 @@ (define-public emacs-doctest (revision "0")) (package (name "emacs-doctest") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -23489,7 +23492,7 @@ (define-public emacs-restclient ;upstream doesn't have official releases (package (name "emacs-restclient") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -23535,7 +23538,7 @@ (define-public emacs-whitespace-cleanup-mode (revision "2")) (package (name "emacs-whitespace-cleanup-mode") - (version (git-version "0.10" revision commit)) + (version (make-git-version "0.10" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -23561,7 +23564,7 @@ (define-public emacs-eimp (revision "1")) (package (name "emacs-eimp") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -23597,7 +23600,7 @@ (define-public emacs-dired-hacks (revision "3")) (package (name "emacs-dired-hacks") - (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 @@ -23725,7 +23728,7 @@ (define-public emacs-which-key-posframe (revision "0")) (package (name "emacs-which-key-posframe") - (version (git-version "0.2.0.50" revision commit)) + (version (make-git-version "0.2.0.50" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -23872,7 +23875,7 @@ (define-public emacs-ws-butler (revision "0")) (package (name "emacs-ws-butler") - (version (git-version "1.3" revision commit)) + (version (make-git-version "1.3" revision commit)) (source (origin (method git-fetch) @@ -23921,7 +23924,7 @@ (define-public emacs-openwith (commit "5fe01dee520d24c839ad5ee18822667457d9f352")) (package (name "emacs-openwith") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -24113,7 +24116,7 @@ (define-public emacs-rpm-spec-mode (revision "0")) (package (name "emacs-rpm-spec-mode") - (version (git-version "0.16" revision commit)) + (version (make-git-version "0.16" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -24350,7 +24353,7 @@ (define-public emacs-enh-ruby-mode (commit "7e76d754e1632b4fc9a024fa393c3fc837bcc86b")) (package (name "emacs-enh-ruby-mode") - (version (git-version "20191111" revision commit)) + (version (make-git-version "20191111" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -24531,7 +24534,7 @@ (define-public emacs-idris-mode (revision "1")) (package (name "emacs-idris-mode") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -24606,7 +24609,7 @@ (define-public emacs-tiny (revision "1")) (package (name "emacs-tiny") - (version (git-version "0.2.1" revision commit)) + (version (make-git-version "0.2.1" revision commit)) (source (origin (method git-fetch) @@ -24707,7 +24710,7 @@ (define-public emacs-make-it-so (revision "2")) (package (name "emacs-make-it-so") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -24738,7 +24741,7 @@ (define-public emacs-unidecode (revision "1")) (package (name "emacs-unidecode") - (version (git-version "0.2" revision commit)) + (version (make-git-version "0.2" revision commit)) (source (origin (method git-fetch) @@ -24947,7 +24950,7 @@ (define-public emacs-slack (revision "11")) (package (name "emacs-slack") - (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 @@ -24985,7 +24988,7 @@ (define-public emacs-helm-slack (revision "1")) (package (name "emacs-helm-slack") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -25014,7 +25017,7 @@ (define-public emacs-bash-completion (revision "0")) (package (name "emacs-bash-completion") - (version (git-version "3.2" revision commit)) + (version (make-git-version "3.2" revision commit)) (source (origin (method git-fetch) @@ -25176,7 +25179,7 @@ (define-public emacs-ansible-doc (version "0.4")) (package (name "emacs-ansible-doc") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -25306,7 +25309,7 @@ (define-public emacs-powershell (package (name "emacs-powershell") (build-system emacs-build-system) - (version (git-version "0.3" revision commit)) + (version (make-git-version "0.3" revision commit)) (source (origin (method git-fetch) @@ -25570,7 +25573,7 @@ (define-public emacs-jenkinsfile-mode (revision "1")) (package (name "emacs-jenkinsfile-mode") - (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 @@ -25594,7 +25597,7 @@ (define-public emacs-kotlin-mode (revision "1")) (package (name "emacs-kotlin-mode") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -25619,7 +25622,7 @@ (define-public emacs-org-tree-slide (revision "0")) (package (name "emacs-org-tree-slide") - (version (git-version "2.8.22" revision commit)) + (version (make-git-version "2.8.22" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -25830,7 +25833,7 @@ (define-public emacs-jupyter (revision "2")) (package (name "emacs-jupyter") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -25968,7 +25971,7 @@ (define-public emacs-frog-jump-buffer (revision "1")) (package (name "emacs-frog-jump-buffer") - (version (git-version "0.1.4" revision commit)) + (version (make-git-version "0.1.4" revision commit)) (source (origin (method git-fetch) @@ -26060,7 +26063,7 @@ (define-public emacs-emmet-mode (revision "1")) (package (name "emacs-emmet-mode") - (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 @@ -26185,7 +26188,7 @@ (define-public emacs-auth-source-pass (revision "2")) (package (name "emacs-auth-source-pass") - (version (git-version "5.0.0" revision commit)) + (version (make-git-version "5.0.0" revision commit)) (source (origin (method git-fetch) @@ -26244,7 +26247,7 @@ (define-public emacs-passage (revision "0")) (package (name "emacs-passage") - (version (git-version "2.0" revision commit)) + (version (make-git-version "2.0" revision commit)) (source (origin (method git-fetch) @@ -26270,7 +26273,7 @@ (define-public emacs-psc-ide (revision "2")) (package (name "emacs-psc-ide") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -26308,7 +26311,7 @@ (define-public emacs-evil-anzu (revision "0")) (package (name "emacs-evil-anzu") - (version (git-version "0.03" revision commit)) + (version (make-git-version "0.03" revision commit)) (source (origin (method git-fetch) @@ -26638,7 +26641,7 @@ (define-public emacs-outorg (let ((commit "78b0695121fb974bc4e971eb4ef7f8afd6d89d64")) (package (name "emacs-outorg") - (version (git-version "2.0" "1" commit)) + (version (make-git-version "2.0" "1" commit)) (source (origin (method git-fetch) @@ -26690,7 +26693,7 @@ (define-public emacs-outshine (revision "1")) (package (name "emacs-outshine") - (version (git-version "3.0.1" revision commit)) + (version (make-git-version "3.0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -26738,7 +26741,7 @@ (define-public emacs-org-recent-headings (revision "0")) (package (name "emacs-org-recent-headings") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -26799,7 +26802,7 @@ (define-public emacs-org-timeblock (commit "b423b01712b9c25dff3e4203c7cde736225f62ef")) (package (name "emacs-org-timeblock") - (version (git-version "0.2" revision commit)) + (version (make-git-version "0.2" revision commit)) (source (origin (method git-fetch) @@ -26881,7 +26884,7 @@ (define-public emacs-elegant-agenda-mode (revision "1")) (package (name "emacs-elegant-agenda-mode") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -27206,7 +27209,7 @@ (define-public emacs-org-auto-expand (revision "1")) (package (name "emacs-org-auto-expand") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -27411,7 +27414,7 @@ (define-public emacs-helm-bibtex (revision "2")) (package (name "emacs-helm-bibtex") - (version (git-version "2.0.1" revision commit)) + (version (make-git-version "2.0.1" revision commit)) (source (origin (method git-fetch) @@ -27491,7 +27494,7 @@ (define-public emacs-erc-image (revision "3")) (package (name "emacs-erc-image") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -27637,7 +27640,7 @@ (define-public emacs-rainbow-blocks (let ((commit "dd435d7bb34ff6f162a5f315df308b90b7e9f842")) (package (name "emacs-rainbow-blocks") - (version (git-version "1.0.0" "1" commit)) + (version (make-git-version "1.0.0" "1" commit)) (source (origin (method git-fetch) (uri (git-reference @@ -27707,7 +27710,7 @@ (define-public emacs-pulseaudio-control (revision "0")) (package (name "emacs-pulseaudio-control") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -27738,7 +27741,7 @@ (define-public emacs-smudge (revision "1")) (package (name "emacs-smudge") - (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 @@ -28065,7 +28068,7 @@ (define-public emacs-esup (revision "1")) (package (name "emacs-esup") - (version (git-version "0.7.1" revision commit)) + (version (make-git-version "0.7.1" revision commit)) (source (origin (method git-fetch) @@ -28094,7 +28097,7 @@ (define-public emacs-restart-emacs (revision "1")) (package (name "emacs-restart-emacs") - (version (git-version "0.1.1" revision commit)) + (version (make-git-version "0.1.1" revision commit)) (source (origin (method git-fetch) @@ -28188,7 +28191,7 @@ (define-public emacs-svg-icon (revision "1")) (package (name "emacs-svg-icon") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -28333,7 +28336,7 @@ (define-public emacs-lacarte (revision "1")) (package (name "emacs-lacarte") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -28361,7 +28364,7 @@ (define-public emacs-latex-preview-pane (revision "0")) (package (name "emacs-latex-preview-pane") - (version (git-version "20151021" revision commit)) + (version (make-git-version "20151021" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -28389,7 +28392,7 @@ (define-public emacs-isearch-prop (revision "2")) (package (name "emacs-isearch-prop") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -28415,7 +28418,7 @@ (define-public emacs-company-lua (revision "2")) (package (name "emacs-company-lua") - (version (git-version "0.1" "2" commit)) + (version (make-git-version "0.1" "2" commit)) (source (origin (method git-fetch) @@ -28506,7 +28509,7 @@ (define-public emacs-mbsync (revision "5")) (package (name "emacs-mbsync") - (version (git-version "0.1.2" revision commit)) + (version (make-git-version "0.1.2" revision commit)) (source (origin (method git-fetch) @@ -28709,7 +28712,7 @@ (define-public emacs-helm-shell-history (let ((commit "110d3c35c52fe4b89b29e79ea4c8626bce7266a1")) (package (name "emacs-helm-shell-history") - (version (git-version "0.1" "1" commit)) + (version (make-git-version "0.1" "1" commit)) (source (origin (method git-fetch) @@ -28769,7 +28772,7 @@ (define-public emacs-org-ref (revision "0")) (package (name "emacs-org-ref") - (version (git-version "3.1" revision commit)) + (version (make-git-version "3.1" revision commit)) (source (origin (method git-fetch) @@ -28835,7 +28838,7 @@ (define-public emacs-org-reveal (let ((commit "f55c851bf6aeb1bb2a7f6cf0f2b7bd0e79c4a5a0")) (package (name "emacs-org-reveal") - (version (git-version "20222711" "1" commit)) + (version (make-git-version "20222711" "1" commit)) (source (origin (method git-fetch) (uri (git-reference @@ -28959,7 +28962,7 @@ (define-public emacs-hideshowvis (revision "1")) (package (name "emacs-hideshowvis") - (version (git-version "0.7" revision commit)) + (version (make-git-version "0.7" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -29011,7 +29014,7 @@ (define-public emacs-navi-mode (let ((commit "c1d38e8237f4e14af020a0b7d4f118ea198ab674")) (package (name "emacs-navi-mode") - (version (git-version "2.0" "1" commit)) + (version (make-git-version "2.0" "1" commit)) (source (origin (method git-fetch) @@ -29177,7 +29180,7 @@ (define-public emacs-magit-gerrit (revision "1")) (package (name "emacs-magit-gerrit") - (version (git-version "0.4" revision commit)) + (version (make-git-version "0.4" revision commit)) (source (origin (method git-fetch) @@ -29313,7 +29316,7 @@ (define-public emacs-academic-phrases (let ((commit "0823ed8c24b26c32f909b896a469833ec4d7b656")) (package (name "emacs-academic-phrases") - (version (git-version "0.1" "1" commit)) + (version (make-git-version "0.1" "1" commit)) (source (origin (method git-fetch) @@ -29346,7 +29349,7 @@ (define-public emacs-auto-yasnippet (revision "3")) (package (name "emacs-auto-yasnippet") - (version (git-version "0.3.0" revision commit)) + (version (make-git-version "0.3.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -29564,7 +29567,7 @@ (define-public emacs-racket-mode (revision "8")) (package (name "emacs-racket-mode") - (version (git-version "1" revision commit)) + (version (make-git-version "1" revision commit)) (source (origin (method git-fetch) @@ -29626,7 +29629,7 @@ (define-public emacs-grep-context (revision "1")) (package (name "emacs-grep-context") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -29834,7 +29837,7 @@ (define-public emacs-stumpwm-mode (revision "3")) (package (name "emacs-stumpwm-mode") - (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 @@ -29942,7 +29945,7 @@ (define-public emacs-on (revision "0")) (package (name "emacs-on") - (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 @@ -29987,7 +29990,7 @@ (define-public emacs-highlight-escape-sequences (revision "0")) (package (name "emacs-highlight-escape-sequences") - (version (git-version "0.4" revision commit)) + (version (make-git-version "0.4" revision commit)) (source (origin (method git-fetch) @@ -30066,7 +30069,7 @@ (define-public emacs-grid (package (name "emacs-grid") ;; Taken from source code - (version (git-version "0.1-pre" revision commit)) + (version (make-git-version "0.1-pre" revision commit)) (source (origin (method git-fetch) @@ -30138,7 +30141,7 @@ (define-public emacs-eros (package (name "emacs-eros") ;; No tag or release, version taken from `eros.el'. - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -30259,7 +30262,7 @@ (define-public emacs-scroll-on-drag (revision "2")) (package (name "emacs-scroll-on-drag") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -30309,7 +30312,7 @@ (define-public emacs-noflet (commit "7ae84dc3257637af7334101456dafe1759c6b68a")) (package (name "emacs-noflet") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -30485,7 +30488,7 @@ (define-public emacs-isearch+ (revision "2")) (package (name "emacs-isearch+") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -30604,7 +30607,7 @@ (define-public emacs-desktop-environment (revision "0")) (package (name "emacs-desktop-environment") - (version (git-version "0.5.0" revision commit)) + (version (make-git-version "0.5.0" revision commit)) (source (origin (method git-fetch) @@ -30632,7 +30635,7 @@ (define-public emacs-org-caldav (revision "0")) (package (name "emacs-org-caldav") - (version (git-version "3.1" revision commit)) + (version (make-git-version "3.1" revision commit)) (source (origin (method git-fetch) @@ -30661,7 +30664,7 @@ (define-public emacs-zotra (revision "0")) (package (name "emacs-zotra") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -30793,7 +30796,7 @@ (define-public emacs-evil-mc (revision "2")) (package (name "emacs-evil-mc") - (version (git-version "0.0.3" revision commit)) + (version (make-git-version "0.0.3" revision commit)) (source (origin (method git-fetch) @@ -30826,7 +30829,7 @@ (define-public emacs-evil-org (revision "2")) (package (name "emacs-evil-org") - (version (git-version "1.0.3" revision commit)) + (version (make-git-version "1.0.3" revision commit)) (source (origin (method git-fetch) @@ -31134,7 +31137,7 @@ (define-public emacs-lingva (package (name "emacs-lingva") (version - (git-version "0.2" revision commit)) + (make-git-version "0.2" revision commit)) (source (origin (method git-fetch) @@ -31183,7 +31186,7 @@ (define-public emacs-helm-descbinds (let ((commit "033be73f21778633813264ce1634a6e1ad873d8e")) (package (name "emacs-helm-descbinds") - (version (git-version "1.13" "1" commit)) + (version (make-git-version "1.13" "1" commit)) (source (origin (method git-fetch) @@ -31211,7 +31214,7 @@ (define-public emacs-helm-emms (let ((commit "37e5aa029abfa5a5c48636314de8157142944fa2")) (package (name "emacs-helm-emms") - (version (git-version "1.3" "3" commit)) + (version (make-git-version "1.3" "3" commit)) (source (origin (method git-fetch) @@ -31262,7 +31265,7 @@ (define-public emacs-helm-flycheck (let ((commit "3cf7d3bb194acacc6395f88360588013d92675d6")) (package (name "emacs-helm-flycheck") - (version (git-version "0.4" "1" commit)) + (version (make-git-version "0.4" "1" commit)) (source (origin (method git-fetch) @@ -31322,7 +31325,7 @@ (define-public emacs-helm-mu (let ((commit "77e6fea24e01481418738421dbcfe28ef1bd63cf")) (package (name "emacs-helm-mu") - (version (git-version "20180513" "1" commit)) + (version (make-git-version "20180513" "1" commit)) (source (origin (method git-fetch) @@ -31384,7 +31387,7 @@ (define-public emacs-image+ (let ((commit "6834d0c09bb4df9ecc0d7a559bd7827fed48fffc")) (package (name "emacs-image+") - (version (git-version "0.6.2" "1" commit)) + (version (make-git-version "0.6.2" "1" commit)) (source (origin (method git-fetch) @@ -31552,7 +31555,7 @@ (define-public emacs-mu4e-dashboard (revision "1")) (package (name "emacs-mu4e-dashboard") - (version (git-version "0.1.1" revision commit)) + (version (make-git-version "0.1.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -31585,7 +31588,7 @@ (define-public emacs-pinentry (revision "2")) (package (name "emacs-pinentry") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -31647,7 +31650,7 @@ (define-public emacs-srfi (revision "0")) (package (name "emacs-srfi") - (version (git-version "0.3" revision commit)) + (version (make-git-version "0.3" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -31727,7 +31730,7 @@ (define-public emacs-github-review (revision "2")) (package (name "emacs-github-review") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -31868,7 +31871,7 @@ (define-public emacs-hlint-refactor-mode (revision "1")) (package (name "emacs-hlint-refactor-mode") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -31893,7 +31896,7 @@ (define-public emacs-ccls (revision "5")) (package (name "emacs-ccls") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -31966,7 +31969,7 @@ (define-public emacs-org-board (revision "2")) (package (name "emacs-org-board") - (version (git-version "1138" revision commit)) + (version (make-git-version "1138" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -32031,7 +32034,7 @@ (define-public emacs-recent-addresses (package (name "emacs-recent-addresses") (home-page "https://nschum.de/src/emacs/recent-addresses/") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -32056,7 +32059,7 @@ (define-public emacs-fold-dwim (revision "0")) (package (name "emacs-fold-dwim") - (version (git-version "1.2" revision commit)) + (version (make-git-version "1.2" revision commit)) (home-page "https://github.com/emacsattic/fold-dwim") (source (origin (method git-fetch) @@ -32152,7 +32155,7 @@ (define-public emacs-org-asciidoc (revision "0")) (package (name "emacs-org-asciidoc") - (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 @@ -32178,7 +32181,7 @@ (define-public emacs-racer (revision "0")) (package (name "emacs-racer") - (version (git-version "1.2" revision commit)) + (version (make-git-version "1.2" revision commit)) (source (origin (method git-fetch) @@ -32286,7 +32289,7 @@ (define-public emacs-cargo (revision "0")) (package (name "emacs-cargo") - (version (git-version "0.4.1" revision commit)) + (version (make-git-version "0.4.1" revision commit)) (source (origin (method git-fetch) @@ -32367,7 +32370,7 @@ (define-public emacs-helm-org-contacts (revision "2")) (package (name "emacs-helm-org-contacts") - (version (git-version "20201202" revision commit)) + (version (make-git-version "20201202" revision commit)) (source (origin (method git-fetch) @@ -32493,7 +32496,7 @@ (define-public emacs-pcre2el (revision "0")) (package (name "emacs-pcre2el") - (version (git-version "1.12" revision commit)) + (version (make-git-version "1.12" revision commit)) (source (origin (method git-fetch) @@ -32583,7 +32586,7 @@ (define-public emacs-git-annex (revision "2")) (package (name "emacs-git-annex") - (version (git-version "1.1" revision commit)) + (version (make-git-version "1.1" revision commit)) (source (origin (method git-fetch) @@ -32672,7 +32675,7 @@ (define-public emacs-youtube-dl (revision "2")) (package (name "emacs-youtube-dl") - (version (git-version "1.0" "2" commit)) + (version (make-git-version "1.0" "2" commit)) (source (origin (method git-fetch) @@ -32715,7 +32718,7 @@ (define-public emacs-ytdl (revision "0")) (package (name "emacs-ytdl") - (version (git-version "1.3.6" revision commit)) + (version (make-git-version "1.3.6" revision commit)) (source (origin (method git-fetch) @@ -32757,7 +32760,7 @@ (define-public emacs-ytel (revision "0")) (package (name "emacs-ytel") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -32793,7 +32796,7 @@ (define-public emacs-ytel-show (revision "0")) (package (name "emacs-ytel-show") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -32910,7 +32913,7 @@ (define-public emacs-org-rss-publishing (revision "0")) (package (name "emacs-org-rss-publishing") - (version (git-version "0.8" revision commit)) + (version (make-git-version "0.8" revision commit)) (source (origin (method git-fetch) @@ -32935,7 +32938,7 @@ (define-public emacs-blimp (let ((commit "e420763d6d18b5d1be552cdbc47f91418343db03")) (package (name "emacs-blimp") - (version (git-version "0.0.0" "1" commit)) + (version (make-git-version "0.0.0" "1" commit)) (source (origin (method git-fetch) @@ -33024,7 +33027,7 @@ (define-public emacs-nerd-icons (revision "1")) (package (name "emacs-nerd-icons") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (home-page "https://github.com/rainstormstudio/nerd-icons.el") (source (origin @@ -33151,7 +33154,7 @@ (define-public emacs-browse-kill-ring (revision "0")) (package (name "emacs-browse-kill-ring") - (version (git-version "2.0.0" revision commit)) + (version (make-git-version "2.0.0" revision commit)) (source (origin (method git-fetch) @@ -33231,7 +33234,7 @@ (define-public emacs-spaceline-next (package (inherit emacs-spaceline) (name "emacs-spaceline-next") - (version (git-version last-release-version revision commit)) + (version (make-git-version last-release-version revision commit)) (source (origin (method git-fetch) @@ -33247,7 +33250,7 @@ (define-public emacs-column-enforce-mode (revision "1")) (package (name "emacs-column-enforce-mode") - (version (git-version "1.0.4" revision commit)) + (version (make-git-version "1.0.4" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -33292,7 +33295,7 @@ (define-public emacs-slime-repl-ansi-color (let ((commit "ad03263f5d4de473bc173b64a6fc3dc1106393d7")) (package (name "emacs-slime-repl-ansi-color") - (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 @@ -33496,7 +33499,7 @@ (define-public emacs-wordnut (revision "0")) (package (name "emacs-wordnut") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (home-page "https://github.com/gromnitsky/wordnut") (source (origin (method git-fetch) @@ -33528,7 +33531,7 @@ (define-public emacs-frame-local (commit "7ee1106c3bcd4022f48421f8cb1ef4f995da816e")) (package (name "emacs-frame-local") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -33631,7 +33634,7 @@ (define-public emacs-general (revision "4")) (package (name "emacs-general") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -33667,7 +33670,7 @@ (define-public emacs-tldr (revision "2")) (package (name "emacs-tldr") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -33785,7 +33788,7 @@ (define-public emacs-leetcode (revision "1")) (package (name "emacs-leetcode") - (version (git-version "0" "1" commit)) + (version (make-git-version "0" "1" commit)) (home-page "https://github.com/ginqi7/leetcode-emacs") (source (origin (method git-fetch) @@ -33808,7 +33811,7 @@ (define-public emacs-epc (let ((commit "e1bfa5ca163273859336e3cc89b4b6460f7f8cda")) (package (name "emacs-epc") - (version (git-version "0.1.1" "1" commit)) + (version (make-git-version "0.1.1" "1" commit)) (home-page "https://github.com/kiwanami/emacs-epc") (source (origin (method git-fetch) @@ -33834,7 +33837,7 @@ (define-public emacs-edbi (let ((commit "6f50aaf4bde75255221f2292c7a4ad3fa9d918c0")) (package (name "emacs-edbi") - (version (git-version "0.1.3" "1" commit)) + (version (make-git-version "0.1.3" "1" commit)) (home-page "https://github.com/kiwanami/emacs-edbi") (source (origin (method git-fetch) @@ -33882,7 +33885,7 @@ (define-public emacs-edbi-sqlite (let ((commit "52cb9ca1af7691b592f2cfd2f007847e7a4ccd5f")) (package (name "emacs-edbi-sqlite") - (version (git-version "0.1.1" "1" commit)) + (version (make-git-version "0.1.1" "1" commit)) (home-page "https://github.com/proofit404/edbi-sqlite") (source (origin (method git-fetch) @@ -33906,7 +33909,7 @@ (define-public emacs-nice-citation (revision "0")) (package (name "emacs-nice-citation") - (version (git-version "0.0.2" revision commit)) + (version (make-git-version "0.0.2" revision commit)) (source (origin (method git-fetch) @@ -33957,7 +33960,7 @@ (define-public emacs-nyxt (revision "0")) (package (name "emacs-nyxt") - (version (git-version "0.1.1" revision commit)) + (version (make-git-version "0.1.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -34051,7 +34054,7 @@ (define-public emacs-kodi-remote (revision "0")) (package (name "emacs-kodi-remote") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -34158,7 +34161,7 @@ (define-public emacs-vterm (revision "2")) (package (name "emacs-vterm") - (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 @@ -34224,7 +34227,7 @@ (define-public emacs-vterm-toggle (revision "1")) (package (name "emacs-vterm-toggle") - (version (git-version "0.0.4" revision commit)) + (version (make-git-version "0.0.4" revision commit)) (source (origin (method git-fetch) @@ -34248,7 +34251,7 @@ (define-public emacs-multi-vterm (revision "1")) (package (name "emacs-multi-vterm") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -34272,7 +34275,7 @@ (define-public emacs-simple-mpc (revision "1")) (package (name "emacs-simple-mpc") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -34499,7 +34502,7 @@ (define-public emacs-google-c-style (revision "0")) (package (name "emacs-google-c-style") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -34521,7 +34524,7 @@ (define-public emacs-redshank (revision "1")) (package (name "emacs-redshank") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -34549,7 +34552,7 @@ (define-public emacs-disk-usage (revision "0")) (package (name "emacs-disk-usage") - (version (git-version "1.3.3" revision commit)) + (version (make-git-version "1.3.3" revision commit)) (source (origin (method git-fetch) @@ -34654,7 +34657,7 @@ (define-public emacs-lorem-ipsum (revision "1")) (package (name "emacs-lorem-ipsum") - (version (git-version "0.4" revision commit)) + (version (make-git-version "0.4" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -34677,7 +34680,7 @@ (define-public emacs-lisp-extra-font-lock (let ((commit "4605eccbe1a7fcbd3cacf5b71249435413b4db4f")) (package (name "emacs-lisp-extra-font-lock") - (version (git-version "0.0.6" "1" commit)) + (version (make-git-version "0.0.6" "1" commit)) (home-page "https://github.com/Lindydancer/lisp-extra-font-lock") (source (origin (method git-fetch) @@ -34796,7 +34799,7 @@ (define-public emacs-lsp-mode (revision "0")) (package (name "emacs-lsp-mode") - (version (git-version "9.0.1" revision commit)) ;taken from lsp-mode.el + (version (make-git-version "9.0.1" revision commit)) ;taken from lsp-mode.el (source (origin (method git-fetch) @@ -35278,7 +35281,7 @@ (define-public emacs-libyaml (commit "961e0d8b9ef47464c049e07be7fcefd3903f8cbc")) (package (name "emacs-libyaml") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -35327,7 +35330,7 @@ (define-public emacs-lsp-java (revision "1")) (package (name "emacs-lsp-java") - (version (git-version "3.1" revision commit)) + (version (make-git-version "3.1" revision commit)) (source (origin (method git-fetch) @@ -35358,7 +35361,7 @@ (define-public emacs-lsp-metals (revision "1")) (package (name "emacs-lsp-metals") - (version (git-version "1.2.0" revision commit)) + (version (make-git-version "1.2.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -35417,7 +35420,7 @@ (define-public emacs-lsp-lua-emmy (let ((commit "ab53fb2a8b8942804eb75bab5624fd19f1d360bf")) (package (name "emacs-lsp-lua-emmy") - (version (git-version "0.1.0" "1" commit)) + (version (make-git-version "0.1.0" "1" commit)) (source (origin (method git-fetch) (uri (git-reference @@ -35686,7 +35689,7 @@ (define-public emacs-matcha (let ((commit "dc4a940b3360aadeb2d9eaab7bd0c85e1e85ab76")) (package (name "emacs-matcha") - (version (git-version "0.0.1" "2" commit)) ;no upstream release + (version (make-git-version "0.0.1" "2" commit)) ;no upstream release (source (origin (method git-fetch) (uri (git-reference @@ -35710,7 +35713,7 @@ (define-public emacs-undo-propose (revision "3")) (package (name "emacs-undo-propose") - (version (git-version "3.0.0" revision commit)) + (version (make-git-version "3.0.0" revision commit)) (source (origin (method git-fetch) @@ -35741,7 +35744,7 @@ (define-public emacs-elisp-docstring-mode (revision "1")) (package (name "emacs-elisp-docstring-mode") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -35765,7 +35768,7 @@ (define-public emacs-vimrc-mode (revision "1")) (package (name "emacs-vimrc-mode") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -35788,7 +35791,7 @@ (define-public emacs-flycheck-elm (commit "1b60050efd4729bfba548f3e5adbcb58436667cb")) (package (name "emacs-flycheck-elm") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -35812,7 +35815,7 @@ (define-public emacs-flycheck-haskell (revision "2")) (package (name "emacs-flycheck-haskell") - (version (git-version "0.8" revision commit)) + (version (make-git-version "0.8" revision commit)) (source (origin (method git-fetch) @@ -35843,7 +35846,7 @@ (define-public emacs-js2-refactor (revision "2")) (package (name "emacs-js2-refactor") - (version (git-version "0.9.0" revision commit)) + (version (make-git-version "0.9.0" revision commit)) (source (origin (method git-fetch) @@ -35910,7 +35913,7 @@ (define-public emacs-prettier (revision "1")) (package (name "emacs-prettier") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -35978,7 +35981,7 @@ (define-public emacs-springboard (revision "1")) (package (name "emacs-springboard") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -36004,7 +36007,7 @@ (define-public emacs-tco (revision "1")) (package (name "emacs-tco") - (version (git-version "0.3" revision commit)) + (version (make-git-version "0.3" revision commit)) (source (origin (method git-fetch) @@ -36091,7 +36094,7 @@ (define-public emacs-vdiff-magit (revision "8")) (package (name "emacs-vdiff-magit") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -36163,7 +36166,7 @@ (define-public emacs-exwm-edit (revision "3")) (package (name "emacs-exwm-edit") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -36189,7 +36192,7 @@ (define-public emacs-exwm-mff (revision "1")) (package (name "emacs-exwm-mff") - (version (git-version "1.2.1" revision commit)) + (version (make-git-version "1.2.1" revision commit)) (source (origin (method git-fetch) @@ -36233,7 +36236,7 @@ (define-public emacs-exwm-firefox-core (revision "1")) (package (name "emacs-exwm-firefox-core") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -36445,7 +36448,7 @@ (define-public emacs-flow-minor-mode (revision "4")) (package (name "emacs-flow-minor-mode") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -36512,7 +36515,7 @@ (define-public emacs-origami (revision "1")) (package (name "emacs-origami") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -36549,7 +36552,7 @@ (define-public emacs-peep-dired (revision "1")) (package (name "emacs-peep-dired") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -36601,7 +36604,7 @@ (define-public emacs-ivy-clipmenu (let ((commit "d2071f2c5043a05d610cd1952e84176ca78c31dc")) (package (name "emacs-ivy-clipmenu") - (version (git-version "0.0.1" "1" commit)) + (version (make-git-version "0.0.1" "1" commit)) (source (origin (method git-fetch) (uri (git-reference @@ -36626,7 +36629,7 @@ (define-public emacs-org-download (package (name "emacs-org-download") ;; Not released version. - (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 @@ -36652,7 +36655,7 @@ (define-public emacs-org-drill-table (revision "0")) (package (name "emacs-org-drill-table") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -36731,7 +36734,7 @@ (define-public emacs-dash-docs (revision "2")) (package (name "emacs-dash-docs") - (version (git-version "1.4.0" revision commit)) + (version (make-git-version "1.4.0" revision commit)) (source (origin (method git-fetch) @@ -36775,7 +36778,7 @@ (define-public emacs-helm-dash (revision "2")) (package (name "emacs-helm-dash") - (version (git-version "1.3.0" revision commit)) + (version (make-git-version "1.3.0" revision commit)) (source (origin (method git-fetch) @@ -36800,7 +36803,7 @@ (define-public emacs-counsel-dash (revision "4")) (package (name "emacs-counsel-dash") - (version (git-version "0.1.3" revision commit)) + (version (make-git-version "0.1.3" revision commit)) (source (origin (method git-fetch) @@ -36846,7 +36849,7 @@ (define-public emacs-cascading-dir-locals (commit "efdf5e6d62b955ee0ca3c170eae1d388799f9fa0")) (package (name "emacs-cascading-dir-locals") - (version (git-version release revision commit)) + (version (make-git-version release revision commit)) (home-page "https://github.com/fritzgrabo/cascading-dir-locals") (source (origin @@ -37079,7 +37082,7 @@ (define-public emacs-info-plus (revision "4")) (package (name "emacs-info-plus") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -37219,7 +37222,7 @@ (define-public emacs-ob-elm (revision "0")) (package (name "emacs-ob-elm") - (version (git-version "0.0" revision commit)) + (version (make-git-version "0.0" revision commit)) (source (origin (method git-fetch) @@ -37346,7 +37349,7 @@ (define-public emacs-tramp-auto-auth (let ((commit "f15a12dfab651aff60f4a9d70f868030a12344ac")) (package (name "emacs-tramp-auto-auth") - (version (git-version "20191027" "1" commit)) + (version (make-git-version "20191027" "1" commit)) (source (origin (method git-fetch) @@ -37394,7 +37397,7 @@ (define-public emacs-semantic-refactor (let ((commit "6f2c97d17fb70f4ca2112f5a2b99a8ec162004f5")) (package (name "emacs-semantic-refactor") - (version (git-version "0.5" "1" commit)) + (version (make-git-version "0.5" "1" commit)) (source (origin (method git-fetch) @@ -37470,7 +37473,7 @@ (define-public emacs-helm-wikipedia (let ((commit "126f044e0a0e1432e0791c33ce2a41875d704a9b")) (package (name "emacs-helm-wikipedia") - (version (git-version "0.0.0" "1" commit)) + (version (make-git-version "0.0.0" "1" commit)) (home-page "https://github.com/emacs-helm/helm-wikipedia/") (source (origin @@ -37618,7 +37621,7 @@ (define-public emacs-evil-cleverparens (revision "1")) (package (name "emacs-evil-cleverparens") - (version (git-version "2017-07-17" revision commit)) + (version (make-git-version "2017-07-17" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -37661,7 +37664,7 @@ (define-public emacs-nushell-mode (revision "0")) (package (name "emacs-nushell-mode") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -37861,7 +37864,7 @@ (define-public emacs-everywhere (revision "0")) (package (name "emacs-everywhere") - (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 @@ -37991,7 +37994,7 @@ (define-public emacs-org-redmine (let ((commit "e77d013bc3784947c46a5c53f03cd7d3c68552fc")) (package (name "emacs-org-redmine") - (version (git-version "0.1" "1" commit)) + (version (make-git-version "0.1" "1" commit)) (source (origin (method git-fetch) (uri (git-reference @@ -38013,7 +38016,7 @@ (define-public emacs-multi-term (revision "0")) (package (name "emacs-multi-term") - (version (git-version "1.5" revision commit)) + (version (make-git-version "1.5" revision commit)) (source (origin (method git-fetch) @@ -38133,7 +38136,7 @@ (define-public emacs-gnus-alias (package (name "emacs-gnus-alias") ;; The version string is specified in gnus-alias.el. - (version (git-version "1.7.0" revision commit)) + (version (make-git-version "1.7.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -38224,7 +38227,7 @@ (define-public emacs-ox-gemini (revision "1")) (package (name "emacs-ox-gemini") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -38341,7 +38344,7 @@ (define-public emacs-ox-reveal (revision "0")) (package (name "emacs-ox-reveal") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -38397,7 +38400,7 @@ (define-public emacs-ox-rss (revision "0")) (package (name "emacs-ox-rss") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -38503,7 +38506,7 @@ (define-public emacs-fedi (revision "2")) (package (name "emacs-fedi") - (version (git-version "0.2" revision commit)) + (version (make-git-version "0.2" revision commit)) (source (origin (method git-fetch) @@ -38651,7 +38654,7 @@ (define-public emacs-spell-fu (revision "1")) (package (name "emacs-spell-fu") - (version (git-version "0.3" revision commit)) + (version (make-git-version "0.3" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -38675,7 +38678,7 @@ (define-public emacs-org-emms (package (name "emacs-org-emms") (version - (git-version "0.1" revision commit)) + (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -38808,7 +38811,7 @@ (define-public emacs-ssh-config-mode (revision "2")) (package (name "emacs-ssh-config-mode") - (version (git-version "8.0" revision commit)) + (version (make-git-version "8.0" revision commit)) (source (origin (method git-fetch) @@ -38911,7 +38914,7 @@ (define-public emacs-tao-theme (revision "1")) (package (name "emacs-tao-theme") - (version (git-version "1.1.1" revision commit)) + (version (make-git-version "1.1.1" revision commit)) (source (origin (method git-fetch) @@ -38940,7 +38943,7 @@ (define-public emacs-almost-mono-themes (revision "0")) (package (name "emacs-almost-mono-themes") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -38964,7 +38967,7 @@ (define-public emacs-quasi-monochrome (revision "0")) (package (name "emacs-quasi-monochrome") - (version (git-version "1.2" revision commit)) + (version (make-git-version "1.2" revision commit)) (source (origin (method git-fetch) @@ -38988,7 +38991,7 @@ (define-public emacs-doom-themes (revision "0")) (package (name "emacs-doom-themes") - (version (git-version "2.3.0" revision commit)) + (version (make-git-version "2.3.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -39073,7 +39076,7 @@ (define-public emacs-plan9-theme (package (name "emacs-plan9-theme") (home-page "https://github.com/john2x/plan9-theme.el") - (version (git-version "0.2" revision commit)) + (version (make-git-version "0.2" revision commit)) (source (origin (method git-fetch) @@ -39095,7 +39098,7 @@ (define-public emacs-punpun-theme (revision "0")) (package (name "emacs-punpun-theme") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -39142,7 +39145,7 @@ (define-public emacs-starlit-theme (revision "0")) (package (name "emacs-starlit-theme") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -39189,7 +39192,7 @@ (define-public emacs-dimmer (revision "1")) (package (name "emacs-dimmer") - (version (git-version "0.4.2" revision commit)) + (version (make-git-version "0.4.2" revision commit)) (source (origin (method git-fetch) @@ -39385,7 +39388,7 @@ (define-public emacs-framemove (revision "0")) (package (name "emacs-framemove") - (version (git-version "0.10" revision commit)) + (version (make-git-version "0.10" revision commit)) (source (origin (method git-fetch) @@ -39492,7 +39495,7 @@ (define-public emacs-helm-themes (revision "1")) (package (name "emacs-helm-themes") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -39542,7 +39545,7 @@ (define-public emacs-telega-server (revision "0")) (package (name "emacs-telega-server") - (version (git-version "0.8.2" revision commit)) + (version (make-git-version "0.8.2" revision commit)) (source (origin (method git-fetch) @@ -39589,7 +39592,7 @@ (define-public emacs-telega (revision "0")) (package (name "emacs-telega") - (version (git-version "0.8.452" revision commit)) + (version (make-git-version "0.8.452" revision commit)) (source (origin (method git-fetch) @@ -39757,7 +39760,7 @@ (define-public emacs-frames-only-mode (revision "0")) (package (name "emacs-frames-only-mode") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -39840,7 +39843,7 @@ (define-public emacs-org-present (revision "1")) (package (name "emacs-org-present") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -39887,7 +39890,7 @@ (define-public emacs-eshell-toggle (revision "1")) (package (name "emacs-eshell-toggle") - (version (git-version "0.10.0" revision commit)) + (version (make-git-version "0.10.0" revision commit)) (source (origin (method git-fetch) @@ -39979,7 +39982,7 @@ (define-public emacs-liberime (revision "0")) (package (name "emacs-liberime") - (version (git-version "0.0.6" revision commit)) + (version (make-git-version "0.0.6" revision commit)) (source (origin (method git-fetch) @@ -40040,7 +40043,7 @@ (define-public emacs-blackout (revision "1")) (package (name "emacs-blackout") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -40063,7 +40066,7 @@ (define-public emacs-ivy-omni-org (revision "1")) (package (name "emacs-ivy-omni-org") - (version (git-version "0.2.1" revision commit)) + (version (make-git-version "0.2.1" revision commit)) (source (origin (method git-fetch) @@ -40131,7 +40134,7 @@ (define-public emacs-showtip (revision "0")) (package (name "emacs-showtip") - (version (git-version "0.01" revision commit)) + (version (make-git-version "0.01" revision commit)) (source (origin (method git-fetch) @@ -40154,7 +40157,7 @@ (define-public emacs-sdcv (revision "0")) (package (name "emacs-sdcv") - (version (git-version "1.5.2" revision commit)) + (version (make-git-version "1.5.2" revision commit)) (source (origin (method git-fetch) @@ -40179,7 +40182,7 @@ (define-public emacs-helm-lacarte (revision "1")) (package (name "emacs-helm-lacarte") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -40205,7 +40208,7 @@ (define-public emacs-esh-help (revision "1")) (package (name "emacs-esh-help") - (version (git-version "1.0.1" revision commit)) + (version (make-git-version "1.0.1" revision commit)) (source (origin (method git-fetch) @@ -40230,7 +40233,7 @@ (define-public emacs-isearch-dabbrev (revision "1")) (package (name "emacs-isearch-dabbrev") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -40253,7 +40256,7 @@ (define-public emacs-helm-linux-disks (revision "1")) (package (name "emacs-helm-linux-disks") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -40279,7 +40282,7 @@ (define-public emacs-debase (revision "1")) (package (name "emacs-debase") - (version (git-version "0.7" revision commit)) + (version (make-git-version "0.7" revision commit)) (source (origin (method git-fetch) @@ -40302,7 +40305,7 @@ (define-public emacs-discomfort (revision "1")) (package (name "emacs-discomfort") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -40324,7 +40327,7 @@ (define-public emacs-psession (revision "1")) (package (name "emacs-psession") - (version (git-version "1.5" revision commit)) + (version (make-git-version "1.5" revision commit)) (source (origin (method git-fetch) @@ -40455,7 +40458,7 @@ (define-public emacs-edn (let ((commit "be9e32d1b49e35247b263b0243df7cfdc8d413ab")) (package (name "emacs-edn") - (version (git-version "1.1.2" "1" commit)) + (version (make-git-version "1.1.2" "1" commit)) (home-page "https://github.com/expez/edn.el") (source (origin (method git-fetch) @@ -40506,7 +40509,7 @@ (define-public emacs-helm-clojuredocs (let ((commit "5a7f0f2cb401be0b09e73262a1c18265ab9a3cea")) (package (name "emacs-helm-clojuredocs") - (version (git-version "0.3" "1" commit)) + (version (make-git-version "0.3" "1" commit)) (home-page "https://github.com/mbuczko/helm-clojuredocs") (source (origin (method git-fetch) @@ -40568,7 +40571,7 @@ (define-public emacs-helm-wordnut (let ((commit "9681a9535a839cd5d042c302945ae595852fe7bf")) (package (name "emacs-helm-wordnut") - (version (git-version "0.1" "1" commit)) + (version (make-git-version "0.1" "1" commit)) (home-page "https://github.com/emacs-helm/helm-wordnut") (source (origin @@ -40633,7 +40636,7 @@ (define-public emacs-helm-css-scss (revision "0")) (package (name "emacs-helm-css-scss") - (version (git-version "1.3" revision commit)) + (version (make-git-version "1.3" revision commit)) (source (origin (method git-fetch) @@ -40661,7 +40664,7 @@ (define-public emacs-metal-mercury-mode (version "0.0.0")) (package (name "emacs-metal-mercury-mode") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -40794,7 +40797,7 @@ (define-public emacs-mwim (revision "0")) (package (name "emacs-mwim") - (version (git-version "0.4" revision commit)) + (version (make-git-version "0.4" revision commit)) (source (origin (method git-fetch) @@ -40838,7 +40841,7 @@ (define-public emacs-unkillable-scratch (revision "0")) (package (name "emacs-unkillable-scratch") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -40909,7 +40912,7 @@ (define-public emacs-dmenu (revision "0")) (package (name "emacs-dmenu") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -40984,7 +40987,7 @@ (define-public emacs-message-x (revision "0")) (package (name "emacs-message-x") - (version (git-version "1.23" revision commit)) + (version (make-git-version "1.23" revision commit)) (source (origin (method git-fetch) @@ -41012,7 +41015,7 @@ (define-public emacs-gleam-mode (revision "0")) (package (name "emacs-gleam-mode") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -41035,7 +41038,7 @@ (define-public emacs-glsl-mode (revision "0")) (package (name "emacs-glsl-mode") - (version (git-version "2.4" revision commit)) + (version (make-git-version "2.4" revision commit)) (source (origin (method git-fetch) @@ -41060,7 +41063,7 @@ (define-public emacs-gnus-harvest (revision "0")) (package (name "emacs-gnus-harvest") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -41121,7 +41124,7 @@ (define-public emacs-persid (revision "2")) (package (name "emacs-persid") - (version (git-version "0.1.1" revision commit)) + (version (make-git-version "0.1.1" revision commit)) (source (origin (method git-fetch) @@ -41404,7 +41407,7 @@ (define-public emacs-weblorg (revision "0")) (package (name "emacs-weblorg") - (version (git-version "0.1.2" revision commit)) + (version (make-git-version "0.1.2" revision commit)) (source (origin (method git-fetch) @@ -41434,7 +41437,7 @@ (define-public emacs-ddskk (revision "0")) (package (name "emacs-ddskk") - (version (git-version "17.1" revision commit)) + (version (make-git-version "17.1" revision commit)) (source (origin (method git-fetch) @@ -41560,7 +41563,7 @@ (define-public emacs-haskell-snippets (let ((commit "1c29c4a68ce89848b8d371c6510d1de3b586c8b3")) (package (name "emacs-haskell-snippets") - (version (git-version "0.1.0" "1" commit)) + (version (make-git-version "0.1.0" "1" commit)) (source (origin (method git-fetch) @@ -41599,7 +41602,7 @@ (define-public emacs-orca (revision "0")) (package (name "emacs-orca") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -41815,7 +41818,7 @@ (define-public emacs-org-roam-bibtex (revision "0")) (package (name "emacs-org-roam-bibtex") - (version (git-version "0.6.2" revision commit)) + (version (make-git-version "0.6.2" revision commit)) (source (origin (method git-fetch) @@ -41874,7 +41877,7 @@ (define-public emacs-org-glossary (revision "0")) (package (name "emacs-org-glossary") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -41939,7 +41942,7 @@ (define-public emacs-uml-mode (revision "1")) (package (name "emacs-uml-mode") - (version (git-version "0.0.4" revision commit)) + (version (make-git-version "0.0.4" revision commit)) (source (origin (method git-fetch) @@ -41986,7 +41989,7 @@ (define-public emacs-ukrainian-holidays (commit "e52b0c92843e9f4d0415a7ba3b8559785497d23d")) (package (name "emacs-ukrainian-holidays") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -42228,7 +42231,7 @@ (define-public emacs-shell-pop (revision "0")) (package (name "emacs-shell-pop") - (version (git-version "0.64" revision commit)) + (version (make-git-version "0.64" revision commit)) (source (origin (method git-fetch) @@ -42253,7 +42256,7 @@ (define-public emacs-shell-here (revision "1")) (package (name "emacs-shell-here") - (version (git-version "1.3" revision commit)) + (version (make-git-version "1.3" revision commit)) (source (origin (method git-fetch) @@ -42277,7 +42280,7 @@ (define-public emacs-hyperspace (revision "1")) (package (name "emacs-hyperspace") - (version (git-version "0.8.5" revision commit)) + (version (make-git-version "0.8.5" revision commit)) (source (origin (method git-fetch) @@ -42304,7 +42307,7 @@ (define-public emacs-nssh (revision "1")) (package (name "emacs-nssh") - (version (git-version "0.9.12" revision commit)) + (version (make-git-version "0.9.12" revision commit)) (source (origin (method git-fetch) @@ -42329,7 +42332,7 @@ (define-public emacs-tshell (revision "0")) (package (name "emacs-tshell") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -42433,7 +42436,7 @@ (define-public emacs-highlight (revision "2")) (package (name "emacs-highlight") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -42567,7 +42570,7 @@ (define-public emacs-company-org-block (revision "1")) (package (name "emacs-company-org-block") - (version (git-version "0.3" revision commit)) + (version (make-git-version "0.3" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -42593,7 +42596,7 @@ (define-public emacs-html-to-hiccup (revision "0")) (package (name "emacs-html-to-hiccup") - (version (git-version "1" revision commit)) + (version (make-git-version "1" revision commit)) (source (origin (method git-fetch) @@ -42646,7 +42649,7 @@ (define-public emacs-bind-map (revision "0")) (package (name "emacs-bind-map") - (version (git-version "1.1.2" revision commit)) + (version (make-git-version "1.1.2" revision commit)) (source (origin (method git-fetch) @@ -42699,7 +42702,7 @@ (define-public emacs-spaceleader (revision "1")) (package (name "emacs-spaceleader") - (version (git-version "0.0.3" revision commit)) + (version (make-git-version "0.0.3" revision commit)) (source (origin (method git-fetch) @@ -42800,7 +42803,7 @@ (define-public emacs-promise (revision "1")) (package (name "emacs-promise") - (version (git-version "1.1" revision commit)) + (version (make-git-version "1.1" revision commit)) (source (origin (method git-fetch) @@ -42851,7 +42854,7 @@ (define-public emacs-rocket-chat (let ((commit "96fe27a8678de5ae4061f635108a7192eee13f98")) (package (name "emacs-rocket-chat") - (version (git-version "0.0.0" "1" commit)) + (version (make-git-version "0.0.0" "1" commit)) (source (origin (method git-fetch) @@ -42902,7 +42905,7 @@ (define-public emacs-xonsh-mode (revision "0")) (package (name "emacs-xonsh-mode") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -42971,7 +42974,7 @@ (define-public emacs-weyland-yutani-theme (revision "0")) (package (name "emacs-weyland-yutani-theme") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -42993,7 +42996,7 @@ (define-public emacs-janet-mode (let ((commit "2f5bcabcb6953e1ed1926ba6a2328c453e8b4ac7")) (package (name "emacs-janet-mode") - (version (git-version "0.1.0" "1" commit)) + (version (make-git-version "0.1.0" "1" commit)) (source (origin (method git-fetch) @@ -43014,7 +43017,7 @@ (define-public emacs-inf-janet (let ((commit "df46651d3aad32593b2195c80ca91fb64d571fb7")) (package (name "emacs-inf-janet") - (version (git-version "0.1.0" "1" commit)) + (version (make-git-version "0.1.0" "1" commit)) (source (origin (method git-fetch) @@ -43180,7 +43183,7 @@ (define-public emacs-webpaste (revision "1")) (package (name "emacs-webpaste") - (version (git-version "3.2.2" revision commit)) + (version (make-git-version "3.2.2" revision commit)) (source (origin (method git-fetch) @@ -43226,7 +43229,7 @@ (define-public emacs-keystore-mode (commit "43bd5926348298d077c7221f37902c990df3f951")) (package (name "emacs-keystore-mode") - (version (git-version release revision commit)) + (version (make-git-version release revision commit)) (home-page "https://github.com/peterpaul/keystore-mode") (source (origin @@ -43437,7 +43440,7 @@ (define-public emacs-lexic (revision "0")) (package (name "emacs-lexic") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -43625,7 +43628,7 @@ (define-public emacs-seeing-is-believing (package (name "emacs-seeing-is-believing") (home-page "https://github.com/jcinnamond/seeing-is-believing") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -43697,7 +43700,7 @@ (define-public emacs-riscv-mode (revision "1")) (package (name "emacs-riscv-mode") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -43779,7 +43782,7 @@ (define-public emacs-global-tags (revision "0")) (package (name "emacs-global-tags") - (version (git-version "0.7" revision commit)) + (version (make-git-version "0.7" revision commit)) (home-page "https://git.launchpad.net/global-tags.el/") (source (origin (method git-fetch) @@ -43922,7 +43925,7 @@ (define-public emacs-ed-mode (revision "0")) (package (name "emacs-ed-mode") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -44044,7 +44047,7 @@ (define-public emacs-org-margin (revision "0")) (package (name "emacs-org-margin") - (version (git-version "0.2.0" revision commit)) + (version (make-git-version "0.2.0" revision commit)) (source (origin (method git-fetch) @@ -44083,7 +44086,7 @@ (define-public emacs-pyimport (revision "0")) (package (name "emacs-pyimport") - (version (git-version "1.1" revision commit)) + (version (make-git-version "1.1" revision commit)) (source (origin (method git-fetch) @@ -44120,7 +44123,7 @@ (define-public emacs-straight (revision "4")) (package (name "emacs-straight") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -44235,7 +44238,7 @@ (define-public emacs-corfu-doc-terminal (revision "0")) (package (name "emacs-corfu-doc-terminal") - (version (git-version "0.9" revision commit)) + (version (make-git-version "0.9" revision commit)) (source (origin (method git-fetch) @@ -44308,7 +44311,7 @@ (define-public emacs-consult-projectile (revision "1")) (package (name "emacs-consult-projectile") - (version (git-version "0.7" revision commit)) + (version (make-git-version "0.7" revision commit)) (source (origin (method git-fetch) @@ -44357,7 +44360,7 @@ (define-public emacs-purs-mode (revision "1")) (package (name "emacs-purs-mode") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -44380,7 +44383,7 @@ (define-public emacs-pdb-capf (revision "0")) (package (name "emacs-pdb-capf") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -44428,7 +44431,7 @@ (define-public emacs-vunit-mode (revision "0")) (package (name "emacs-vunit-mode") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -44497,7 +44500,7 @@ (define-public emacs-hare-mode (revision "0")) (package (name "emacs-hare-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 @@ -44519,7 +44522,7 @@ (define-public emacs-org-cliplink (revision "0")) (package (name "emacs-org-cliplink") - (version (git-version "0.2" revision commit)) + (version (make-git-version "0.2" revision commit)) (source (origin (method git-fetch) @@ -44610,7 +44613,7 @@ (define-public emacs-mpv (revision "0")) (package (name "emacs-mpv") - (version (git-version "0.2.0" revision commit)) + (version (make-git-version "0.2.0" revision commit)) (source (origin (method git-fetch) @@ -44646,7 +44649,7 @@ (define-public emacs-apel-lb (commit "1a6fd3bab2cc6b0a450c2d801f77a1c9da0f72fb")) (package (name "emacs-apel-lb") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -44672,7 +44675,7 @@ (define-public emacs-flim-lb (revision "147")) (package (name "emacs-flim-lb") - (version (git-version "1.14.9" revision commit)) + (version (make-git-version "1.14.9" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -44731,7 +44734,7 @@ (define-public emacs-semi-epg (revision "250")) (package (name "emacs-semi-epg") - (version (git-version "1.14.6" revision commit)) + (version (make-git-version "1.14.6" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -44759,7 +44762,7 @@ (define-public emacs-wallabag (revision "1")) (package (name "emacs-wallabag") - (version (git-version "1.1.0" revision commit)) + (version (make-git-version "1.1.0" revision commit)) (source (origin (method git-fetch) @@ -44785,7 +44788,7 @@ (define-public emacs-wanderlust (revision "846")) (package (name "emacs-wanderlust") - (version (git-version "2.15.9" revision commit)) + (version (make-git-version "2.15.9" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -44882,7 +44885,7 @@ (define-public emacs-waveform (revision "0")) (package (name "emacs-waveform") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -44919,7 +44922,7 @@ (define-public emacs-project-x (commit "eafc9828f54dddd594887bb28a7249cf1584230c")) (package (name "emacs-project-x") - (version (git-version "0.1.6" revision commit)) + (version (make-git-version "0.1.6" revision commit)) (source (origin (method git-fetch) @@ -44965,7 +44968,7 @@ (define-public emacs-vcard-mode (package (name "emacs-vcard-mode") (home-page "https://github.com/dochang/vcard-mode") - (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 @@ -45013,7 +45016,7 @@ (define-public emacs-transient-posframe (revision "0")) (package (name "emacs-transient-posframe") - (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 @@ -45079,7 +45082,7 @@ (define-public emacs-tintin-mode (revision "1")) (package (name "emacs-tintin-mode") - (version (git-version "1.0.1" revision commit)) + (version (make-git-version "1.0.1" revision commit)) (source (origin (method git-fetch) @@ -45147,7 +45150,7 @@ (define-public emacs-x509-mode (revision "1")) (package (name "emacs-x509-mode") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -45188,7 +45191,7 @@ (define-public emacs-totp (package (name "emacs-totp") (home-page "https://github.com/juergenhoetzel/emacs-totp") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 566601b9218..4c4f4b77423 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -631,7 +631,7 @@ (define-public emacs-next-minimal (package (inherit emacs-minimal) (name "emacs-next-minimal") - (version (git-version "31.0.50" revision commit)) + (version (make-git-version "31.0.50" revision commit)) (source (origin (inherit (package-source emacs-minimal)) @@ -677,7 +677,7 @@ (define-public guile-emacs (package (inherit emacs) (name "guile-emacs") - (version (git-version upstream-version revision commit)) + (version (make-git-version upstream-version revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index 73a8797aabe..8442661d84f 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -447,7 +447,7 @@ (define make-base-newlib-arm-none-eabi-7-2018-q2-update (revision "0")) (package (inherit base) - (version (git-version "3.0.0" revision commit)) + (version (make-git-version "3.0.0" revision commit)) (source (origin (method git-fetch) @@ -491,7 +491,7 @@ (define make-gcc-arm-none-eabi-9-2020-q2-update (commit "13861a80750d118fbdca6006ab175903bacbb7ec") (revision "1")) (package (inherit xgcc) - (version (git-version "9-2020-q2-update" revision commit)) + (version (make-git-version "9-2020-q2-update" revision commit)) (source (origin (inherit (package-source xgcc)) @@ -586,7 +586,7 @@ (define make-base-newlib-arm-none-eabi-9-2020-q2-update (revision "0")) (package (inherit base) - (version (git-version "3.3.0" revision commit)) + (version (make-git-version "3.3.0" revision commit)) (source (origin (method git-fetch) @@ -671,7 +671,7 @@ (define make-base-newlib-arm-none-eabi-12.3.rel1 (revision "0")) (package (inherit base) - (version (git-version "4.3.0" revision commit)) + (version (make-git-version "4.3.0" revision commit)) (source (origin (method git-fetch) @@ -1517,7 +1517,7 @@ (define-public imx-usb-loader (package (name "imx-usb-loader") ;; For the version string, see IMX_LOADER_VERSION in imx_loader.h. - (version (git-version "0.2pre" revision commit)) + (version (make-git-version "0.2pre" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -2064,7 +2064,7 @@ (define-public agent-proxy (revision "0")) (package (name "agent-proxy") - (version (git-version "1.98" revision commit)) + (version (make-git-version "1.98" revision commit)) (home-page "https://git.kernel.org/pub/scm/utils/kernel/kgdb/agent-proxy.git") (source (origin @@ -2155,7 +2155,7 @@ (define-public ts4900-utils (commit "e10a12f8050d1d1229e711c7cfab8a0d5d93ee58")) (package (name "ts4900-utils") - (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/emulators.scm b/gnu/packages/emulators.scm index f2a1d4811db..814a57e7dc9 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -330,7 +330,7 @@ (define-public dolphin-emu (revision "13669")) (package (name "dolphin-emu") - (version (git-version "5.0" revision commit)) + (version (make-git-version "5.0" revision commit)) (source (origin (method git-fetch) @@ -543,7 +543,7 @@ (define-public libretro-dolphin-emu (package (inherit dolphin-emu) (name "libretro-dolphin-emu") - (version (git-version "5.0" revision commit)) + (version (make-git-version "5.0" revision commit)) (source (origin (inherit (package-source dolphin-emu)) (method git-fetch) @@ -747,7 +747,7 @@ (define-public emulation-station (revision "1")) (package (name "emulation-station") - (version (git-version "2.0.1" revision commit)) + (version (make-git-version "2.0.1" revision commit)) (source (origin (method git-fetch) ; no tarball available (uri (git-reference @@ -783,7 +783,7 @@ (define-public higan (revision "0")) (package (name "higan") - (version (git-version "110" revision commit)) + (version (make-git-version "110" revision commit)) (source (origin (method git-fetch) @@ -1571,7 +1571,7 @@ (define-public mupen64plus-video-gliden64 (revision "0")) (package (name "mupen64plus-video-gliden64") - (version (git-version "4.0" revision commit)) + (version (make-git-version "4.0" revision commit)) (source (origin (method git-fetch) @@ -1676,7 +1676,7 @@ (define (make-libretro-beetle-psx name hw) (package (name name) ;; Use Mednafen core version as base. Defined in libretro_options.h:10 - (version (git-version "0.9.44.1" revision commit)) + (version (make-git-version "0.9.44.1" revision commit)) (source (origin (method git-fetch) @@ -1762,7 +1762,7 @@ (define-public libretro-mupen64plus-nx (revision "0")) (package (name "libretro-mupen64plus-nx") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1779,7 +1779,7 @@ (define-public libretro-mupen64plus-nx #:make-flags #~(list (string-append "CC=" #$(cc-for-target)) (string-append "CXX=" #$(cxx-for-target)) - (string-append "GIT_VERSION=" #$version) + (string-append "GIT_VERSION=" #$(package-version this-package)) (string-append "PREFIX=" #$output) "LLE=1" "HAVE_THR_AL=1" ;for the angrylion video plugin @@ -1940,7 +1940,7 @@ (define-public libretro-slang-shaders (revision "0")) (package (name "libretro-slang-shaders") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -3461,7 +3461,7 @@ (define-public bsnes (revision "0")) (package (name "bsnes") - (version (git-version "115" revision commit)) + (version (make-git-version "115" revision commit)) (source (origin (method git-fetch) @@ -3510,7 +3510,7 @@ (define-public bsnes-hd (name "bsnes-hd") ;; As of 10.6, there only ever was beta releases -- treat these as the ;; stable releases for now. - (version (git-version "10.6" revision commit)) + (version (make-git-version "10.6" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -3736,7 +3736,7 @@ (define-public libretro-beetle-gba (package (name "libretro-beetle-gba") ;; Use Mednafen core version as base. Defined in libretro.cpp:73. - (version (git-version "0.9.36" revision commit)) + (version (make-git-version "0.9.36" revision commit)) (source (origin (method git-fetch) @@ -3769,7 +3769,7 @@ (define-public libretro-bsnes-jg (package (inherit jg-bsnes) (name "libretro-bsnes-jg") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (inherit (package-source jg-bsnes)) (uri (git-reference @@ -3782,7 +3782,8 @@ (define-public libretro-bsnes-jg (arguments (substitute-keyword-arguments (package-arguments jg-bsnes) ((#:make-flags flags) - #~(cons* #$(string-append "GIT_VERSION=" version) + #~(cons* #$(string-append "GIT_VERSION=" + (package-version this-package)) (string-append "prefix=" #$output) #$flags)) ((#:phases phases) @@ -4223,7 +4224,7 @@ (define-public freedisksysrom (revision "0")) (package (name "freedisksysrom") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -4325,7 +4326,7 @@ (define-public uxn (revision "1")) (package (name "uxn") - (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 @@ -4454,7 +4455,7 @@ (define-public emu8051 (revision "1")) (package (name "emu8051") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 45b9b2a996a..d9fd0bf973e 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -193,7 +193,7 @@ (define-public aacircuit (revision "0")) (package (name "aacircuit") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -911,7 +911,7 @@ (define-public fritzing-parts (revision "0")) (package (name "fritzing-parts") - (version (git-version "0.9.6" revision commit)) + (version (make-git-version "0.9.6" revision commit)) (source (origin (method git-fetch) @@ -1081,7 +1081,7 @@ (define-public translate2geda (revision "2")) (package (name "translate2geda") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1128,7 +1128,7 @@ (define-public libfive (revision "5")) (package (name "libfive") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1235,7 +1235,7 @@ (define-public inspekt3d (revision "0")) (package (name "inspekt3d") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1506,7 +1506,7 @@ (define-public librseq (revision "2")) (package (name "librseq") - (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 @@ -2060,7 +2060,7 @@ (define-public audmes (uri (git-reference (url "https://github.com/ben-strasser/fast-cpp-csv-parser") (commit commit))) - (file-name (git-file-name "csv.h" (git-version "0" "0" commit))) + (file-name (git-file-name "csv.h" (make-git-version "0" "0" commit))) (sha256 (base32 "1y7ads97gkrjg1jc532n8gmjry0qhqxginw1gq7b4lk9s0pyl540")))))) @@ -3014,7 +3014,7 @@ (define-public manifold (revision "0")) (package (name "manifold") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -3279,7 +3279,7 @@ (define-public openscad (revision "0")) (package (name "openscad") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -3308,7 +3308,7 @@ (define-public openscad "-DEXPERIMENTAL=ON" "-DENABLE_PYTHON=ON" (string-append "-DOPENSCAD_VERSION=" - #$version) + #$(package-version this-package)) (string-append "-DOPENSCAD_COMMIT=" #$commit) "-DENABLE_EGL=ON" @@ -3494,7 +3494,7 @@ (define-public ondsel-solver (package (name "ondsel-solver") ;; There's no tagged release - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -3739,7 +3739,7 @@ (define-public libarea (commit "8f8bac811c10f1f01fda0d742a18591f61dd76ee")) (package (name "libarea") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -4036,7 +4036,7 @@ (define-public pcb2gcode (revision "0")) (package (name "pcb2gcode") - (version (git-version "2.5.0" revision commit)) + (version (make-git-version "2.5.0" revision commit)) (source (origin (method git-fetch) @@ -4175,7 +4175,7 @@ (define-public syscall-intercept (revision "0")) (package (name "syscall-intercept") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -4488,7 +4488,7 @@ (define (fix-external-library cmake source) ("libigl-glad" ,(let* ((commit "ead2d21fd1d9f566d8f9a9ce99ddf85829258c7a") (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 @@ -4509,7 +4509,7 @@ (define (fix-external-library cmake source) ("libigl-predicates" ,(let* ((commit "50c2149e7a520d13cd10e9aeff698bd68edd5a4f") (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 @@ -4522,7 +4522,7 @@ (define (fix-external-library cmake source) ("libigl-tetgen" ,(let* ((commit "4f3bfba3997f20aa1f96cfaff604313a8c2c85b6") (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 @@ -4534,7 +4534,7 @@ (define (fix-external-library cmake source) ("libigl-comiso" ,(let* ((commit "562efe333edc8e649dc101469614f43378b1eb55") (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 @@ -4578,7 +4578,7 @@ (define-public prusa-libbgcode (revision "0")) (package (name "prusa-libbgcode") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -4875,7 +4875,7 @@ (define-public udis86 (revision "0")) (package (name "udis86") - (version (git-version "1.7.2" revision commit)) + (version (make-git-version "1.7.2" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -5170,7 +5170,7 @@ (define-public xschem (revision "1")) (package (name "xschem") - (version (git-version "3.0.0" revision commit)) + (version (make-git-version "3.0.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -5279,7 +5279,7 @@ (define-public candle (revision "1")) (package (name "candle") - (version (git-version "1.2b" revision commit)) + (version (make-git-version "1.2b" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -5589,7 +5589,7 @@ (define-public orocos-kinematics-dynamics (revision "0")) (package (name "orocos-kinematics-dynamics") - (version (git-version "1.5.2" revision commit)) + (version (make-git-version "1.5.2" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/erlang.scm b/gnu/packages/erlang.scm index 0e606085d4a..052285f0c28 100644 --- a/gnu/packages/erlang.scm +++ b/gnu/packages/erlang.scm @@ -294,7 +294,7 @@ (define-public erlang-yamerl (revision "0")) (package (name "erlang-yamerl") - (version (git-version "0.10.0" revision commit)) + (version (make-git-version "0.10.0" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/esolangs.scm b/gnu/packages/esolangs.scm index 2f84688f9ad..be897a4e882 100644 --- a/gnu/packages/esolangs.scm +++ b/gnu/packages/esolangs.scm @@ -68,7 +68,7 @@ (define-public lolcode-lci (revision "0")) (package (name "lolcode-lci") - (version (git-version "0.11.2" revision commit)) + (version (make-git-version "0.11.2" revision commit)) (source (origin (method git-fetch) From patchwork Sat Jul 26 02:39:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43275 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 8718A27BC4C; Sat, 26 Jul 2025 03:42:43 +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 2104B27BC49 for ; Sat, 26 Jul 2025 03:42:42 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufUqw-0000RF-7M; Fri, 25 Jul 2025 22:41:38 -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 1ufUqu-0000Ox-7o for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:36 -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 1ufUqt-0005Sj-UG for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:35 -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=nPGXKnjqwddxwaDXuIj5KVrY4zGDCuYBkrUrErlzeiw=; b=F/fKHNwPddP7qWvNH83KlE5QlNokHCCIIKN1PMKh1M1oGnxR3P1sPGVEBO3J1V+nNWclQGz5TlBLHnD2XOxaSWqJS1PGuBGn477W0c0rm/WdGta6TqjOtYkEksyXXzOBIsfZEM32Eizb2tZW9DnDtkFhdKi37PkzkLxnw/swc58S87LaAIj/X08s7be3uKhNm7lj16gxMfxwR7vbUFZCEhfydMDITQDfFxwGVZyhzKvVLb9HNo22jW27dY3FocVm1UW5anuZ9YmuQOFHX9TK4H2spKAj9VqtmW21LZvxjC8vxxds2Wq4SwDGPIDDuyeMUxiZ1WfXrSiWCQe+NMdU1Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ufUqt-0007vg-Ms for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:35 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79099] [PATCH 15/34] gnu/packages/f*.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:35 +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.175349769030437 (code B ref 79099); Sat, 26 Jul 2025 02:41:35 +0000 Received: (at 79099) by debbugs.gnu.org; 26 Jul 2025 02:41:30 +0000 Received: from localhost ([127.0.0.1]:38148 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ufUqm-0007uf-In for submit@debbugs.gnu.org; Fri, 25 Jul 2025 22:41:29 -0400 Received: from 3.mo563.mail-out.ovh.net ([46.105.40.8]:53323) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ufUpZ-0007fT-Ev for 79099@debbugs.gnu.org; Fri, 25 Jul 2025 22:40:41 -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 4bppqw0ZTpz6NdN; Sat, 26 Jul 2025 02:40:12 +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:11 +0000 (UTC) Received: from mta2.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.101.172]) by director3.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bppqv63chz5xQH; Sat, 26 Jul 2025 02:40:11 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.7]) by mta2.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 87D323E3062; Sat, 26 Jul 2025 02:40:11 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-100R00347c913ea-ba63-41b0-bda9-5d803f2a52c1, 7BFD41D65738CBEA4850BE66907D66307393418F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sat, 26 Jul 2025 04:39:21 +0200 Message-ID: <20250726023951.11862-15-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: 4614782246857925346 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdekhedvfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeffkefghfektddtgfekgeefieefvdegjeehhfeflefgtdeggeelveeivdegueefvdenucffohhmrghinhepghhithhlrggsrdgtohhmnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledtleelseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehieefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=nPGXKnjqwddxwaDXuIj5KVrY4zGDCuYBkrUrErlzeiw=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1753497612; v=1; b=WrNJUHs/wziiKXAIYEQShGK+Zc5GneBP6nyh4h3MGY5KxMcZvbq/eyhUokiyDhwgn14WddGI 0e8PojPvweKv4WXrZOMtGkp7juymCdR9jYQnzzXatFYFCik/gpG1LY/hjQvUjq+MPaIGuI36Lbb clbklbME3u8K3jO70DtiM23hIXGZlrxlqXb5Mm0g1wIgTJ1t4CCtdbYgoCvznu3ZP1NsXLftXv5 YfWj0hjVuZp1Y0XZerSdSF1H2+ePWtp6hvITkb+ul+jt4L1Z0ybem/5htrR2cQ/avJXCSkovYxt PFvnjUpKWR7kyOfprb8Spl/vtw/qxhfqKTBRj4bQJgU3A== 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 "f*.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/file-systems.scm | 15 +++++++++------ gnu/packages/finance.scm | 8 ++++---- gnu/packages/firmware.scm | 8 ++++---- gnu/packages/flashing-tools.scm | 6 +++--- gnu/packages/fonts.scm | 34 ++++++++++++++++----------------- gnu/packages/fontutils.scm | 2 +- gnu/packages/fpga.scm | 14 +++++++------- gnu/packages/freedesktop.scm | 14 +++++++------- 8 files changed, 52 insertions(+), 49 deletions(-) diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 8b0ccb5a6fd..b31c8543649 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -1429,7 +1429,7 @@ (define-public apfs-fuse (revision "2")) (package (name "apfs-fuse") - (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 @@ -1451,7 +1451,9 @@ (define-public apfs-fuse (bin (string-append out "/bin")) (lib (string-append out "/lib")) (doc (string-append out "/share/doc/" - (string-append ,name "-" ,version)))) + (string-append ,name "-" + ,(package-version + this-package))))) (install-file "apfs-dump" bin) (install-file "apfs-dump-quick" bin) (install-file "apfs-fuse" bin) @@ -1550,7 +1552,7 @@ (define-public xfstests (commit "8de535c53887bb49adae74a1b2e83e77d7e8457d")) (package (name "xfstests") - (version (git-version "1.1.0" revision commit)) + (version (make-git-version "1.1.0" revision commit)) (source (origin (method git-fetch) @@ -1996,7 +1998,7 @@ (define-public mergerfs-tools (package (name "mergerfs-tools") ;; No released version exists. - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -2087,7 +2089,7 @@ (define-public rewritefs (commit "3a56de8b5a2d44968b8bc3885c7d661d46367306")) (package (name "rewritefs") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -2114,7 +2116,8 @@ (define-public rewritefs (add-after 'install 'install-examples (lambda _ (let ((doc (string-append #$output "/share/doc/" - #$name "-" #$version))) + #$name "-" + #$(package-version this-package)))) (for-each (cut install-file <> (string-append doc "/examples")) (find-files "." "^config\\.")))))))) (native-inputs diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index c8c0465b4a5..35dcf8f388e 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -420,7 +420,7 @@ (define-public emacs-ledger-mode (revision "1")) (package (name "emacs-ledger-mode") - (version (git-version "4.0.0" revision commit)) + (version (make-git-version "4.0.0" revision commit)) (source (origin (method git-fetch) @@ -485,7 +485,7 @@ (define-public emacs-hledger-mode (revision "1")) (package (name "emacs-hledger-mode") - (version (git-version "20220515" revision commit)) + (version (make-git-version "20220515" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1553,7 +1553,7 @@ (define-public gbonds (commit "3054ee2f90cc7c03ed6b131177d09701c7a4fced")) (package (name "gbonds") - (version (git-version "2.0.3" revision commit)) + (version (make-git-version "2.0.3" revision commit)) (source (let ((unapplied (origin @@ -1666,7 +1666,7 @@ (define-public trezord-udev-rules (revision "0")) (package (name "trezord-udev-rules") - (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/firmware.scm b/gnu/packages/firmware.scm index bcb30ec399b..a18b2461612 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -161,7 +161,7 @@ (define-public b43-tools (revision "1")) (package (name "b43-tools") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -496,7 +496,7 @@ (define* (make-openbios-package name arch) (revision "1")) (package (name name) - (version (git-version "1.1" revision commit)) + (version (make-git-version "1.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -836,7 +836,7 @@ (define-public sgabios (revision "0")) (package (name "sgabios") - (version (git-version "0.0" revision commit)) + (version (make-git-version "0.0" revision commit)) (home-page "https://gitlab.com/qemu-project/sgabios") (source (origin (method git-fetch) @@ -1420,7 +1420,7 @@ (define* (make-ergodox-firmware/implementation layout #:key override.c (commit "89b7e2bfdafb2a87e0248846d5c95cc5e9a27858")) (package (name (string-append "ergodox-firmware-" layout)) - (version (git-version "1" revision commit)) + (version (make-git-version "1" revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm index fa9d88b30c0..70ba07a8a65 100644 --- a/gnu/packages/flashing-tools.scm +++ b/gnu/packages/flashing-tools.scm @@ -314,7 +314,7 @@ (define-public rkflashtool (revision "1")) (package (name "rkflashtool") - (version (git-version "5.2" revision commit)) + (version (make-git-version "5.2" revision commit)) (source (origin (method git-fetch) @@ -646,7 +646,7 @@ (define-public wally-cli (revision "0")) (package (name "wally-cli") - (version (git-version "2.0.1" revision commit)) + (version (make-git-version "2.0.1" revision commit)) (source (origin (method git-fetch) @@ -691,7 +691,7 @@ (define-public qdl (revision "1")) (package (name "qdl") - (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/fonts.scm b/gnu/packages/fonts.scm index 82d4d044bb6..3848bc51882 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -138,7 +138,7 @@ (define-public font-arapey (revision "1")) (package (name "font-arapey") - (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 @@ -206,7 +206,7 @@ (define-public font-chivo (revision "0")) (package (name "font-chivo") - (version (git-version "20221010" revision commit)) + (version (make-git-version "20221010" revision commit)) (source (origin (method git-fetch) @@ -278,7 +278,7 @@ (define-public font-lisnoti (revision "1")) (package (name "font-lisnoti") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -428,7 +428,7 @@ (define-public font-abattis-cantarell (revision "0")) (package (name "font-abattis-cantarell") - (version (git-version "0.303" revision commit)) + (version (make-git-version "0.303" revision commit)) (source (origin (method git-fetch) @@ -462,7 +462,7 @@ (define-public font-atkinson-hyperlegible (revision "0")) (package (name "font-atkinson-hyperlegible") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -505,7 +505,7 @@ (define-public font-carlito (revision "1")) (package (name "font-carlito") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -728,7 +728,7 @@ (define-public font-libre-franklin (revision "1")) (package (name "font-libre-franklin") - (version (git-version "1.502" revision commit)) + (version (make-git-version "1.502" revision commit)) (source (origin (method git-fetch) @@ -2651,7 +2651,7 @@ (define-public font-go (revision "2")) (package (name "font-go") - (version (git-version "2.010" revision commit)) + (version (make-git-version "2.010" revision commit)) (source (origin (method git-fetch) @@ -3038,7 +3038,7 @@ (define-public font-paytone-one (revision "0")) (package (name "font-paytone-one") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -3294,7 +3294,7 @@ (define-public font-dongle (revision "1")) (package (name "font-dongle") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -3671,7 +3671,7 @@ (define-public font-hachimarupop (revision "0")) (package (name "font-hachimarupop") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -3761,7 +3761,7 @@ (define-public font-catamaran (revision "1")) (package (name "font-catamaran") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -4063,7 +4063,7 @@ (define-public font-atui-feather (revision "1")) (package (name "font-atui-feather") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -4358,7 +4358,7 @@ (define-public font-velvetyne-jgs (commit "b1fe344c6ab4cb97aa9ceb09ba3b6056f826b040")) (package (name "font-velvetyne-jgs") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -4444,7 +4444,7 @@ (define-public font-orbitron (revision "0")) (package (name "font-orbitron") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -4471,7 +4471,7 @@ (define-public font-oswald (revision "0")) (package (name "font-oswald") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -4499,7 +4499,7 @@ (define-public font-teko (revision "0")) (package (name "font-teko") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 9b0dfa94790..82dca937d3f 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -824,7 +824,7 @@ (define-public psautohint-font-data (hidden-package (package (name "psautohint-font-data") - (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/fpga.scm b/gnu/packages/fpga.scm index 805983f6c7f..0130ede9b72 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -95,7 +95,7 @@ (define-public abc (revision "5")) (package (name "abc") - (version (git-version "0.0" revision commit)) + (version (make-git-version "0.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -303,7 +303,7 @@ (define-public icestorm (revision "5")) (package (name "icestorm") - (version (git-version "0.0" revision commit)) + (version (make-git-version "0.0" revision commit)) (source (origin (method git-fetch) @@ -368,7 +368,7 @@ (define-public libfst (revision "0")) (package (name "libfst") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -512,7 +512,7 @@ (define-public gtkwave (package (name "gtkwave") ;; The version string can be found in meson.build. - (version (git-version "3.4.0" revision commit)) + (version (make-git-version "3.4.0" revision commit)) (source (origin (method git-fetch) @@ -547,7 +547,7 @@ (define-public python-migen (revision "0")) (package (name "python-migen") - (version (git-version "0.9.2" revision commit)) + (version (make-git-version "0.9.2" revision commit)) (source (origin ;; Tests fail in the PyPI tarball due to missing files. @@ -790,7 +790,7 @@ (define-public fftgen (revision "0")) (package (name "fftgen") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -868,7 +868,7 @@ (define-public python-hdlmake (revision "2")) (package (name "python-hdlmake") - (version (git-version "3.3" revision commit)) + (version (make-git-version "3.3" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 7f50cb0acd7..a9419d7aa2f 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -561,7 +561,7 @@ (define xdgmime (revision "2")) (package (name "xdgmime") - (version (git-version "0.0" revision commit)) + (version (make-git-version "0.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -672,7 +672,7 @@ (define-public xdgcpp (revision "0")) (package (name "xdgcpp") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -1819,7 +1819,7 @@ (define-public wlr-protocols (revision "0")) (package (name "wlr-protocols") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -2286,7 +2286,7 @@ (define-public telepathy-gabble (revision "1")) (package (name "telepathy-gabble") - (version (git-version "0.18.4" revision commit)) + (version (make-git-version "0.18.4" revision commit)) (source (origin (method git-fetch) @@ -2365,7 +2365,7 @@ (define-public telepathy-logger (revision "0")) (package (name "telepathy-logger") - (version (git-version "0.8.2" revision commit)) + (version (make-git-version "0.8.2" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -2429,7 +2429,7 @@ (define-public telepathy-idle (revision "0")) (package (name "telepathy-idle") - (version (git-version "0.2.2" revision commit)) + (version (make-git-version "0.2.2" revision commit)) (source (origin (method git-fetch) @@ -2487,7 +2487,7 @@ (define-public telepathy-salut (revision "1")) (package (name "telepathy-salut") - (version (git-version "0.8.1" revision commit)) + (version (make-git-version "0.8.1" revision commit)) (source (origin (method git-fetch) From patchwork Sat Jul 26 02:39:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43291 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 10B4427BC4A; 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 53DCE27BC4B 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 1ufUsM-0001kk-Ln; Fri, 25 Jul 2025 22:43:06 -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 1ufUsK-0001gk-5x for guix-patches@gnu.org; Fri, 25 Jul 2025 22:43:04 -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 1ufUsJ-0005jo-TR for guix-patches@gnu.org; Fri, 25 Jul 2025 22:43:03 -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=liIYDILDWrzlol4VsXpJmnxuEfKg9bHCsD54TDI7DIQ=; b=Wq08mkHe/WF/9Vl91MhaOVmLUfF2w0ej4YRZJ+T6Dar46BCGNHfm9PrHOCFrrlseSgNMMoIOKqyLJwJeGki8y7dNcyUPYZV0ebPikVX3URUib/doRtB9h2fmf/HhQiI+9ESLlnYWIyz8j/20BIaPQa5jdW+9gwzvb/68eydIV/QJSFwGlpFpCGOJNFgvhg0ecElQCl4G9XPFABHhXU4DKf2u4hv0fvXeOMAdnUPN6xx1eois90odciU5zQuTVoDVmb8r95L9aIfByiX40AftLgi7gsgVF5kbJYfqm5ZUdV4VrmU6OkaY8EkzhiR/pa2+1ccElxQcYu7d/bA+6J/uIw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ufUsJ-00081e-8f for guix-patches@gnu.org; Fri, 25 Jul 2025 22:43:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79099] [PATCH 16/34] gnu/packages/g*.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:02 +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.175349773530662 (code B ref 79099); Sat, 26 Jul 2025 02:43:02 +0000 Received: (at 79099) by debbugs.gnu.org; 26 Jul 2025 02:42:15 +0000 Received: from localhost ([127.0.0.1]:38168 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ufUrN-0007y4-MZ for submit@debbugs.gnu.org; Fri, 25 Jul 2025 22:42:15 -0400 Received: from 7.mo563.mail-out.ovh.net ([46.105.59.58]:52883) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ufUpb-0007fV-2M for 79099@debbugs.gnu.org; Fri, 25 Jul 2025 22:40:52 -0400 Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net [51.68.80.175]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4bppqx4NfPz5xyp; Sat, 26 Jul 2025 02:40:13 +0000 (UTC) Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net. [127.0.0.1]) by director1.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79099@debbugs.gnu.org>; Sat, 26 Jul 2025 02:40:13 +0000 (UTC) Received: from mta3.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.37.222]) by director1.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bppqx1yCfz5xTf; Sat, 26 Jul 2025 02:40:13 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.4]) by mta3.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id BA6ED94313E; Sat, 26 Jul 2025 02:40:12 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-111S005f314bc24-f2ce-43ad-a825-aede96e0bc9b, 7BFD41D65738CBEA4850BE66907D66307393418F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sat, 26 Jul 2025 04:39:22 +0200 Message-ID: <20250726023951.11862-16-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: 4615345194710590178 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdekhedvfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepudeutdfgveevtefhtdeuieefleelhfdvleefvddtledvveevkeejffeiheeggfdvnecuffhomhgrihhnpehskhhirgdrohhrghdpuhhlghdrrggtrdgsvgdpghhithhhuhgsrdgtohhmpdgsihhtsghutghkvghtrdhorhhgpdhgihhtlhgrsgdrtghomhdptghouggvsggvrhhgrdhorhhgnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledtleelseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehieefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=liIYDILDWrzlol4VsXpJmnxuEfKg9bHCsD54TDI7DIQ=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1753497613; v=1; b=um8fRk+nbfD9dnggFf+G2IsU/KPglPKV7XDt4kpRrBeweP3NisduhGiFDIIREHKbFj9roPUW J3DXaR3kESHLS2FgbIBEWO37xzgXcOABNUZN0ujfSwM4w2Ku0sIOVoy5r5G3dnH8lB7LfA3rbdd pi37xZCWiBuvCibBg3lEF3Uqi4fn/zGiCEJx0vc1pCLiogWqKbI44gaSTPYqfC4HClbN6GWSCTX +FVAGilSf6eEqhhMBu/2QhWkUI8bUoZlBrHzG+5VHG4yWu/GmH+5dHDfZSjaGcO1DlDpGMqI/YC YcPQLKPKiOtTBI8/DycPwinLXoH7jmCz1TeFEDxR/h5Tg== 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 "g*.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/game-development.scm | 19 ++++--- gnu/packages/games.scm | 56 ++++++++++---------- gnu/packages/gawk.scm | 2 +- gnu/packages/genimage.scm | 2 +- gnu/packages/geo.scm | 4 +- gnu/packages/gl.scm | 4 +- gnu/packages/glib.scm | 2 +- gnu/packages/gnome-xyz.scm | 4 +- gnu/packages/gnome.scm | 8 +-- gnu/packages/golang-build.scm | 2 +- gnu/packages/golang-check.scm | 4 +- gnu/packages/golang-crypto.scm | 20 +++---- gnu/packages/golang-vcs.scm | 2 +- gnu/packages/golang-web.scm | 20 +++---- gnu/packages/golang-xyz.scm | 52 +++++++++---------- gnu/packages/gpodder.scm | 2 +- gnu/packages/graphics.scm | 29 ++++++----- gnu/packages/gstreamer.scm | 2 +- gnu/packages/gtk.scm | 2 +- gnu/packages/guile-wm.scm | 4 +- gnu/packages/guile-xyz.scm | 86 +++++++++++++++---------------- gnu/packages/guile.scm | 6 +-- 22 files changed, 171 insertions(+), 161 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 61520575a8b..9bbb0a1193d 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -222,7 +222,7 @@ (define-public dds (revision "1")) (package (name "dds") - (version (git-version "2.9.0" revision commit)) + (version (make-git-version "2.9.0" revision commit)) (source (origin (method git-fetch) @@ -272,7 +272,9 @@ (define-public dds (copy-recursively "../include" inc)) (let ((doc (string-append #$output "/share/doc/" - #$name "-" #$version))) + #$name "-" + #$(package-version + this-package)))) (install-file "../LICENSE" doc) (copy-recursively "../doc" doc))))))) (native-inputs @@ -430,7 +432,8 @@ (define-public grfcodec `(begin ;; The sources are not a git repository (substitute* "generate_version.cmake" - (("\\$\\{GIT.*describe.*") (string-append "echo \"" ,version "\"\n")) + (("\\$\\{GIT.*describe.*") + (string-append "echo \"" ,version "\"\n")) (("\\$\\{GIT.*show.*") "echo \"Not shown for reproducibility.\"\n")) (substitute* "CMakeLists.txt" (("find_package\\(Git REQUIRED\\)") "")))))) @@ -1895,7 +1898,7 @@ (define-public python-pyxel (package (name "python-pyxel") ;; This is the latest version to not require Rust… - (version (git-version "1.4.3" revision commit)) + (version (make-git-version "1.4.3" revision commit)) (source (origin (method git-fetch) @@ -2899,7 +2902,7 @@ (define-public ioquake3 (commit "ab18167a09415e9e9f4859c197bad72ec39807d5")) (package (name "ioquake3") - (version (git-version "1.3.6" revision commit)) + (version (make-git-version "1.3.6" revision commit)) (source (origin (method git-fetch) @@ -3202,7 +3205,7 @@ (define-public chipmunk (revision "1")) (package (name "chipmunk") - (version (git-version "7.0.3" revision commit)) + (version (make-git-version "7.0.3" revision commit)) (source (origin (method git-fetch) @@ -3369,7 +3372,7 @@ (define-public warsow-qfusion (let ((commit "c4de15df559410aff0ca6643724e24cddb0ecbbd")) (package (name "warsow-qfusion") - (version (git-version "2.5" "1" commit)) ; 2.5-beta + (version (make-git-version "2.5" "1" commit)) ; 2.5-beta (source (origin (method git-fetch) (uri (git-reference @@ -3711,7 +3714,7 @@ (define-public tic80 "1ivjwwqxqjfhm8caz1srkp8wx7fpzvpf7s26ifif7cryvqch8vnf"))))) (package (name "tic80") - (version (git-version "1.2.0" "1" commit)) + (version (make-git-version "1.2.0" "1" commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index e052bca0e5a..f43c85bc789 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -472,7 +472,7 @@ (define-public anarch (revision "1")) (package (name "anarch") - (version (git-version "1.1d" revision commit)) + (version (make-git-version "1.1d" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -840,7 +840,7 @@ (define-public vdrift (revision "0")) (package (name "vdrift") - (version (git-version "2014-10-20" revision commit)) + (version (make-git-version "2014-10-20" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1150,7 +1150,7 @@ (define-public sgt-puzzles (revision "0")) (package (name "sgt-puzzles") - (version (git-version "20250510" revision commit)) + (version (make-git-version "20250510" revision commit)) (source (origin (method git-fetch) @@ -1938,7 +1938,7 @@ (define-public joycond (revision "2")) (package (name "joycond") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -2240,7 +2240,7 @@ (define-public ghosthop (revision "1")) (package (name "ghosthop") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -2859,7 +2859,7 @@ (define-public redeal (revision "1")) (package (name "redeal") - (version (git-version "0.2.0" revision commit)) + (version (make-git-version "0.2.0" revision commit)) (source (origin (method git-fetch) @@ -2888,7 +2888,9 @@ (define-public redeal (lambda _ (let* ((doc (string-append #$output "/share/doc/")) (examples - (string-append doc #$name "-" #$version "/examples"))) + (string-append doc #$name "-" + #$(package-version this-package) + "/examples"))) (mkdir-p examples) (copy-recursively "examples" examples))))))) (inputs (list dds `(,python "tk"))) @@ -3928,7 +3930,7 @@ (define-public pingus (revision "0")) (package (name "pingus") - (version (git-version "0.7.6" revision commit)) + (version (make-git-version "0.7.6" revision commit)) (source (origin (method git-fetch) @@ -4454,7 +4456,7 @@ (define-public mars (revision "2")) (package (name "mars") - (version (git-version "0.7.5" revision commit)) + (version (make-git-version "0.7.5" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -5507,7 +5509,7 @@ (define openttd-opengfx (revision "0")) (package (name "openttd-opengfx") - (version (git-version "7.1" revision commit)) + (version (make-git-version "7.1" revision commit)) (source (origin (method git-fetch) @@ -6686,7 +6688,7 @@ (define-public tuxemon (revision "0")) (package (name "tuxemon") - (version (git-version "0.4.34" revision commit)) + (version (make-git-version "0.4.34" revision commit)) (source (origin (method git-fetch) @@ -7153,7 +7155,7 @@ (define-public moonlight-common (revision "1")) (package (name "moonlight-common") - (version (git-version "6.1.0" revision commit)) + (version (make-git-version "6.1.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -9819,7 +9821,7 @@ (define-public frozen-bubble (revision "1")) (package (name "frozen-bubble") - (version (git-version "2.2.1" revision commit)) + (version (make-git-version "2.2.1" revision commit)) (source (origin (method git-fetch) @@ -10920,7 +10922,7 @@ (define-public marble-marcher (revision "1")) (package (name "marble-marcher") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -11146,7 +11148,7 @@ (define-public jstest-gtk (revision "0")) (package (name "jstest-gtk") - (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 @@ -12126,7 +12128,7 @@ (define-public neverball (revision "1")) (package (name "neverball") - (version (git-version "1.6.0" revision commit)) + (version (make-git-version "1.6.0" revision commit)) (source (origin (method git-fetch) @@ -12382,7 +12384,7 @@ (define-public xevil (revision "0")) (package (name "xevil") - (version (git-version "2.02" revision commit)) + (version (make-git-version "2.02" revision commit)) (source (origin (method git-fetch) @@ -12409,7 +12411,8 @@ (define-public xevil (lambda* (#:key inputs #:allow-other-keys) (substitute* "cmn/game.cpp" (("(#define VERSION ).*" _ define) - (string-append define "\"" #$version "\"\n"))) + (string-append define "\"" + #$(package-version this-package) "\"\n"))) (substitute* "cmn/utils.cpp" (("[^\"]*/(bin/uname)" _ command) (search-input-file inputs command))) @@ -12429,7 +12432,8 @@ (define-public xevil (string-append #$output "/bin")) (list "xevil" "serverping"))) (let ((doc (string-append #$output "/share/doc/" - #$name "-" #$version))) + #$name "-" + #$(package-version this-package)))) (mkdir-p doc) (for-each (lambda (file) (copy-recursively file @@ -12461,7 +12465,7 @@ (define-public azimuth (revision "0")) (package (name "azimuth") - (version (git-version "1.0.3" revision commit)) + (version (make-git-version "1.0.3" revision commit)) (source (origin (method git-fetch) @@ -12590,7 +12594,7 @@ (define-public paperview (revision "1")) (package (name "paperview") - (version (git-version "0.0.1" revision commit)) ;no upstream release + (version (make-git-version "0.0.1" revision commit)) ;no upstream release (source (origin (method git-fetch) (uri (git-reference @@ -12652,7 +12656,7 @@ (define-public devours (revision "0")) (package (name "devours") - (version (git-version "3" revision commit)) + (version (make-git-version "3" revision commit)) (source (origin (method git-fetch) @@ -12728,7 +12732,7 @@ (define-public schiffbruch (let ((commit "e41916d15d87749c82c5005cbb42d1bb079b43d9")) (package (name "schiffbruch") - (version (git-version "1.2.1" "0" commit)) + (version (make-git-version "1.2.1" "0" commit)) (source (origin (method git-fetch) @@ -13003,7 +13007,7 @@ (define-public plunder (revision "1")) (package (name "plunder") - (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 @@ -13042,7 +13046,7 @@ (define-public freerct (revision "0")) (package (name "freerct") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -13298,7 +13302,7 @@ (define-public steam-devices-udev-rules (revision "1")) (package (name "steam-devices-udev-rules") - (version (git-version "1.0.0.61" revision commit)) + (version (make-git-version "1.0.0.61" revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/gawk.scm b/gnu/packages/gawk.scm index 730af0761c6..2ff91a82d77 100644 --- a/gnu/packages/gawk.scm +++ b/gnu/packages/gawk.scm @@ -123,7 +123,7 @@ (define-public egawk-next (package (inherit gawk-mpfr) (name "egawk-next") - (version (git-version "5.1.60" revision commit)) + (version (make-git-version "5.1.60" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/genimage.scm b/gnu/packages/genimage.scm index 0f70faf33e9..6517e54df19 100644 --- a/gnu/packages/genimage.scm +++ b/gnu/packages/genimage.scm @@ -46,7 +46,7 @@ (define-public genimage (revision "0")) (package (name "genimage") - (version (git-version "18" revision commit)) + (version (make-git-version "18" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index bcd7b602466..a8360375fbb 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1373,7 +1373,7 @@ (define-public mapnik (revision "0")) (package (name "mapnik") - (version (git-version "3.1.0" revision commit)) + (version (make-git-version "3.1.0" revision commit)) (source (origin (method git-fetch) @@ -2981,7 +2981,7 @@ (define-public r-rnaturalearthhires (revision "1")) (package (name "r-rnaturalearthhires") - (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 diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index f05e870335a..14d2626c4ee 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -1099,7 +1099,7 @@ (define-public nanovg-for-extempore (commit "3c60175fcc2e5fe305b04355cdce35d499c80310")) (package (name "nanovg-for-extempore") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1347,7 +1347,7 @@ (define-public piglit (commit "814046fe6942eac660ee4a6cc5fcc54011a49945")) (package (name "piglit") - (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/glib.scm b/gnu/packages/glib.scm index 2526e79a00a..cd14787dbe3 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -1625,7 +1625,7 @@ (define-public cppgir-for-telegram-desktop (package (inherit cppgir) (name "cppgir-for-telegram-desktop") - (version (git-version "2.0" revision commit)) + (version (make-git-version "2.0" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index e7a23336d47..56f6eeebe6c 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -1035,7 +1035,7 @@ (define-public gnome-shell-extension-noannoyance (revision "23")) (package (name "gnome-shell-extension-noannoyance") - (version (git-version "17" revision commit)) + (version (make-git-version "17" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1948,7 +1948,7 @@ (define-public nordic-theme (revision "0")) (package (name "nordic-theme") - (version (git-version "1.9.0" revision commit)) + (version (make-git-version "1.9.0" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3be13944cad..279226736a4 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2040,7 +2040,7 @@ (define-public dia (revision "6")) (package (name "dia") - (version (git-version "0.97.3" revision commit)) + (version (make-git-version "0.97.3" revision commit)) (source (origin (method git-fetch) @@ -10251,7 +10251,7 @@ (define-public gnome-screenshot (revision "0")) (package (name "gnome-screenshot") - (version (git-version "41.0" revision commit)) + (version (make-git-version "41.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -10826,7 +10826,7 @@ (define-public libzapojit (commit "99d49bac5edc4afdcac742a0a142908e405597b0")) (package (name "libzapojit") - (version (git-version "0.0.3" revision commit)) + (version (make-git-version "0.0.3" revision commit)) (source (origin (method git-fetch) @@ -14564,7 +14564,7 @@ (define gtk-frdp-for-gnome-connections (revision "1")) (package (inherit gtk-frdp) - (version (git-version "45.90" revision commit)) + (version (make-git-version "45.90" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm index 010946b8322..ba3c95ca965 100644 --- a/gnu/packages/golang-build.scm +++ b/gnu/packages/golang-build.scm @@ -1258,7 +1258,7 @@ (define-public go-google-golang-org-genproto-googleapis-rpc (revision "0")) (package (name "go-google-golang-org-genproto-googleapis-rpc") - (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/golang-check.scm b/gnu/packages/golang-check.scm index cd1f3820209..32d1cd4030d 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -318,7 +318,7 @@ (define-public go-github-com-cheekybits-is (revision "0")) (package (name "go-github-com-cheekybits-is") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -1836,7 +1836,7 @@ (define-public go-github-com-petermattis-goid (revision "2")) (package (name "go-github-com-petermattis-goid") - (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/golang-crypto.scm b/gnu/packages/golang-crypto.scm index efb67fcea00..ad7a12559e1 100644 --- a/gnu/packages/golang-crypto.scm +++ b/gnu/packages/golang-crypto.scm @@ -306,7 +306,7 @@ (define-public go-github-com-aperturerobotics-jacobsa-crypto (revision "0")) (package (name "go-github-com-aperturerobotics-jacobsa-crypto") - (version (git-version "1.0.1" revision commit)) + (version (make-git-version "1.0.1" revision commit)) (source (origin (method git-fetch) @@ -339,7 +339,7 @@ (define-public go-github-com-apparentlymart-go-openvpn-mgmt (revision "0")) (package (name "go-github-com-apparentlymart-go-openvpn-mgmt") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -438,7 +438,7 @@ (define-public go-github-com-btcsuite-btcd-btcec (revision "0")) (package (name "go-github-com-btcsuite-btcd-btcec") - (version (git-version "0.12.0-beta" revision commit)) + (version (make-git-version "0.12.0-beta" revision commit)) (source (origin (method git-fetch) @@ -555,7 +555,7 @@ (define-public go-github-com-chmduquesne-rollinghash (revision "1")) (package (name "go-github-com-chmduquesne-rollinghash") - (version (git-version "4.0.0" revision commit)) + (version (make-git-version "4.0.0" revision commit)) (source (origin (method git-fetch) @@ -1477,7 +1477,7 @@ (define-public go-github-com-libp2p-go-libp2p-crypto (revision "0")) (package (name "go-github-com-libp2p-go-libp2p-crypto") - (version (git-version "2.0.1" revision commit)) + (version (make-git-version "2.0.1" revision commit)) (source (origin (method git-fetch) @@ -1506,7 +1506,7 @@ (define-public go-github-com-libp2p-go-libp2p-peer (revision "0")) (package (name "go-github-com-libp2p-go-libp2p-peer") - (version (git-version "2.3.8" revision commit)) + (version (make-git-version "2.3.8" revision commit)) (source (origin (method git-fetch) @@ -1616,7 +1616,7 @@ (define-public go-github-com-minio-blake2b-simd (revision "0")) (package (name "go-github-com-minio-blake2b-simd") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -1913,7 +1913,7 @@ (define-public go-github-com-operatorfoundation-ed25519 (revision "0")) (package (name "go-github-com-operatorfoundation-ed25519") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -2273,7 +2273,7 @@ (define-public go-github-com-riobard-go-bloom (revision "0")) (package (name "go-github-com-riobard-go-bloom") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -2770,7 +2770,7 @@ (define-public go-gitlab-com-yawning-edwards25519-extra (revision "0")) (package (name "go-gitlab-com-yawning-edwards25519-extra") - (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/golang-vcs.scm b/gnu/packages/golang-vcs.scm index 28b3d8fa0c5..e9fb2303344 100644 --- a/gnu/packages/golang-vcs.scm +++ b/gnu/packages/golang-vcs.scm @@ -104,7 +104,7 @@ (define-public go-github-com-git-lfs-pktline (revision "1")) (package (name "go-github-com-git-lfs-pktline") - (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/golang-web.scm b/gnu/packages/golang-web.scm index 6dab9848856..36f88046b2a 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -183,7 +183,7 @@ (define-public go-0xacab-org-leap-shapeshifter (revision "12")) (package (name "go-0xacab-org-leap-shapeshifter") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -2415,7 +2415,7 @@ (define-public go-github-com-emersion-go-imap-id (revision "0")) (package (name "go-github-com-emersion-go-imap-id") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -2444,7 +2444,7 @@ (define-public go-github-com-emersion-go-imap-idle (revision "0")) (package (name "go-github-com-emersion-go-imap-idle") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -2633,7 +2633,7 @@ (define-public go-github-com-emersion-go-sasl (revision "1")) (package (name "go-github-com-emersion-go-sasl") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -2968,7 +2968,7 @@ (define-public go-github-com-getsentry-raven-go (revision "0")) (package (name "go-github-com-getsentry-raven-go") - (version (git-version "0.2.0" revision commit)) + (version (make-git-version "0.2.0" revision commit)) (source (origin (method git-fetch) @@ -4184,7 +4184,7 @@ (define-public go-github-com-gorilla-context (revision "0")) (package (name "go-github-com-gorilla-context") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -9682,7 +9682,7 @@ (define-public go-github-com-tv42-httpunix (revision "0")) (package (name "go-github-com-tv42-httpunix") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -10069,7 +10069,7 @@ (define-public go-github-com-whyrusleeping-json-filter (revision "0")) (package (name "go-github-com-whyrusleeping-json-filter") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -10202,7 +10202,7 @@ (define-public go-github-com-xeipuuv-gojsonpointer (revision "0")) (package (name "go-github-com-xeipuuv-gojsonpointer") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -10227,7 +10227,7 @@ (define-public go-github-com-xeipuuv-gojsonreference (revision "0")) (package (name "go-github-com-xeipuuv-gojsonreference") - (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/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 4331ae63394..4e40d479abb 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -4632,7 +4632,7 @@ (define-public go-github-com-danwakefield-fnmatch (revision "0")) (package (name "go-github-com-danwakefield-fnmatch") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -4821,7 +4821,7 @@ (define-public go-github-com-delthas-go-libnp (revision "1")) (package (name "go-github-com-delthas-go-libnp") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -5623,7 +5623,7 @@ (define-public go-github-com-docopt-docopt-go (revision "0")) (package (name "go-github-com-docopt-docopt-go") - (version (git-version "0.6.2" revision commit)) + (version (make-git-version "0.6.2" revision commit)) (source (origin (method git-fetch) @@ -6409,7 +6409,7 @@ (define-public go-github-com-fatih-gomodifytags (revision "0")) (package (name "go-github-com-fatih-gomodifytags") - (version (git-version "1.17.0" revision commit)) + (version (make-git-version "1.17.0" revision commit)) (source (origin (method git-fetch) @@ -6516,7 +6516,7 @@ (define-public go-github-com-flynn-archive-go-shlex (revision "0")) (package (name "go-github-com-flynn-archive-go-shlex") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -7481,7 +7481,7 @@ (define-public go-github-com-go-task-slim-sprig (revision "0")) (package (name "go-github-com-go-task-slim-sprig") - (version (git-version "2.20.0" revision commit)) + (version (make-git-version "2.20.0" revision commit)) (source (origin (method git-fetch) @@ -8015,7 +8015,7 @@ (define-public go-github-com-google-cadvisor (revision "0")) (package (name "go-github-com-google-cadvisor") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -10633,7 +10633,7 @@ (define-public go-github-com-jpillora-backoff (revision "1")) (package (name "go-github-com-jpillora-backoff") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -10972,7 +10972,7 @@ (define-public go-github-com-kballard-go-shellquote (revision "1")) (package (name "go-github-com-kballard-go-shellquote") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -11514,7 +11514,7 @@ (define-public go-github-com-kr-fs (revision "0")) (package (name "go-github-com-kr-fs") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -12260,7 +12260,7 @@ (define-public go-github-com-lyft-protoc-gen-star-v2-next (package (inherit go-github-com-lyft-protoc-gen-star-v2) (name "go-github-com-lyft-protoc-gen-star-v2") - (version (git-version "2.0.3" revision commit)) + (version (make-git-version "2.0.3" revision commit)) (source (origin (method git-fetch) @@ -12323,7 +12323,7 @@ (define-public go-github-com-marcinbor85-gohex (revision "0")) (package (name "go-github-com-marcinbor85-gohex") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -12671,7 +12671,7 @@ (define-public go-github-com-junegunn-go-shellwords (revision "0")) (hidden-package (package (inherit go-github-com-mattn-go-shellwords) (name "go-github-com-junegunn-go-shellwords") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -13558,7 +13558,7 @@ (define-public go-github-com-mreiferson-go-svc (revision "0")) (package (name "go-github-com-mreiferson-go-svc") - (version (git-version "1.2.1" revision commit)) + (version (make-git-version "1.2.1" revision commit)) (source (origin (method git-fetch) @@ -13826,7 +13826,7 @@ (define-public go-github-com-mufti1-interconv (revision "0")) (package (name "go-github-com-mufti1-interconv") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -15156,7 +15156,7 @@ (define-public go-github-com-pbnjay-memory (revision "2")) (package (name "go-github-com-pbnjay-memory") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -15889,7 +15889,7 @@ (define-public go-github-com-reiver-go-porterstemmer (revision "0")) (package (name "go-github-com-reiver-go-porterstemmer") - (version (git-version "1.0.1" revision commit)) + (version (make-git-version "1.0.1" revision commit)) (source (origin (method git-fetch) @@ -16319,7 +16319,7 @@ (define-public go-github-com-rwcarlsen-goexif (revision "0")) (package (name "go-github-com-rwcarlsen-goexif") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -18791,7 +18791,7 @@ (define-public go-github-com-vitrun-qart (revision "0")) (package (name "go-github-com-vitrun-qart") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -19270,7 +19270,7 @@ (define-public go-github-com-xaionaro-gosrc (revision "0")) (package (name "go-github-com-xaionaro-gosrc") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -19506,7 +19506,7 @@ (define-public go-github-com-yookoala-realpath (revision "0")) (package (name "go-github-com-yookoala-realpath") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -19534,7 +19534,7 @@ (define-public go-github-com-yosuke-furukawa-json5 (revision "0")) (package (name "go-github-com-yosuke-furukawa-json5") - (version (git-version "0.1.1" revision commit)) + (version (make-git-version "0.1.1" revision commit)) (source (origin (method git-fetch) @@ -20058,7 +20058,7 @@ (define-public go-gitlab-com-ambrevar-damerau (revision "0")) (package (name "go-gitlab-com-ambrevar-damerau") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -20836,7 +20836,7 @@ (define-public go-go4-org (revision "0")) (package (name "go-go4-org") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -20944,7 +20944,7 @@ (define-public go-golang-org-rainycape-unidecode (revision "1")) (package (name "go-golang-org-rainycape-unidecode") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -21305,7 +21305,7 @@ (define-public go-gvisor-dev-gvisor (revision "0")) (package (name "go-gvisor-dev-gvisor") - (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/gpodder.scm b/gnu/packages/gpodder.scm index c3e1c9b496d..6efd1945306 100644 --- a/gnu/packages/gpodder.scm +++ b/gnu/packages/gpodder.scm @@ -217,7 +217,7 @@ (define-public castget (commit "da9727de1b9e4e636be21bf07c73eb41f5d8439b")) (package (name "castget") - (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/graphics.scm b/gnu/packages/graphics.scm index 1cb48fe21d3..f0f87488153 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -281,7 +281,7 @@ (define-public minifb (revision "1")) (package (name "minifb") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri @@ -822,7 +822,7 @@ (define-public mikktspace (revision "0")) (package (name "mikktspace") - (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 @@ -1018,7 +1018,7 @@ (define-public geomcpp (revision "0")) (package (name "geomcpp") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -1850,7 +1850,7 @@ (define-public openmw-openscenegraph (hidden-package (package (inherit openscenegraph) - (version (git-version "3.6" "3" commit)) + (version (make-git-version "3.6" "3" commit)) (outputs (list "out")) (source (origin @@ -2095,7 +2095,7 @@ (define-public facedetect (revision "0")) (package (name "facedetect") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -2110,7 +2110,8 @@ (define-public facedetect #:install-plan #~`(("facedetect" "bin/facedetect") ("README.rst" ,(string-append "share/doc/" #$name - "-" #$version "/README.rst"))) + "-" #$(package-version this-package) + "/README.rst"))) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'configure @@ -2381,7 +2382,7 @@ (define-public skia (commit "6d0b93856303fcf3021a8b40654d7739fda4dfb0")) (package (name "skia") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -2462,7 +2463,7 @@ (define skia.pc (string-append #$output URL: https://skia.org/ Version: ~a Libs: -L${libdir} -lskia -Cflags: -I${includedir}~%" #$output #$version))))) +Cflags: -I${includedir}~%" #$output #$(package-version this-package)))))) (replace 'check (lambda* (#:key tests? inputs native-inputs #:allow-other-keys) (if tests? @@ -2624,7 +2625,7 @@ (define-public skia-for-friction (package (inherit skia) (name "skia") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -2976,7 +2977,7 @@ (define-public discregrid (revision "0")) (package (name "discregrid") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -3152,7 +3153,7 @@ (define-public nanosvg (revision "0")) (package (name "nanosvg") - (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 @@ -3184,7 +3185,7 @@ (define-public asli (revision "1")) (package (name "asli") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -3244,7 +3245,9 @@ (define-public asli ;; menukeys. (install-file "docs/ASLI [User Manual].pdf" (string-append #$output "/share/doc/" - #$name "-" #$version)))))))) + #$name "-" + #$(package-version + this-package))))))))) (home-page "http://www.biomech.ulg.ac.be/ASLI/") (synopsis "Create lattice infills with varying unit cell type, size and feature") (description "ASLI (A Simple Lattice Infiller) is a command-line tool that diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index e78cd6c4223..a460f28792e 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -176,7 +176,7 @@ (define-public ccextractor (revision "0")) (package (name "ccextractor") - (version (git-version "0.94" revision commit)) + (version (make-git-version "0.94" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 44620c186aa..f632b2ebf71 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1501,7 +1501,7 @@ (define-public guile-cairo-next (package (inherit guile-cairo) (name "guile-cairo-next") - (version (git-version "1.11.2" revision commit)) + (version (make-git-version "1.11.2" revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/guile-wm.scm b/gnu/packages/guile-wm.scm index 3d70a2ac61a..bfdb223cf13 100644 --- a/gnu/packages/guile-wm.scm +++ b/gnu/packages/guile-wm.scm @@ -40,7 +40,7 @@ (define-public guile-xcb (revision "1")) (package (name "guile-xcb") - (version (git-version "1.3" revision commit)) + (version (make-git-version "1.3" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -77,7 +77,7 @@ (define-public guile-wm (revision "1")) (package (name "guile-wm") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (synopsis "X11 window manager toolkit in Scheme") (source (origin (method git-fetch) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 8e3a1ef499b..5c80760beeb 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -357,7 +357,7 @@ (define-public guile-openai (revision "1")) (package (name "guile-openai") - (version (git-version "0.2" revision commit)) + (version (make-git-version "0.2" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -390,7 +390,7 @@ (define-public guile-pipe (revision "0")) (package (name "guile-pipe") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -416,7 +416,7 @@ (define-public guile-pubstrate (revision "1")) (package (name "guile-pubstrate") - (version (git-version "0.1.dev" revision commit)) + (version (make-git-version "0.1.dev" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -600,7 +600,7 @@ (define-public guile-avatar (revision "0")) (package (name "guile-avatar") - (version (git-version "0.0" revision commit)) + (version (make-git-version "0.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -708,7 +708,7 @@ (define-public guile-8sync (let ((commit "183b4f02e68279d4984e79b79e06bfcf1861fcbf") (revision "0")) (package (name "guile-8sync") - (version (git-version "0.4.2" revision commit)) + (version (make-git-version "0.4.2" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -737,7 +737,7 @@ (define guile-8sync-for-pubstrate (package (inherit guile-8sync) (name "guile-8sync-for-pubstrate") - (version (git-version "0.4.2" revision commit)) + (version (make-git-version "0.4.2" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1248,7 +1248,7 @@ (define-public guile-fibers-next (package (inherit guile-fibers) (name "guile-fibers-next") - (version (git-version "1.3.1" + (version (make-git-version "1.3.1" revision commit)) (source (origin @@ -1354,7 +1354,7 @@ (define-public guile-taglib (revision "0")) (package (name "guile-taglib") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (home-page "https://github.com/sbarbit/guile-taglib") (source (origin @@ -1527,7 +1527,7 @@ (define-public guile-ares-rs (revision "0")) (package (name "guile-ares-rs") - (version (git-version "0.9.5" revision commit)) + (version (make-git-version "0.9.5" revision commit)) (source (origin (method git-fetch) @@ -1788,7 +1788,7 @@ (define-public guile-prometheus (revision "7")) (package (name "guile-prometheus") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1903,7 +1903,7 @@ (define-public guile-aws (revision "1")) (package (name "guile-aws") - (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 @@ -1979,7 +1979,7 @@ (define-public guile-simple-zmq (revision "11")) (package (name "guile-simple-zmq") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -2015,7 +2015,7 @@ (define-public jupyter-guile-kernel (revision "2")) (package (name "jupyter-guile-kernel") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -2188,7 +2188,7 @@ (define-public guile-newra (revision "0")) (package (name "guile-newra") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -2254,7 +2254,7 @@ (define-public guile-mastodon (revision "1")) (package (name "guile-mastodon") - (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 @@ -2547,7 +2547,7 @@ (define-public guile-lmdb (revision "2")) (package (name "guile-lmdb") - (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 @@ -2631,7 +2631,7 @@ (define-public guile-hall (revision "1")) (package (name "guile-hall") - (version (git-version "0.4.1" revision commit)) + (version (make-git-version "0.4.1" revision commit)) (source (origin (method git-fetch) @@ -2753,7 +2753,7 @@ (define-public guile-imanifest (revision "0")) (package (name "guile-imanifest") - (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 @@ -3470,7 +3470,7 @@ (define-public guile-raw-strings (revision "0")) (package (name "guile-raw-strings") - (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 @@ -3670,7 +3670,7 @@ (define-public guile-simple-iterators (revision "0")) (package (name "guile-simple-iterators") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -4139,7 +4139,7 @@ (define-public guile-picture-language (revision "5")) (package (name "guile-picture-language") - (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 @@ -4178,7 +4178,7 @@ (define-public guile-studio (revision "1")) (package (name "guile-studio") - (version (git-version "0.1.1" revision commit)) + (version (make-git-version "0.1.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -4565,7 +4565,7 @@ (define-public guile-srfi-125 (commit "556827a4b88b43acc0b941ac3f7f926ffad27e42")) (package (name "guile-srfi-125") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -4617,7 +4617,7 @@ (define-public guile-srfi-126 (commit "f480cf2d1a33c1f3d0fab3baf321c0ed5b5eb248")) (package (name "guile-srfi-126") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -4841,7 +4841,7 @@ (define-public guile-srfi-158 (revision "0")) (package (name "guile-srfi-158") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -4870,7 +4870,7 @@ (define-public guile-srfi-159 (revision "0")) (package (name "guile-srfi-159") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (home-page "https://bitbucket.org/bjoli/guile-srfi-159") (source (origin (method hg-fetch) @@ -4900,7 +4900,7 @@ (define-public guile-srfi-180 (revision "0")) (package (name "guile-srfi-180") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -4940,7 +4940,7 @@ (define-public guile-srfi-189 (package (name "guile-srfi-189") ;; 'final' is the name of the latest git tag. - (version (git-version "final" revision commit)) + (version (make-git-version "final" revision commit)) (source (origin (method git-fetch) @@ -4982,7 +4982,7 @@ (define-public guile-srfi-197 (revision "0")) (package (name "guile-srfi-197") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -5089,7 +5089,7 @@ (define-public guile-srfi-234 (commit "2c7c3df13035ef12890fc532abf61dce8f497fcd")) (package (name "guile-srfi-234") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -5127,7 +5127,7 @@ (define-public guile-srfi-235 (commit "643a44aa9d6872962257995ecb0a31eb06a71d88")) (package (name "guile-srfi-235") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -5299,7 +5299,7 @@ (define-public guile-jpeg (revision "0")) (package (name "guile-jpeg") - (version (git-version "0.0" revision commit)) + (version (make-git-version "0.0" revision commit)) (home-page "https://gitlab.com/wingo/guile-jpeg") (source (origin (method git-fetch) @@ -5603,7 +5603,7 @@ (define-public guile-ffi-cblas (revision "0")) (package (name "guile-ffi-cblas") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (home-page "https://github.com/lloda/guile-ffi-cblas") (source (origin (method git-fetch) @@ -5647,7 +5647,7 @@ (define-public guile-gsl (revision "2")) (package (name "guile-gsl") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -5693,7 +5693,7 @@ (define-public guile-ffi-fftw (revision "2")) (package (name "guile-ffi-fftw") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -6034,7 +6034,7 @@ (define-public guile-webutils (revision "1")) (package (name "guile-webutils") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -6116,7 +6116,7 @@ (define-public guile-lens (revision "0")) (package (name "guile-lens") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -6287,7 +6287,7 @@ (define-public guile-irc (revision "1")) (package (name "guile-irc") - (version (git-version "0.3.0" revision commit)) + (version (make-git-version "0.3.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -6738,7 +6738,7 @@ (define-public guile-rsv (revision "1")) (package (name "guile-rsv") - (version (git-version "0.2.0" revision commit)) + (version (make-git-version "0.2.0" revision commit)) (home-page "https://codeberg.org/kakafarm/guile-rsv/") (source (origin @@ -6931,7 +6931,7 @@ (define-public schmutz (revision "2")) (package (name "schmutz") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -7334,7 +7334,7 @@ (define-public guile-schemetran (revision "1")) (package (name "guile-schemetran") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -7364,7 +7364,7 @@ (define-public guile-knots (revision "23")) (package (name "guile-knots") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -7447,7 +7447,7 @@ (define-public lokke (revision "1")) (package (name "lokke") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (home-page "https://github.com/lokke-org/lokke") (source (origin (method git-fetch) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 57cf6a365de..d90a092ab85 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -495,7 +495,7 @@ (define-public guile-next (package (inherit guile-3.0) (name "guile-next") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin ;; The main goal here is to allow for '--with-branch'. (method git-fetch) @@ -519,7 +519,7 @@ (define-public guile-next ;; wouldn't give us a valid version string. (call-with-output-file ".tarball-version" (lambda (port) - (display #$version port))))) + (display #$(package-version this-package) port))))) #$@(if (target-hurd?) #~((delete 'patch-posix-spawn-usage)) #~()))))) @@ -625,7 +625,7 @@ (define-public guile-for-guile-emacs (revision "2")) (package (inherit guile-next) (name "guile-for-guile-emacs") - (version (git-version "3.0.7-81" revision commit)) + (version (make-git-version "3.0.7-81" revision commit)) (source (origin (method git-fetch) (uri (git-reference From patchwork Sat Jul 26 02:39:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43285 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 289F927BC49; Sat, 26 Jul 2025 03:43:08 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 52A6527BC4C for ; Sat, 26 Jul 2025 03:43:07 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufUqt-0000NQ-4O; Fri, 25 Jul 2025 22:41:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ufUqq-0000LS-EW for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:32 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ufUqq-0005S8-37 for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=71MMzdJnSGz0yIPzWk5opfav3pYuUcL/aiooLXH68gM=; b=Zts1JwlyFU5GSmJr7j0kkpZmkocjk6Zq7+toPpNxIL+8q5n+IkY+xeRWFnwD0lNk5tHHT9FM2IJMCMVQzIURuulwsdRUOOjFVxggyuzbC+p+uwQrIojCIVuhU1ampQ1EKDeSy5a6imD4d43yIl01l6lED//b5PWvvmuRf4RaoO/e4oXX5ye65sY0OmFUsVNeuD296Q3ifXgJoB6Jed++5IsxAoCO7yVnqvAz3fhY8mBNejGamn+Fhh31D31PF0rpilDnu9EVv0yZnxy0BXQDZjeLImIRPAqnWBXmtIV//Aqrbapu6QZcUq5QIYNoKRHUJtbI+W4rlH/ZW4H7oQcZHw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ufUqp-0007v1-Fl for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:31 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79099] [PATCH 17/34] gnu/packages/h*.scm: Use make-git-version. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Jul 2025 02:41:31 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 79099 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 79099@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 79099-submit@debbugs.gnu.org id=B79099.175349768630393 (code B ref 79099); Sat, 26 Jul 2025 02:41:31 +0000 Received: (at 79099) by debbugs.gnu.org; 26 Jul 2025 02:41:26 +0000 Received: from localhost ([127.0.0.1]:38141 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ufUqh-0007to-Vb for submit@debbugs.gnu.org; Fri, 25 Jul 2025 22:41:25 -0400 Received: from 7.mo562.mail-out.ovh.net ([46.105.55.234]:54857) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ufUpb-0007fX-6T for 79099@debbugs.gnu.org; Fri, 25 Jul 2025 22:40:38 -0400 Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net [79.137.60.36]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4bppqy2nb9z2c3l; Sat, 26 Jul 2025 02:40:14 +0000 (UTC) Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net. [127.0.0.1]) by director2.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79099@debbugs.gnu.org>; Sat, 26 Jul 2025 02:40:14 +0000 (UTC) Received: from mta7.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.109.231.192]) by director2.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bppqy1m3hz1xwk; Sat, 26 Jul 2025 02:40:14 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.11]) by mta7.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id E87A0B8315C; Sat, 26 Jul 2025 02:40:13 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-110S00456dc814a-7e7c-4d4a-bfa9-508ddfad438a, 7BFD41D65738CBEA4850BE66907D66307393418F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sat, 26 Jul 2025 04:39:23 +0200 Message-ID: <20250726023951.11862-17-ngraves@ngraves.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250726023951.11862-1-ngraves@ngraves.fr> References: <20250726023951.11862-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 4615626669342515938 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdekhedvfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvheelieffheetvdelhfffffejfefgudfhteekveehieetudeiudfgkeeutdehjeenucffohhmrghinhepghhithhhuhgsrdgtohhmnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledtleelseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=71MMzdJnSGz0yIPzWk5opfav3pYuUcL/aiooLXH68gM=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1753497614; v=1; b=STF34jvrsdx2HeUUuQ1+IjcSbnNPbJO68iD0AjsFg3sbo1jwjQbzrYqI2xqZMsQuWIH0nnSP rwmc5tt8yrIRkiySrx3sFXHqRltqoqt64Te7DAMtAe0NJzMgQGXiVeIUpJ41R1kJsWxozToQDDA rG5BWaMPPoJyj8B23vPXziinzWbmyd79LCZSxh5BtBJBim6yN3OwUbs2Jtx65C19Gc9dczq+K60 2K4KykNcR0EuL6B/9Hkj7LOnEcLVllePrP2sBTBcrUnhLwzi+nS5NgUhQzgTRSCPBZ2+ImsggBR eozESra9buI0E1Ay7B6DhPgg5vseurltE8sW5Hdnt+wjA== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches find gnu/packages/ -type f -name "h*.scm" -exec sed -i 's/(git-version /(make-git-version /g' {} + Then manually checked the potential usage of `version` on the build-side. --- gnu/packages/hardware.scm | 10 +++++----- gnu/packages/haskell-apps.scm | 5 +++-- gnu/packages/haskell-xyz.scm | 2 +- gnu/packages/heads.scm | 2 +- gnu/packages/high-availability.scm | 2 +- gnu/packages/hurd.scm | 4 ++-- 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index ed386371ce8..72ee0dc200a 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -128,7 +128,7 @@ (define-public envytools (revision "1")) (package (name "envytools") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (home-page "https://github.com/envytools/envytools") (source (origin (method git-fetch) @@ -628,7 +628,7 @@ (define-public edid-decode (revision "1")) (package (name "edid-decode") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -665,7 +665,7 @@ (define-public h-client (revision "1")) (package (name "h-client") - (version (git-version "0.0a0" revision commit)) + (version (make-git-version "0.0a0" revision commit)) (source (origin (method git-fetch) @@ -787,7 +787,7 @@ (define-public i7z (commit "1a41ff13db747e962456ddbb5ccb2b7fc43ca0cb")) (package (name "i7z") - (version (git-version "0.28" revision commit)) + (version (make-git-version "0.28" revision commit)) (source (origin (method git-fetch) @@ -1247,7 +1247,7 @@ (define-public rkdeveloptool (revision "0")) (package (name "rkdeveloptool") - (version (git-version "1.3" revision commit)) + (version (make-git-version "1.3" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index e6265090673..384285f5a93 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -630,7 +630,7 @@ (define-public kmonad (revision "1")) (package (name "kmonad") - (version (git-version "0.4.2" revision commit)) + (version (make-git-version "0.4.2" revision commit)) (source (origin (method git-fetch) @@ -666,7 +666,8 @@ (define-public kmonad (add-after 'install-udev-rules 'install-documentation (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (doc (string-append out "/share/doc/kmonad-" ,version))) + (doc (string-append out "/share/doc/kmonad-" + ,(package-version this-package)))) (install-file "README.md" doc) (copy-recursively "doc" doc) (copy-recursively "keymap" (string-append doc "/keymap")) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 6b8cce3cfc4..e75e16485cb 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -10103,7 +10103,7 @@ (define-public ghc-reflex-sdl2 (revision "1")) (package (name "ghc-reflex-sdl2") - (version (git-version "0.3.0.2" revision commit)) + (version (make-git-version "0.3.0.2" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/heads.scm b/gnu/packages/heads.scm index a176253122d..8f22f50c041 100644 --- a/gnu/packages/heads.scm +++ b/gnu/packages/heads.scm @@ -54,7 +54,7 @@ (define-public musl-cross (commit "a8a66490dae7f23a2cf5e256f3a596d1ccfe1a03")) (package (name "musl-cross") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/high-availability.scm b/gnu/packages/high-availability.scm index a70a990cb0a..3846a2979b8 100644 --- a/gnu/packages/high-availability.scm +++ b/gnu/packages/high-availability.scm @@ -85,7 +85,7 @@ (define-public cowsql (revision "0")) (package (name "cowsql") - (version (git-version "1.15.8" revision commit)) + (version (make-git-version "1.15.8" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index cde918372da..db8cd6f6a45 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -634,7 +634,7 @@ (define-public netdde (name "netdde") ;; The version prefix corresponds to the version of Linux from which the ;; drivers were taken. - (version (git-version "2.6.32.65" revision commit)) + (version (make-git-version "2.6.32.65" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -744,7 +744,7 @@ (define-public rumpkernel (revision "0")) (package (name "rumpkernel") - (version (git-version "0-20250111" revision commit)) + (version (make-git-version "0-20250111" revision commit)) ;; This uses the Debian Salsa rumpkernel package git as upstream as that ;; is where development happens. Once things have stabilized, upstream ;; may change to the NetBSD git from where Debian takes their snapshots. From patchwork Sat Jul 26 02:39:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43288 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E7BAE27BC4D; Sat, 26 Jul 2025 03:43:16 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 23D5F27BC4A for ; Sat, 26 Jul 2025 03:43:16 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufUsQ-0001sA-Qg; Fri, 25 Jul 2025 22:43:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ufUsM-0001kJ-Cy for guix-patches@gnu.org; Fri, 25 Jul 2025 22:43:06 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ufUsL-0005kR-Ri for guix-patches@gnu.org; Fri, 25 Jul 2025 22:43:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=jwUMSM7S6gbM/YBFGQai+c0TvJk46mngAL6hCySIhIE=; b=iOa+lox2Kv5tvGssBTTdbh/y/qWMLgJsm5c8N7Ot465d3QaI3+RBkBWtB+SIJKnxxaLHV9TUvM5+SPYZnIyxaKvsJ6qRDH3gec96XB3Y3j2dul/mLKPvpKgS2fDJP7Ll6bbhbK+gWWrdZ/UQKl25DGid7IGQdtTfMQD01VS1WkI5qPLn8FYtVicClv3M8pWMVVYOnrVEF8bYxEn4qXYHNYJrIg9b4Sm4jtQBW3G0inavfiyzDcvlOWosw0DOZDIKAnP531hSaNiiccARgrAeRih1tBeI9FvvPXvCSw2zGF7KpfHBd8fPUL6pfg37jjCTvP8/P4ZqHG7BnHuTFX33xg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ufUsL-00081z-Gk for guix-patches@gnu.org; Fri, 25 Jul 2025 22:43:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79099] [PATCH 18/34] gnu/packages/i*.scm: Use make-git-version. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Jul 2025 02:43:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 79099 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 79099@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 79099-submit@debbugs.gnu.org id=B79099.175349774030676 (code B ref 79099); Sat, 26 Jul 2025 02:43:05 +0000 Received: (at 79099) by debbugs.gnu.org; 26 Jul 2025 02:42:20 +0000 Received: from localhost ([127.0.0.1]:38172 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ufUrX-0007yV-Ew for submit@debbugs.gnu.org; Fri, 25 Jul 2025 22:42:19 -0400 Received: from 9.mo563.mail-out.ovh.net ([46.105.73.201]:60919) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ufUpc-0007fj-99 for 79099@debbugs.gnu.org; Fri, 25 Jul 2025 22:40:44 -0400 Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net [79.137.60.37]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4bppqz2TrNz6MdK; Sat, 26 Jul 2025 02:40:15 +0000 (UTC) Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net. [127.0.0.1]) by director4.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79099@debbugs.gnu.org>; Sat, 26 Jul 2025 02:40:15 +0000 (UTC) Received: from mta3.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.0.187]) by director4.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bppqz1XQ8z251P; Sat, 26 Jul 2025 02:40:15 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.8]) by mta3.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id D759594313E; Sat, 26 Jul 2025 02:40:14 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-99G0036d5fa789-ae6a-41c9-a728-9abc87d9782d, 7BFD41D65738CBEA4850BE66907D66307393418F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sat, 26 Jul 2025 04:39:24 +0200 Message-ID: <20250726023951.11862-18-ngraves@ngraves.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250726023951.11862-1-ngraves@ngraves.fr> References: <20250726023951.11862-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 4615908145851851490 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 49 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdekhedvfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecuogfuuhhsphgvtghtffhomhgrihhnucdlgeelmdenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepveduheehudegtedujeejteekvdevjeeiuedvgeetveehlefhjeduheduheetffffnecuffhomhgrihhnpehsohhurhgtvghfohhrghgvrdhnvghtpdhgihhthhhusgdrtghomhenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeeltdelleesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeifegmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=jwUMSM7S6gbM/YBFGQai+c0TvJk46mngAL6hCySIhIE=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1753497615; v=1; b=XICJ7kajcrc+rQdg9GryWiUbdGLCLDiJPTXA2CxhF+W7ffTe1Gc0RRuASojOEbeAN6nKWS/i Gb1T/5BIRYKjYsz5JkRS8xdxgTLxDsMHnxYviNOnvYk/9YkhZUrOSc/mUmP9YI78KSTQ8SRlYq3 pjXVf8iJ2W7KlTtBeSaxe2OMrAZsMPrOdGo16MWXg06SwdLuQU+xMboO3qQ6lN8OfqFWXZO0HSP PHU6uiDxyosFTHJrWxhgyNm8ATs6+ykwsDUrIfjoQ3gCyYS8cO7SQrQdqyVn9kmqB9O067wHu3r pNIaZ+G5llXnjcGVvTnJYeyLhe+T9aSWb596R+En+WFlA== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches find gnu/packages/ -type f -name "i*.scm" -exec sed -i 's/(git-version /(make-git-version /g' {} + Then manually checked the potential usage of `version` on the build-side. --- gnu/packages/idris.scm | 8 ++++---- gnu/packages/image-processing.scm | 6 +++--- gnu/packages/image.scm | 12 +++++++----- gnu/packages/inferno.scm | 2 +- gnu/packages/instrumentation.scm | 6 +++--- gnu/packages/ipfs.scm | 4 ++-- 6 files changed, 20 insertions(+), 18 deletions(-) diff --git a/gnu/packages/idris.scm b/gnu/packages/idris.scm index 1837a8a8152..fc4ec7ab5a4 100644 --- a/gnu/packages/idris.scm +++ b/gnu/packages/idris.scm @@ -186,7 +186,7 @@ (define-public idris-lightyear (let ((commit "6d65ad111b4bed2bc131396f8385528fc6b3678a")) (package (name "idris-lightyear") - (version (git-version "0.1" "1" commit)) + (version (make-git-version "0.1" "1" commit)) (source (origin (method git-fetch) (uri (git-reference @@ -211,7 +211,7 @@ (define-public idris-wl-pprint (let ((commit "1d365fcf4ba075859844dbc5eb96a90f57b9f338")) (package (name "idris-wl-pprint") - (version (git-version "0.1" "1" commit)) + (version (make-git-version "0.1" "1" commit)) (source (origin (method git-fetch) (uri (git-reference @@ -236,7 +236,7 @@ (define-public idris-bifunctors (let ((commit "53d06a6ccfe70c49c9ae8c8a4135981dd2173202")) (package (name "idris-bifunctors") - (version (git-version "0.1" "1" commit)) + (version (make-git-version "0.1" "1" commit)) (source (origin (method git-fetch) (uri (git-reference @@ -260,7 +260,7 @@ (define-public idris-lens (let ((commit "26f012005f6849806cea630afe317e42cae97f29")) (package (name "idris-lens") - (version (git-version "0.1" "1" commit)) + (version (make-git-version "0.1" "1" commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 632c00ac823..a1ade701ff6 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -1487,7 +1487,7 @@ (define-public itk-snap ("c3d-src" ,(let* ((commit "f521358db26e00002c911cc47bf463b043942ad3") (revision "1") - (version (git-version "0" revision commit))) + (version (make-git-version "0" revision commit))) (origin (method git-fetch) (uri (git-reference @@ -1502,7 +1502,7 @@ (define-public itk-snap ("greedy-src" ,(let* ((commit "97e340f7e8e66597599144947775e6039e79a0d3") (revision "1") - (version (git-version "0" revision commit))) + (version (make-git-version "0" revision commit))) (origin (method git-fetch) (uri (git-reference @@ -1526,7 +1526,7 @@ (define-public metapixel (let ((commit "98ee9daa093b6c334941242e63f90b1c2876eb4f")) (package (name "metapixel") - (version (git-version "1.0.2" "1" commit)) + (version (make-git-version "1.0.2" "1" commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 1598d330464..bf93cc04195 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -462,7 +462,7 @@ (define-public pnglite ;; The latest version in sourceforge was 0.1.17: ;; https://sourceforge.net/projects/pnglite/files/pnglite/ ;; No releases are made in github. - (version (git-version "0.1.17" revision commit)) + (version (make-git-version "0.1.17" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -496,7 +496,9 @@ (define-public pnglite (lib (string-append out "/lib/")) (include (string-append out "/include/")) (doc (string-append out "/share/doc/" - ,name "-" ,version "/"))) + ,name "-" + ,(package-version this-package) + "/"))) (install-file "libpnglite.so" lib) (install-file "pnglite.h" include) (install-file "README.md" doc) @@ -1493,7 +1495,7 @@ (define-public vigra-c (revision "2")) (package (name "vigra-c") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (home-page "https://github.com/BSeppke/vigra_c") (source (origin (method git-fetch) @@ -2177,7 +2179,7 @@ (define-public flameshot (revision "1")) (package (name "flameshot") - (version (git-version "12.1.0" revision commit)) + (version (make-git-version "12.1.0" revision commit)) (source (origin (method git-fetch) @@ -2457,7 +2459,7 @@ (define-public lodepng (version "20200215")) (package (name "lodepng") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/inferno.scm b/gnu/packages/inferno.scm index 67df73bf02c..38796754a55 100644 --- a/gnu/packages/inferno.scm +++ b/gnu/packages/inferno.scm @@ -35,7 +35,7 @@ (define-public inferno (revision "0")) (package (name "inferno") - (version (git-version "4" revision commit)) + (version (make-git-version "4" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/instrumentation.scm b/gnu/packages/instrumentation.scm index 81bbd5118eb..56642fb8fdb 100644 --- a/gnu/packages/instrumentation.scm +++ b/gnu/packages/instrumentation.scm @@ -252,7 +252,7 @@ (define-public flamegraph (revision "1")) (package (name "flamegraph") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -291,7 +291,7 @@ (define-public jacquesctf (revision "0")) (package (name "jacquesctf") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -687,7 +687,7 @@ (define-public yactfr (revision "0")) (package (name "yactfr") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm index 4140000bd1a..fd3deead52e 100644 --- a/gnu/packages/ipfs.scm +++ b/gnu/packages/ipfs.scm @@ -555,7 +555,7 @@ (define-public go-github-com-ipfs-go-ipfs-blocksutil (revision "0")) (package (name "go-github-com-ipfs-go-ipfs-blocksutil") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -2607,7 +2607,7 @@ (define-public spritely-libp2p-daemon (revision "0")) (package (name "spritely-libp2p-daemon") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) From patchwork Sat Jul 26 02:39:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43277 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 6F0F127BC4C; Sat, 26 Jul 2025 03:42:48 +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 0E68B27BC4B for ; Sat, 26 Jul 2025 03:42:48 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufUqy-0000V2-It; Fri, 25 Jul 2025 22:41:40 -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 1ufUqw-0000RR-2c for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:38 -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 1ufUqv-0005TG-HY for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:37 -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=iXTMPDNklfjwuMRj/SnhIeRlPEc0SEu4M92rKttyXeM=; b=TyZaAHxOZUp0jOnCPUyyvz+e7C9DVBbVcSGruOGqlM6xkVatJmo0lcYb81ExguU5qMzfBi+yVcEne+eOuN8bYA1RjUEuMouOHay2e+T3HqEUZTLmzXzsCQjo6I8KKGnO4hm0HHUwnOKvPZlhSIe4s8bBKye2Xpc7MpdHK4gIQ+bHxB8ylS15Ow9yhpFQA6wT0QlryexHHPtASFWlNADLemF9/Y5QbAw89+iajH9bSwBh906hdrL/y5KjPPb8r6BMxkrkARU3xzS5QTh+c7gmdlz0gWMWyf9cR3VFwhZriWcjmrwlmY1FD5VbmjTWsRg26iQJmbSl41k2CIWXjkvFFQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ufUqv-0007vx-0s for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:37 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79099] [PATCH 19/34] gnu/packages/j*.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:36 +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.175349769230452 (code B ref 79099); Sat, 26 Jul 2025 02:41:36 +0000 Received: (at 79099) by debbugs.gnu.org; 26 Jul 2025 02:41:32 +0000 Received: from localhost ([127.0.0.1]:38152 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ufUqo-0007us-5c for submit@debbugs.gnu.org; Fri, 25 Jul 2025 22:41:31 -0400 Received: from 4.mo563.mail-out.ovh.net ([46.105.53.192]:39171) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ufUpd-0007fu-T7 for 79099@debbugs.gnu.org; Fri, 25 Jul 2025 22:40:43 -0400 Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net [51.68.80.175]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4bppr04WVRz5yQS; Sat, 26 Jul 2025 02:40:16 +0000 (UTC) Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net. [127.0.0.1]) by director1.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79099@debbugs.gnu.org>; Sat, 26 Jul 2025 02:40:16 +0000 (UTC) Received: from mta2.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.188.190]) by director1.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bppr02Dxtz5wHV; Sat, 26 Jul 2025 02:40:16 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.9]) by mta2.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id E61AC3E3062; Sat, 26 Jul 2025 02:40:15 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-114S0083d18a8ab-0b82-4cd2-953f-c95622cfe546, 7BFD41D65738CBEA4850BE66907D66307393418F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sat, 26 Jul 2025 04:39:25 +0200 Message-ID: <20250726023951.11862-19-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: 4616189619698787042 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdekhedvfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvheelieffheetvdelhfffffejfefgudfhteekveehieetudeiudfgkeeutdehjeenucffohhmrghinhepghhithhhuhgsrdgtohhmnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledtleelseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehieefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=iXTMPDNklfjwuMRj/SnhIeRlPEc0SEu4M92rKttyXeM=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1753497616; v=1; b=NNzladAQhsQSriwkeps5qNJT7WfZD1541jSmWaBWaA2b+DssDyXXj2ozFgKvvpZ40Z6aTzzf GuP83bYb+JpzySOgR5ZsgccdkA4c7a1KcBpbrbPJNW0MKDTI/UnUT8CxuRsHPhnSfXGT/nfHX8m qFmncKCPNt4lazj1Xe8wqQ6Rnfg8CXAJkK670Wovrl8YB/Yg/csZmQojpGe9qrhdqyr8TtUWXy5 XkhX4GQgFyXNlFxiJo1bSN6rhZgfNPVM3yk5aYoZ4nivJ5plX2yBXtiH4GRlymhJBni+M37cc+B LJPPl0RpSpxHrxg25NeTjudWiz4rXKiNObXJPX5FSXvfA== 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 "j*.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/jami.scm | 4 ++-- gnu/packages/java.scm | 4 ++-- gnu/packages/julia-xyz.scm | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 327272170c3..b2fc1fdfadc 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -196,7 +196,7 @@ (define sortfilterproxymodel ;; https://github.com/oKcerG/SortFilterProxyModel/blob/ ;; 5a930885b7ea99f7f41c25fce08bf8006ee54e3f/ ;; qqmlsortfilterproxymodel.cpp#L574C15-L574C15). - (version (git-version "0.2" revision commit)) + (version (make-git-version "0.2" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -343,7 +343,7 @@ (define-public jami-docs (commit "4764cc83ccac2a64d7d9051ad915bbf762c6a624")) (package (name "jami-docs") - (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/java.scm b/gnu/packages/java.scm index c24bb0bdd87..98589d69ff1 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2262,7 +2262,7 @@ (define-public drip (let ((commit "a4bd00df0199e78243847f06cc04ecaea31f8f08")) (package (name "drip") - (version (git-version "0.2.4" "1" commit)) + (version (make-git-version "0.2.4" "1" commit)) (source (origin (method git-fetch) (uri (git-reference @@ -14550,7 +14550,7 @@ (define-public tla2tools (commit "6932e19083fc6df42473464857fc1280cb5aaecc")) (package (name "tla2tools") - (version (git-version release revision commit)) + (version (make-git-version release revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index c3c7872786e..9e7b4b85881 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -615,7 +615,7 @@ (define-public julia-biogenerics (revision "1")) (package (name "julia-biogenerics") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -1459,7 +1459,7 @@ (define-public julia-coordinatetransformations (revision "1")) (package (name "julia-coordinatetransformations") - (version (git-version "0.6.2" revision commit)) + (version (make-git-version "0.6.2" revision commit)) (source (origin (method git-fetch) @@ -3743,7 +3743,7 @@ (define-public julia-intervaltrees (revision "1")) (package (name "julia-intervaltrees") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -6000,7 +6000,7 @@ (define-public julia-rotations (revision "1")) (package (name "julia-rotations") - (version (git-version "1.0.2" revision commit)) + (version (make-git-version "1.0.2" revision commit)) (source (origin (method git-fetch) @@ -6032,7 +6032,7 @@ (define-public julia-safetestsets (revision "1")) (package (name "julia-safetestsets") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) From patchwork Sat Jul 26 02:39:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43302 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 802CD27BC4D; Sat, 26 Jul 2025 03:42:59 +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 BE0F827BC49 for ; Sat, 26 Jul 2025 03:42:58 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufUr1-0000Xv-OW; Fri, 25 Jul 2025 22:41:43 -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 1ufUqw-0000TU-UK for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:39 -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 1ufUqw-0005TR-IL for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:38 -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=LQquEa3yj2h4etpYUN47DdBe82xJ0gzD0qVzSjKXO60=; b=pgwlS0THItbaCc1wKfZ3GNsnLObHrw2+TlgP4OjL3pwgPZBcFg3Yh7ogR39mxI5XoK5bTOnZOg1DQ4Eg5t238gFpO4Q8FmhbWYr3o2cV8sbvkWfk3px9V/vBoAmrJRpeRRZp3qzj7oERjpMYqwMhdd2NxqX4561lLr7JLYp9h5heISxxjdsr4Amnv67xYqn6JfNPGNLeOTpvqHVn2/DDxYxDS/QVKGw1I2IzkxovmpgpIPO9uaySa7skC3Tbi4xcCGc7jlzjskoaSPf5AtQdNWsFYtFZbeci/m5Ktiv6Sn0yiXiKXNQyjqF36S9xERCeVuqXqX2059ZqJmn1vu92vA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ufUqw-0007wD-80 for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:38 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79099] [PATCH 20/34] gnu/packages/k*.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:38 +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.175349769430471 (code B ref 79099); Sat, 26 Jul 2025 02:41:38 +0000 Received: (at 79099) by debbugs.gnu.org; 26 Jul 2025 02:41:34 +0000 Received: from localhost ([127.0.0.1]:38154 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ufUqp-0007v7-Pl for submit@debbugs.gnu.org; Fri, 25 Jul 2025 22:41:32 -0400 Received: from 8.mo563.mail-out.ovh.net ([46.105.60.197]:58447) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ufUpf-0007g0-6z for 79099@debbugs.gnu.org; Fri, 25 Jul 2025 22:40:44 -0400 Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net [79.137.60.37]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4bppr15MwCz5yYj; Sat, 26 Jul 2025 02:40:17 +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:17 +0000 (UTC) Received: from mta2.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.188.190]) by director4.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bppr13vQ5z251P; Sat, 26 Jul 2025 02:40:17 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.5]) by mta2.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 17D593E3062; Sat, 26 Jul 2025 02:40:17 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-108S002e00ba9ce-b3f9-41ed-a728-ab405db91c1f, 7BFD41D65738CBEA4850BE66907D66307393418F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sat, 26 Jul 2025 04:39:26 +0200 Message-ID: <20250726023951.11862-20-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: 4616471093416747746 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdekhedvfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelffejteeutefhfeekfffffedvudekjeekgfeludeitdfhkeevhfeivdfhffeggeenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggeenucevlhhushhtvghrufhiiigvpeefnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeeltdelleesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeifegmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=LQquEa3yj2h4etpYUN47DdBe82xJ0gzD0qVzSjKXO60=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1753497617; v=1; b=f+Rf0HMHSnYpDHaR5KhCufqa/RJOsdEoozcRUkfWIdomKTa4qaxc1ZRTPbEutbJ83MNrtb0O m5H+iP5hylPw6GRVYqkr3e3PIO2xo8KJv1CQqxGg88PG9Mqlcu17Ga0fT+lcb3QlqQ8ac48u8pc mEG6aJKSThX3grTePvQax+qX2h77bG8OONwD986PYAk0BZWeubcvPivJlu+9sQg5Zi9PT558QbT LFqJThvqj5st1K8B4kXl6IGOknGuCX7on11QFfzgWHaWqT1KIvsYjR9AB1bEZQui5e6YdPrKtIH y94H9k5GYd4V2AoTYvHJ3i9hIxgf+FO27l4wjKbJPu5vg== 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 "k*.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/kde-pim.scm | 2 +- gnu/packages/kde-plasma.scm | 2 +- gnu/packages/kde-utils.scm | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 3f713bb7c23..82711e355c1 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -1974,7 +1974,7 @@ (define-public kpeoplevcard ;; use unreleased commit for KF6 supports. (package (name "kpeoplevcard") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index 7742a3ffbf2..dfa58c26c9c 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -2409,7 +2409,7 @@ (define-public plasma-pass (revision "0")) (package (name "plasma-pass") - (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 diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm index bc79975bef8..4cb3891a489 100644 --- a/gnu/packages/kde-utils.scm +++ b/gnu/packages/kde-utils.scm @@ -139,7 +139,7 @@ (define-public atelier (revision "1")) (package (name "atelier") - (version (git-version "0.1-pre" revision commit)) + (version (make-git-version "0.1-pre" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -178,7 +178,7 @@ (define-public basket (revision "2")) (package (name "basket") - (version (git-version "2.49" revision commit)) + (version (make-git-version "2.49" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -233,7 +233,7 @@ (define-public fielding (revision "2")) (package (name "fielding") - (version (git-version "0.1-pre" revision commit)) + (version (make-git-version "0.1-pre" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -614,7 +614,7 @@ (define-public keurocalc (revision "2")) (package (name "keurocalc") - (version (git-version "1.3.0" revision commit)) + (version (make-git-version "1.3.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -704,7 +704,7 @@ (define-public kirogi (revision "1")) (package (name "kirogi") - (version (git-version "0.1-pre" revision commit)) + (version (make-git-version "0.1-pre" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -786,7 +786,7 @@ (define-public libatcore (revision "1")) (package (name "libatcore") - (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 @@ -921,7 +921,7 @@ (define-public krename (revision "0")) (package (name "krename") - (version (git-version "5.0.2" revision commit)) + (version (make-git-version "5.0.2" revision commit)) (source (origin (method git-fetch) (uri (git-reference From patchwork Sat Jul 26 02:39:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43273 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 6C4A127BC4A; Sat, 26 Jul 2025 03:42:32 +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.3 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,URIBL_SBL_A autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3C23327BC49 for ; Sat, 26 Jul 2025 03:42:29 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufUqX-0008S5-Aq; Fri, 25 Jul 2025 22:41:13 -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 1ufUqU-0008Qb-Pa for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:10 -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 1ufUqU-0005Ob-D2 for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:10 -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=501wpXyoLwi+Pb7RPr9dInnnHFsAqzqmFof3P23yZSI=; b=DZBuwLAgVdUP4Ea9T8ePaByyokr1rQPV7h4VlQO9fvgcDcxMEyrFlSR6sIH1Wb1wUHrsKb0ttAmq/TYVwduJCYIAyXyNByE4Cm4TlGStJgr2pHQh8A0ipS8RkDq28vyr1XtRce38/MU4XT1y96N2TUA3VWs3I/BS0iDOuTBf8RHJQ41T/7O/FRYUEd1+XcjeXvUvCtq2Qnh4i5UkDK2hbeU1GYbJbDnCnWyrcVVKZmzvjrGMIf/sXa6oKMBv5T8AfaZMlWHnd9FUHDV17TXGjNqjzenYsyAu6Hn5KslE8h69MHlCWqTnDBPLx31IofZfRWJmcmT+ieJ1h4DJ1bq4Ng==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ufUqR-0007rc-US for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79099] [PATCH 21/34] gnu/packages/l*.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: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.175349763529905 (code B ref 79099); Sat, 26 Jul 2025 02:41:07 +0000 Received: (at 79099) by debbugs.gnu.org; 26 Jul 2025 02:40:35 +0000 Received: from localhost ([127.0.0.1]:38103 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ufUpt-0007lr-05 for submit@debbugs.gnu.org; Fri, 25 Jul 2025 22:40:33 -0400 Received: from 4.mo563.mail-out.ovh.net ([46.105.53.192]:37905) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ufUpf-0007gO-LW for 79099@debbugs.gnu.org; Fri, 25 Jul 2025 22:40:20 -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 4bppr24R4cz5y8y; Sat, 26 Jul 2025 02:40:18 +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:18 +0000 (UTC) Received: from mta2.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.96.1]) by director2.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bppr22Hmsz1xpd; Sat, 26 Jul 2025 02:40:18 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.8]) by mta2.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 02E133E3062; Sat, 26 Jul 2025 02:40:17 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-104R005fae40417-1475-4925-9991-3c5b560c2166, 7BFD41D65738CBEA4850BE66907D66307393418F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sat, 26 Jul 2025 04:39:27 +0200 Message-ID: <20250726023951.11862-21-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: 4616752570167780066 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdekhedvfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvfedukedtveegkeeitddvjeelgeefgeelieefledvkeevkeejleetteeivdegueenucffohhmrghinhepshgtmhdrrghtpdhkvghrnhgvlhdrohhrghdpghhithhhuhgsrdgtohhmpdhgihhthhhusghushgvrhgtohhnthgvnhhtrdgtohhmpdekrghrrhhofidrohhrghdptghomhhmohhnqdhlihhsphdrnhgvthenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeeltdelleesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeifegmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=501wpXyoLwi+Pb7RPr9dInnnHFsAqzqmFof3P23yZSI=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1753497618; v=1; b=YwtSBoCUVGU9uTzFYnVaVeBzONieSgHPgUojgUADCRHPoRoYHPRdcaywlKMBRTBVq8hF4z3W tOtg3YjFJ4ysMvXrMNvYXNPRhd6mpv/dXo1+XJhfeuCf6CDyHTIYybqzzvJ6Vfu2Zzvq9mVTmYQ NRDo0GqWHAhfSIUlbCTZvxiAgNWZXvTBjb4fMwjR+ac6118W8b2IkeBeAZbDf9Gwy/IIQmCX7Uu cXNAmoa4ySdeuGfR9WnxQeGw3RlowwvBZTi5RK+2C7+A69Ka8qPhuDJyKbzT9yY4shzfEc7J+UA UaF746hMijAvGiK4zoIITzh4RkIICRlJNBH7vVVXI1+rQ== 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 "l*.scm" -exec sed -i 's/(git-version /(make-git-version /g' {} + Then manually checked the potential usage of `version` on the build-side. Note: I haven't checked thoroughly each package in gnu/packages/lisp-xyz.scm. At first sight, searching for #$version or ,version, I did see nothing. --- gnu/packages/language.scm | 2 +- gnu/packages/lesstif.scm | 2 +- gnu/packages/libevent.scm | 2 +- gnu/packages/libusb.scm | 2 +- gnu/packages/linphone.scm | 10 +- gnu/packages/linux.scm | 36 +- gnu/packages/lisp-check.scm | 60 +- gnu/packages/lisp-xyz.scm | 1414 +++++++++++++++++------------------ gnu/packages/lisp.scm | 6 +- gnu/packages/logging.scm | 2 +- gnu/packages/lua.scm | 2 +- gnu/packages/luanti.scm | 10 +- 12 files changed, 774 insertions(+), 774 deletions(-) diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index 356aaacbc83..b7bb0def2c9 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -401,7 +401,7 @@ (define-public liblouisutdml (revision "0")) (package (name "liblouisutdml") - (version (git-version "2.12.0" revision commit)) + (version (make-git-version "2.12.0" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/lesstif.scm b/gnu/packages/lesstif.scm index 01ca9a99fa2..1ba6cacd3a3 100644 --- a/gnu/packages/lesstif.scm +++ b/gnu/packages/lesstif.scm @@ -61,7 +61,7 @@ (define-public motif (revision "0")) (package (name "motif") - (version (git-version "2.3.8" revision commit)) + (version (make-git-version "2.3.8" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index be9086d7cef..e2d2a49f7b8 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -197,7 +197,7 @@ (define-public libuv-julia (package (inherit libuv) (name "libuv-julia") - (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 diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index eb6dc9a844a..a95cc126c55 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -148,7 +148,7 @@ (define-public libusb4java (revision "1")) (package (name "libusb4java") - (version (git-version "1.3.1" revision commit)) + (version (make-git-version "1.3.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 9b84a5b3a9a..8b46078772d 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -66,7 +66,7 @@ (define-public bcunit (revision "0")) (package (name "bcunit") - (version (git-version "3.0.2" revision commit)) + (version (make-git-version "3.0.2" revision commit)) (source (origin (method git-fetch) @@ -917,7 +917,7 @@ (define-public msopenh264 (revision "0")) (package (name "msopenh264") - (version (git-version "1.2.1" revision commit)) + (version (make-git-version "1.2.1" revision commit)) (source (origin (method git-fetch) @@ -945,7 +945,7 @@ (define-public mssilk (revision "0")) (package (name "mssilk") - (version (git-version "1.1.1" revision commit)) + (version (make-git-version "1.1.1" revision commit)) (source (origin (method git-fetch) @@ -973,7 +973,7 @@ (define-public mswebrtc (revision "0")) (package (name "mswebrtc") - (version (git-version "1.1.1" revision commit)) + (version (make-git-version "1.1.1" revision commit)) (source (origin (method git-fetch) @@ -1024,7 +1024,7 @@ (define-public msamr (revision "0")) (package (name "msamr") - (version (git-version "1.1.3" revision commit)) + (version (make-git-version "1.1.3" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8a6538a7ee4..50685139f78 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2558,7 +2558,7 @@ (define-public bbswitch-module (let ((commit "19f60204596a6463b162fc7ca11f4946f5c20cea")) (package (name "bbswitch-module") - (version (git-version "0.8" "2" commit)) + (version (make-git-version "0.8" "2" commit)) (source (origin (method git-fetch) (uri (git-reference @@ -2586,7 +2586,7 @@ (define-public bin-graph (revision "0")) (package (name "bin-graph") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -2619,7 +2619,7 @@ (define-public ddcci-driver-linux (commit "7f8f8e6c221a286d57a643c2909109a54e084eed")) (package (name "ddcci-driver-linux") - (version (git-version "0.4.5" revision commit)) + (version (make-git-version "0.4.5" revision commit)) (source (origin (method git-fetch) @@ -2730,7 +2730,7 @@ (define-public vendor-reset-linux-module (revision "0")) (package (name "vendor-reset-linux-module") - (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 @@ -4661,7 +4661,7 @@ (define-public iotop-python (commit "a14256a3ff74eeee59493ac088561f1bafab85a7")) (package (name "iotop-python") - (version (git-version "0.6" revision commit)) + (version (make-git-version "0.6" revision commit)) (source (origin (method git-fetch) @@ -6533,7 +6533,7 @@ (define-public cpufrequtils (revision "1")) (package (name "cpufrequtils") - (version (git-version "008" revision commit )) + (version (make-git-version "008" revision commit )) (source (origin (method git-fetch) @@ -6947,7 +6947,7 @@ (define-public blktrace (revision "1")) (package (name "blktrace") - (version (git-version "1.3.0" revision commit)) + (version (make-git-version "1.3.0" revision commit)) (home-page "https://git.kernel.org/pub/scm/linux/kernel/git/axboe/blktrace.git") (source (origin @@ -7351,7 +7351,7 @@ (define-public compsize (revision "0")) (package (name "compsize") - (version (git-version "1.5" revision commit)) + (version (make-git-version "1.5" revision commit)) (home-page "https://github.com/kilobyte/compsize") (source (origin (method git-fetch) @@ -7555,7 +7555,7 @@ (define-public nbfc-linux (revision "0")) (package (name "nbfc-linux") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -8448,7 +8448,7 @@ (define-public mce-inject (commit "4cbe46321b4a81365ff3aafafe63967264dbfec5")) (package (name "mce-inject") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -9827,7 +9827,7 @@ (define-public cassini-headers (revision "0")) (package (name "cassini-headers") - (version (git-version "2.0.0" ;per .spec file + (version (make-git-version "2.0.0" ;per .spec file revision commit)) (home-page "https://github.com/HewlettPackard/shs-cassini-headers") (source (origin @@ -9857,7 +9857,7 @@ (define-public cxi-driver (revision "0")) (package (name "cxi-driver") - (version (git-version "1.0.0" ;per .spec file + (version (make-git-version "1.0.0" ;per .spec file revision commit)) (home-page "https://github.com/HewlettPackard/shs-cxi-driver") (source @@ -9887,7 +9887,7 @@ (define-public libcxi (revision "0")) (package (name "libcxi") - (version (git-version "1.0.1" revision commit)) + (version (make-git-version "1.0.1" revision commit)) (home-page "https://github.com/HewlettPackard/shs-libcxi") (source (origin @@ -10437,7 +10437,7 @@ (define-public simpleini (revision "1")) (package (name "simpleini") - (version (git-version "4.22" revision commit)) + (version (make-git-version "4.22" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -10713,7 +10713,7 @@ (define-public fakechroot (revision "0")) (package (name "fakechroot") - (version (git-version "2.20.1" revision commit)) + (version (make-git-version "2.20.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -11011,7 +11011,7 @@ (define-public ell (revision "1")) (package (name "ell") - (version (git-version "0.77" revision commit)) + (version (make-git-version "0.77" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -11357,7 +11357,7 @@ (define-public ttyebus-linux-module (commit "fe4332a2281cf79804ef4d8516aa848ca1c58d1f")) (package (name "ttyebus-linux-module") - (version (git-version "1.5" revision commit)) + (version (make-git-version "1.5" revision commit)) (source (origin (method git-fetch) @@ -11540,7 +11540,7 @@ (define-public renameat2 (commit "5c5193f20142511a5fc7069a539f4e5aba0ea470")) (package (name "renameat2") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method url-fetch) (uri (string-append "https://gist.githubusercontent.com/" diff --git a/gnu/packages/lisp-check.scm b/gnu/packages/lisp-check.scm index a41e905a8b3..6d2d8481aa1 100644 --- a/gnu/packages/lisp-check.scm +++ b/gnu/packages/lisp-check.scm @@ -42,7 +42,7 @@ (define-public sbcl-1am (let ((commit "8b1da94eca4613fd8a20bdf63f0e609e379b0ba5")) (package (name "sbcl-1am") - (version (git-version "0.0" "1" commit)) + (version (make-git-version "0.0" "1" commit)) (source (origin (method git-fetch) @@ -73,7 +73,7 @@ (define-public sbcl-2am (revision "0")) (package (name "sbcl-2am") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -106,7 +106,7 @@ (define-public sbcl-assertion-error (revision "1")) (package (name "sbcl-assertion-error") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -192,7 +192,7 @@ (define-public sbcl-check-it (let ((commit "b79c9103665be3976915b56b570038f03486e62f")) (package (name "sbcl-check-it") - (version (git-version "0.1.0" "1" commit)) + (version (make-git-version "0.1.0" "1" commit)) (source (origin (method git-fetch) @@ -226,7 +226,7 @@ (define-public sbcl-checkl (revision "1")) (package (name "sbcl-checkl") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -267,7 +267,7 @@ (define-public sbcl-cl-mock (revision "0")) (package (name "sbcl-cl-mock") - (version (git-version "1.1.0" revision commit)) + (version (make-git-version "1.1.0" revision commit)) (source (origin (method git-fetch) @@ -305,7 +305,7 @@ (define-public sbcl-cl-quickcheck (revision "1")) (package (name "sbcl-cl-quickcheck") - (version (git-version "0.0.4" revision commit)) + (version (make-git-version "0.0.4" revision commit)) (source (origin (method git-fetch) @@ -339,7 +339,7 @@ (define-public sbcl-clunit (revision "1")) (package (name "sbcl-clunit") - (version (git-version "0.2.3" revision commit)) + (version (make-git-version "0.2.3" revision commit)) (source (origin (method git-fetch) @@ -375,7 +375,7 @@ (define-public sbcl-clunit2 (revision "1")) (package (name "sbcl-clunit2") - (version (git-version "0.7.0" revision commit)) + (version (make-git-version "0.7.0" revision commit)) (source (origin (method git-fetch) @@ -407,7 +407,7 @@ (define-public sbcl-confidence (revision "0")) (package (name "sbcl-confidence") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -444,7 +444,7 @@ (define-public sbcl-eos (revision "2")) (package (name "sbcl-eos") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -477,7 +477,7 @@ (define-public sbcl-fiasco (revision "2")) (package (name "sbcl-fiasco") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -582,7 +582,7 @@ (define-public sbcl-hu.dwim.stefil (let ((commit "414902c6f575818c39a8a156b8b61b1adfa73dad")) (package (name "sbcl-hu.dwim.stefil") - (version (git-version "0.0.0" "2" commit)) + (version (make-git-version "0.0.0" "2" commit)) (source (origin (method git-fetch) @@ -618,7 +618,7 @@ (define-public sbcl-kaputt (revision "1")) (package (name "sbcl-kaputt") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -662,7 +662,7 @@ (define-public sbcl-lift (revision "3")) (package (name "sbcl-lift") - (version (git-version "1.7.1" revision commit)) + (version (make-git-version "1.7.1" revision commit)) (source (origin (method git-fetch) @@ -702,7 +702,7 @@ (define-public sbcl-lisp-unit (let ((commit "89653a232626b67400bf9a941f9b367da38d3815")) (package (name "sbcl-lisp-unit") - (version (git-version "0.0.0" "1" commit)) + (version (make-git-version "0.0.0" "1" commit)) (source (origin (method git-fetch) @@ -737,7 +737,7 @@ (define-public sbcl-lisp-unit2 (revision "0")) (package (name "sbcl-lisp-unit2") - (version (git-version "0.9.4" revision commit)) + (version (make-git-version "0.9.4" revision commit)) (source (origin (method git-fetch) @@ -770,7 +770,7 @@ (define-public sbcl-nst (revision "1")) (package (name "sbcl-nst") - (version (git-version "4.1.2" revision commit)) + (version (make-git-version "4.1.2" revision commit)) (source (origin (method git-fetch) @@ -800,7 +800,7 @@ (define-public sbcl-parachute (revision "2")) (package (name "sbcl-parachute") - (version (git-version "1.5.0" revision commit)) + (version (make-git-version "1.5.0" revision commit)) (source (origin (method git-fetch) @@ -838,7 +838,7 @@ (define-public sbcl-prove (revision "2")) (package (name "sbcl-prove") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -879,7 +879,7 @@ (define-public sbcl-ptester (revision "1")) (package (name "sbcl-ptester") - (version (git-version "2.1.3" revision commit)) + (version (make-git-version "2.1.3" revision commit)) (source (origin (method git-fetch) @@ -917,7 +917,7 @@ (define-public sbcl-rove (revision "1")) (package (name "sbcl-rove") - (version (git-version "0.10.0" revision commit)) + (version (make-git-version "0.10.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -949,7 +949,7 @@ (define-public sbcl-rt (revision "1")) (package (name "sbcl-rt") - (version (git-version "1990.12.19" revision commit)) + (version (make-git-version "1990.12.19" revision commit)) (source (origin (method git-fetch) @@ -986,7 +986,7 @@ (define-public sbcl-should-test (revision "0")) (package (name "sbcl-should-test") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -1044,7 +1044,7 @@ (define-public sbcl-stefil (revision "0")) (package (name "sbcl-stefil") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -1087,7 +1087,7 @@ (define-public sbcl-trivial-coverage (revision "0")) (package (name "sbcl-trivial-coverage") - (version (git-version "0.0.4" revision commit)) + (version (make-git-version "0.0.4" revision commit)) (source (origin (method git-fetch) @@ -1118,7 +1118,7 @@ (define-public sbcl-try (revision "2")) (package (name "sbcl-try") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -1160,7 +1160,7 @@ (define-public sbcl-unit-test (revision "1")) (package (name "sbcl-unit-test") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -1190,7 +1190,7 @@ (define-public sbcl-xlunit (revision "1")) (package (name "sbcl-xlunit") - (version (git-version "0.6.3" revision commit)) + (version (make-git-version "0.6.3" revision commit)) (source (origin (method git-fetch) @@ -1237,7 +1237,7 @@ (define-public sbcl-lisp-critic (revision "1")) (package (name "sbcl-lisp-critic") - (version (git-version "1.1" revision commit)) + (version (make-git-version "1.1" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 30a7fb34af4..3649ae743cb 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -148,7 +148,7 @@ (define-public sbcl-3b-bmfont (revision "3")) (package (name "sbcl-3b-bmfont") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -189,7 +189,7 @@ (define sbcl-3b-bmfont/shinmera (let ((commit "58e529d24b7799d56b4b3f9c8a953b585d42c7d2") (revision "1")) (package (inherit sbcl-3b-bmfont) - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -205,7 +205,7 @@ (define-public sbcl-3bmd (revision "4")) (package (name "sbcl-3bmd") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -258,7 +258,7 @@ (define-public sbcl-3bz (revision "1")) (package (name "sbcl-3bz") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -296,7 +296,7 @@ (define-public sbcl-3d-math (revision "0")) (package (name "sbcl-3d-math") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -333,7 +333,7 @@ (define-public sbcl-3d-matrices (revision "2")) (package (name "sbcl-3d-matrices") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -370,7 +370,7 @@ (define-public sbcl-3d-quaternions (revision "0")) (package (name "sbcl-3d-quaternions") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -413,7 +413,7 @@ (define-public sbcl-3d-spaces (revision "0")) (package (name "sbcl-3d-spaces") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -450,7 +450,7 @@ (define-public sbcl-3d-transforms (revision "0")) (package (name "sbcl-3d-transforms") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -495,7 +495,7 @@ (define-public sbcl-3d-vectors (revision "2")) (package (name "sbcl-3d-vectors") - (version (git-version "3.1.0" revision commit)) + (version (make-git-version "3.1.0" revision commit)) (source (origin (method git-fetch) @@ -532,7 +532,7 @@ (define-public sbcl-40ants-asdf-system (revision "0")) (package (name "sbcl-40ants-asdf-system") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -562,7 +562,7 @@ (define-public sbcl-40ants-doc (revision "0")) (package (name "sbcl-40ants-doc") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -645,7 +645,7 @@ (define-public sbcl-40ants-plantuml (revision "0")) (package (name "sbcl-40ants-plantuml") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -688,7 +688,7 @@ (define-public sbcl-abstract-classes (revision "1")) (package (name "sbcl-abstract-classes") - (version (git-version "1.7.0" revision commit)) + (version (make-git-version "1.7.0" revision commit)) (source (origin (method git-fetch) @@ -721,7 +721,7 @@ (define-public sbcl-access (revision "1")) (package (name "sbcl-access") - (version (git-version "1.6.0" revision commit)) + (version (make-git-version "1.6.0" revision commit)) (source (origin (method git-fetch) @@ -757,7 +757,7 @@ (define-public sbcl-acclimation (let ((commit "4d51150902568fcd59335f4cc4cfa022df6116a5")) (package (name "sbcl-acclimation") - (version (git-version "0.0.0" "1" commit)) + (version (make-git-version "0.0.0" "1" commit)) (source (origin (method git-fetch) @@ -790,7 +790,7 @@ (define-public sbcl-ecclesia (let ((commit "605debb6f28f120243da66c281274011e292ce46")) (package (name "sbcl-ecclesia") - (version (git-version "0.0.0" "0" commit)) + (version (make-git-version "0.0.0" "0" commit)) (source (origin (method git-fetch) @@ -820,7 +820,7 @@ (define-public sbcl-acl-compat (let ((commit "cac1d6920998ddcbee8310a873414732e707d8e5")) (package (name "sbcl-acl-compat") - (version (git-version "0.1.1" "1" commit)) + (version (make-git-version "0.1.1" "1" commit)) (source (origin (method git-fetch) @@ -891,7 +891,7 @@ (define-public sbcl-agnostic-lizard (revision "2")) (package (name "sbcl-agnostic-lizard") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -923,7 +923,7 @@ (define-public sbcl-agutil (let ((commit "df188d754d472da9faa1601a48f1f37bb7b34d68")) (package (name "sbcl-agutil") - (version (git-version "0.0.1" "1" commit)) + (version (make-git-version "0.0.1" "1" commit)) (source (origin (method git-fetch) @@ -1011,7 +1011,7 @@ (define-public sbcl-alexandria (revision "0")) (package (name "sbcl-alexandria") - (version (git-version "1.4" revision commit)) + (version (make-git-version "1.4" revision commit)) (source (origin (method git-fetch) @@ -1072,7 +1072,7 @@ (define-public sbcl-alexandria-plus (package (name "sbcl-alexandria-plus") ;; Version is stated in the ASD file. - (version (git-version "1.1.0" revision commit)) + (version (make-git-version "1.1.0" revision commit)) (source (origin (method git-fetch) @@ -1110,7 +1110,7 @@ (define-public sbcl-alloy (revision "3")) (package (name "sbcl-alloy") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -1158,7 +1158,7 @@ (define-public sbcl-amb (revision "0")) (package (name "sbcl-amb") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -1229,7 +1229,7 @@ (define-public sbcl-antik-base (revision "1")) (package (name "sbcl-antik-base") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -1325,7 +1325,7 @@ (define-public sbcl-anypool (revision "1")) (package (name "sbcl-anypool") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -1362,7 +1362,7 @@ (define-public sbcl-april (revision "3")) (package (name "sbcl-april") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -1415,7 +1415,7 @@ (define-public sbcl-archive (revision "1")) (package (name "sbcl-archive") - (version (git-version "0.9" revision commit)) + (version (make-git-version "0.9" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1446,7 +1446,7 @@ (define-public sbcl-arnesi (revision "1")) (package (name "sbcl-arnesi") - (version (git-version "2.0.0" revision commit)) + (version (make-git-version "2.0.0" revision commit)) (source (origin (method git-fetch) @@ -1498,7 +1498,7 @@ (define-public sbcl-array-operations (revision "0")) (package (name "sbcl-array-operations") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -1531,7 +1531,7 @@ (define-public sbcl-array-utils (revision "0")) (package (name "sbcl-array-utils") - (version (git-version "1.2.0" revision commit)) + (version (make-git-version "1.2.0" revision commit)) (source (origin (method git-fetch) @@ -1570,7 +1570,7 @@ (define-public sbcl-arrow-macros (revision "0")) (package (name "sbcl-arrow-macros") - (version (git-version "0.2.7" revision commit)) + (version (make-git-version "0.2.7" revision commit)) (source (origin (method git-fetch) @@ -1600,7 +1600,7 @@ (define-public sbcl-arrows (revision "0")) (package (name "sbcl-arrows") - (version (git-version "0.2.0" revision commit)) + (version (make-git-version "0.2.0" revision commit)) (source (origin (method git-fetch) @@ -1674,7 +1674,7 @@ (define-public sbcl-asdf-finalizers (revision "1")) (package (name "sbcl-asdf-finalizers") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -1707,7 +1707,7 @@ (define-public sbcl-asd-generator (revision "0")) (package (name "sbcl-asd-generator") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -1740,7 +1740,7 @@ (define-public sbcl-asdf-system-connections (revision "1")) (package (name "sbcl-asdf-system-connections") - (version (git-version "0.8.4" revision commit)) + (version (make-git-version "0.8.4" revision commit)) (source (origin (method git-fetch) @@ -1770,7 +1770,7 @@ (define-public sbcl-aserve (revision "2")) (package (name "sbcl-aserve") - (version (git-version "1.2.50" revision commit)) + (version (make-git-version "1.2.50" revision commit)) (source (origin (method git-fetch) @@ -1829,7 +1829,7 @@ (define-public sbcl-asn1 (package (name "sbcl-asn1") (build-system asdf-build-system/sbcl) - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (home-page "https://github.com/fukamachi/asn1") (source (origin @@ -1861,7 +1861,7 @@ (define-public sbcl-assoc-utils (revision "1")) (package (name "sbcl-assoc-utils") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -1894,7 +1894,7 @@ (define-public sbcl-atomichron (revision "0")) (package (name "sbcl-atomichron") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -1929,7 +1929,7 @@ (define-public sbcl-atomics (revision "2")) (package (name "sbcl-atomics") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -1966,7 +1966,7 @@ (define-public sbcl-authentic (revision "2")) (package (name "sbcl-authentic") - (version (git-version "0.1.2" revision commit)) + (version (make-git-version "0.1.2" revision commit)) (source (origin (method git-fetch) @@ -2001,7 +2001,7 @@ (define-public sbcl-babel (revision "3")) (package (name "sbcl-babel") - (version (git-version "0.5.0" revision commit)) + (version (make-git-version "0.5.0" revision commit)) (source (origin (method git-fetch) @@ -2035,7 +2035,7 @@ (define-public sbcl-binary-types (let ((commit "a17caf8890f11fdc56f6ea3a21260bf0fb9c589c")) (package (name "sbcl-binary-types") - (version (git-version "1.2" "2" commit)) + (version (make-git-version "1.2" "2" commit)) (source (origin (method git-fetch) @@ -2065,7 +2065,7 @@ (define-public sbcl-binascii (revision "1")) (package (name "sbcl-binascii") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -2114,7 +2114,7 @@ (define-public sbcl-binding-arrows (revision "2")) (package (name "sbcl-binding-arrows") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -2153,7 +2153,7 @@ (define-public sbcl-binpack (revision "1")) (package (name "sbcl-binpack") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -2188,7 +2188,7 @@ (define-public sbcl-birch (revision "0")) (package (name "sbcl-birch") - (version (git-version "1.0.1" revision commit)) + (version (make-git-version "1.0.1" revision commit)) (source (origin (method git-fetch) @@ -2222,7 +2222,7 @@ (define-public sbcl-bit-smasher (let ((commit "c2dcb3b5ec0e485484be681fe17c4e81e58790d9")) (package (name "sbcl-bit-smasher") - (version (git-version "1.0.2" "1" commit)) + (version (make-git-version "1.0.2" "1" commit)) (source (origin (method git-fetch) @@ -2255,7 +2255,7 @@ (define-public sbcl-bknr-datastore (revision "1")) (package (name "sbcl-bknr-datastore") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -2315,7 +2315,7 @@ (define-public sbcl-blackbird (revision "1")) (package (name "sbcl-blackbird") - (version (git-version "0.5.2" revision commit)) + (version (make-git-version "0.5.2" revision commit)) (source (origin (method git-fetch) @@ -2349,7 +2349,7 @@ (define-public sbcl-bobbin (revision "0")) (package (name "sbcl-bobbin") - (version (git-version "1.0.1" revision commit)) + (version (make-git-version "1.0.1" revision commit)) (source (origin (method git-fetch) @@ -2384,7 +2384,7 @@ (define-public sbcl-bodge-blobs-support (revision "1")) (package (name "sbcl-bodge-blobs-support") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -2417,7 +2417,7 @@ (define-public sbcl-bodge-math (revision "1")) (package (name "sbcl-bodge-math") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -2448,7 +2448,7 @@ (define-public sbcl-bodge-queue (revision "0")) (package (name "sbcl-bodge-queue") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -2478,7 +2478,7 @@ (define-public sbcl-bodge-utilities (revision "1")) (package (name "sbcl-bodge-utilities") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -2517,7 +2517,7 @@ (define-public sbcl-boost-json (revision "0")) (package (name "sbcl-boost-json") - (version (git-version "1.1" revision commit)) + (version (make-git-version "1.1" revision commit)) (source (origin (method git-fetch) @@ -2553,7 +2553,7 @@ (define-public sbcl-boost-lexer (revision "0")) (package (name "sbcl-boost-lexer") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -2584,7 +2584,7 @@ (define-public sbcl-boost-parse (revision "0")) (package (name "sbcl-boost-parse") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -2612,7 +2612,7 @@ (define-public sbcl-boost-re (revision "0")) (package (name "sbcl-boost-re") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -2643,7 +2643,7 @@ (define-public sbcl-bordeaux-fft (revision "0")) (package (name "sbcl-bordeaux-fft") - (version (git-version "1.0.1" revision commit)) + (version (make-git-version "1.0.1" revision commit)) (source (origin (method git-fetch) @@ -2714,7 +2714,7 @@ (define-public sbcl-bst (revision "0")) (package (name "sbcl-bst") - (version (git-version "2.0" revision commit)) + (version (make-git-version "2.0" revision commit)) (source (origin (method git-fetch) @@ -2745,7 +2745,7 @@ (define-public sbcl-bt-semaphore (revision "0")) (package (name "sbcl-bt-semaphore") - (version (git-version "0.6.3" revision commit)) + (version (make-git-version "0.6.3" revision commit)) (source (origin (method git-fetch) @@ -2776,7 +2776,7 @@ (define-public sbcl-bubble-operator-upwards (revision "0")) (package (name "sbcl-bubble-operator-upwards") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -2811,7 +2811,7 @@ (define-public sbcl-burgled-batteries3 (revision "2")) (package (name "sbcl-burgled-batteries3") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -2881,7 +2881,7 @@ (define-public sbcl-cache-while (revision "1")) (package (name "sbcl-cache-while") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -2913,7 +2913,7 @@ (define-public sbcl-cacle (revision "1")) (package (name "sbcl-cacle") - (version (git-version "1.0.1" revision commit)) + (version (make-git-version "1.0.1" revision commit)) (source (origin (method git-fetch) @@ -2945,7 +2945,7 @@ (define-public sbcl-calispel (let ((commit "e9f2f9c1af97f4d7bb4c8ac25fb2a8f3e8fada7a")) (package (name "sbcl-calispel") - (version (git-version "0.1" "1" commit)) + (version (make-git-version "0.1" "1" commit)) (source (origin (method git-fetch) @@ -3035,7 +3035,7 @@ (define-public sbcl-cambl (revision "1")) (package (name "sbcl-cambl") - (version (git-version "4.0.0" revision commit)) + (version (make-git-version "4.0.0" revision commit)) (source (origin (method git-fetch) @@ -3108,7 +3108,7 @@ (define-public sbcl-caveman (revision "2")) (package (name "sbcl-caveman") - (version (git-version "2.4.0" revision commit)) + (version (make-git-version "2.4.0" revision commit)) (home-page "https://8arrow.org/caveman/") (source (origin @@ -3179,7 +3179,7 @@ (define-public sbcl-cblas (revision "1")) (package (name "sbcl-cblas") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -3222,7 +3222,7 @@ (define-public sbcl-cells (let ((commit "e8542b17fddd6340c1e237ce482a52327c8ead8e")) (package (name "sbcl-cells") - (version (git-version "3.0" "1" commit)) + (version (make-git-version "3.0" "1" commit)) (source (origin (method git-fetch) @@ -3257,7 +3257,7 @@ (define-public sbcl-cephes (revision "0")) (package (name "sbcl-cephes") - (version (git-version "1.2" revision commit)) + (version (make-git-version "1.2" revision commit)) (source (origin (method git-fetch) @@ -3301,7 +3301,7 @@ (define-public sbcl-cepl (revision "1")) (package (name "sbcl-cepl") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -3386,7 +3386,7 @@ (define-public sbcl-cf (revision "0")) (package (name "sbcl-cf") - (version (git-version "1.1" revision commit)) + (version (make-git-version "1.1" revision commit)) (source (origin (method git-fetch) @@ -3415,7 +3415,7 @@ (define-public sbcl-cffi (revision "2")) (package (name "sbcl-cffi") - (version (git-version "0.24.1" revision commit)) + (version (make-git-version "0.24.1" revision commit)) (source (origin (method git-fetch) @@ -3479,7 +3479,7 @@ (define-public sbcl-cffi-c-ref (revision "0")) (package (name "sbcl-cffi-c-ref") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -3509,7 +3509,7 @@ (define-public sbcl-chanl (revision "1")) (package (name "sbcl-chanl") - (version (git-version "0.4.1" revision commit)) + (version (make-git-version "0.4.1" revision commit)) (source (origin (method git-fetch) @@ -3712,7 +3712,7 @@ (define-public sbcl-chipz (revision "2")) (package (name "sbcl-chipz") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -3751,7 +3751,7 @@ (define-public sbcl-chirp (revision "1")) (package (name "sbcl-chirp") - (version (git-version "0.2.0" revision commit)) + (version (make-git-version "0.2.0" revision commit)) (source (origin (method git-fetch) @@ -3795,7 +3795,7 @@ (define-public sbcl-chlorophyll (revision "1")) (package (name "sbcl-chlorophyll") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -3886,7 +3886,7 @@ (define-public sbcl-ciel (revision "0")) (package (name "sbcl-ciel") - (version (git-version "0.2.1" revision commit)) + (version (make-git-version "0.2.1" revision commit)) (source (origin (method git-fetch) @@ -3998,7 +3998,7 @@ (define-public sbcl-ciel-repl (revision "0")) (package (name "sbcl-ciel-repl") - (version (git-version "0.2.1" revision commit)) + (version (make-git-version "0.2.1" revision commit)) (source (origin (method git-fetch) @@ -4067,7 +4067,7 @@ (define-public sbcl-circular-streams (revision "1")) (package (name "sbcl-circular-streams") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -4104,7 +4104,7 @@ (define-public sbcl-cl-abnf (revision "1")) (package (name "sbcl-cl-abnf") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -4141,7 +4141,7 @@ (define-public sbcl-cl-algebraic-data-type (let ((commit "b2568428193a512d141d6b615772d50ceb5f9bca")) (package (name "sbcl-cl-algebraic-data-type") - (version (git-version "1.2.0" "1" commit)) + (version (make-git-version "1.2.0" "1" commit)) (source (origin (method git-fetch) @@ -4176,7 +4176,7 @@ (define-public sbcl-cl-all (revision "0")) (package (name "sbcl-cl-all") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -4213,7 +4213,7 @@ (define-public sbcl-cl-ana (revision "2")) (package (name "sbcl-cl-ana") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -4289,7 +4289,7 @@ (define-public sbcl-cl-annot (revision "1")) (package (name "sbcl-cl-annot") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -4321,7 +4321,7 @@ (define-public sbcl-cl-ansi-text (let ((commit "8b129d83c7511b54cdd9d4123825a2d06349b25c")) (package (name "sbcl-cl-ansi-text") - (version (git-version "2.0.1" "1" commit)) + (version (make-git-version "2.0.1" "1" commit)) (source (origin (method git-fetch) @@ -4358,7 +4358,7 @@ (define-public sbcl-cl-ascii-table (revision "1")) (package (name "sbcl-cl-ascii-table") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -4390,7 +4390,7 @@ (define-public sbcl-cl-async (revision "1")) (package (name "sbcl-cl-async") - (version (git-version "0.6.1" revision commit)) + (version (make-git-version "0.6.1" revision commit)) (source (origin (method git-fetch) @@ -4445,7 +4445,7 @@ (define-public sbcl-cl-async-future (revision "1")) (package (name "sbcl-cl-async-future") - (version (git-version "0.4.4.1" revision commit)) + (version (make-git-version "0.4.4.1" revision commit)) (source (origin (method git-fetch) @@ -4479,7 +4479,7 @@ (define libasyncprocess (revision "2")) (package (name "libasyncprocess") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -4550,7 +4550,7 @@ (define-public sbcl-cl-autowrap ;; no tagged branches (package (name "sbcl-cl-autowrap") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -4586,7 +4586,7 @@ (define-public sbcl-cl-base16 (revision "0")) (package (name "sbcl-cl-base16") - (version (git-version "0.0" revision commit)) + (version (make-git-version "0.0" revision commit)) (source (origin (method git-fetch) @@ -4630,7 +4630,7 @@ (define-public sbcl-cl-base32 (revision "1")) (package (name "sbcl-cl-base32") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -4661,7 +4661,7 @@ (define-public sbcl-cl-base58 (revision "1")) (package (name "sbcl-cl-base58") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -4704,7 +4704,7 @@ (define-public sbcl-cl-base64 (let ((commit "577683b18fd880b82274d99fc96a18a710e3987a")) (package (name "sbcl-cl-base64") - (version (git-version "3.3.4" "1" commit)) + (version (make-git-version "3.3.4" "1" commit)) (source (origin (method git-fetch) @@ -4744,7 +4744,7 @@ (define-public sbcl-cl-bnf (revision "0")) (package (name "sbcl-cl-bnf") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -4773,7 +4773,7 @@ (define-public sbcl-cl-cairo2 (revision "1")) (package (name "sbcl-cl-cairo2") - (version (git-version "0.6" revision commit)) + (version (make-git-version "0.6" revision commit)) (source (origin (method git-fetch) @@ -4824,7 +4824,7 @@ (define-public sbcl-cl-cffi-gtk (revision "3")) (package (name "sbcl-cl-cffi-gtk") - (version (git-version "3.8.8" revision commit)) + (version (make-git-version "3.8.8" revision commit)) (source (origin (method git-fetch) @@ -4904,7 +4904,7 @@ (define-public sbcl-cl-change-case (revision "1")) (package (name "sbcl-cl-change-case") - (version (git-version "0.2.0" revision commit)) + (version (make-git-version "0.2.0" revision commit)) (home-page "https://github.com/rudolfochrist/cl-change-case") (source (origin @@ -4938,7 +4938,7 @@ (define-public sbcl-cl-charms (revision "1")) (package (name "sbcl-cl-charms") - (version (git-version "0.2.0" revision commit)) + (version (make-git-version "0.2.0" revision commit)) (source (origin (method git-fetch) @@ -4981,7 +4981,7 @@ (define-public sbcl-cl-collider (revision "0")) (package (name "sbcl-cl-collider") - (version (git-version "2018.7.15" revision commit)) + (version (make-git-version "2018.7.15" revision commit)) (source (origin (method git-fetch) @@ -5041,7 +5041,7 @@ (define-public sbcl-cl-colors (let ((commit "827410584553f5c717eec6182343b7605f707f75")) (package (name "sbcl-cl-colors") - (version (git-version "0.0.0" "1" commit)) + (version (make-git-version "0.0.0" "1" commit)) (source (origin (method git-fetch) @@ -5122,7 +5122,7 @@ (define-public sbcl-cl-conspack (revision "2")) (package (name "sbcl-cl-conspack") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -5161,7 +5161,7 @@ (define-public sbcl-cl-cont (revision "1")) (package (name "sbcl-cl-cont") - (version (git-version "0.3.8" revision commit)) + (version (make-git-version "0.3.8" revision commit)) (source (origin (method git-fetch) @@ -5198,7 +5198,7 @@ (define-public sbcl-cl-containers (revision "4")) (package (name "sbcl-cl-containers") - (version (git-version "0.12.1" revision commit)) + (version (make-git-version "0.12.1" revision commit)) (source (origin (method git-fetch) @@ -5255,7 +5255,7 @@ (define-public sbcl-cl-cookie (package (name "sbcl-cl-cookie") (build-system asdf-build-system/sbcl) - (version (git-version "0.9.10" revision commit)) + (version (make-git-version "0.9.10" revision commit)) (home-page "https://github.com/fukamachi/cl-cookie") (source (origin @@ -5293,7 +5293,7 @@ (define-public sbcl-cl-coroutine (revision "1")) (package (name "sbcl-cl-coroutine") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -5369,7 +5369,7 @@ (define-public sbcl-cl-cron (revision "0")) (package (name "sbcl-cl-cron") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -5399,7 +5399,7 @@ (define-public sbcl-cl-css (let ((commit "8fe654c8f0cf95b300718101cce4feb517f78e2f")) (package (name "sbcl-cl-css") - (version (git-version "0.1" "1" commit)) + (version (make-git-version "0.1" "1" commit)) (source (origin (method git-fetch) @@ -5430,7 +5430,7 @@ (define-public sbcl-cl-csv (revision "2")) (package (name "sbcl-cl-csv") - (version (git-version "1.0.6" revision commit)) + (version (make-git-version "1.0.6" revision commit)) (source (origin (method git-fetch) @@ -5469,7 +5469,7 @@ (define-public sbcl-cl-data-structures (revision "2")) (package (name "sbcl-cl-data-structures") - (version (git-version "1.4.1" revision commit)) + (version (make-git-version "1.4.1" revision commit)) (source (origin (method git-fetch) @@ -5514,7 +5514,7 @@ (define-public sbcl-cl-debug (revision "1")) (package (name "sbcl-cl-debug") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -5544,7 +5544,7 @@ (define-public sbcl-cl-dejavu (revision "1")) (package (name "sbcl-cl-dejavu") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -5574,7 +5574,7 @@ (define-public sbcl-cl-difflib (revision "0")) (package (name "sbcl-cl-difflib") - (version (git-version "0.2" revision commit)) + (version (make-git-version "0.2" revision commit)) (source (origin (method git-fetch) @@ -5608,7 +5608,7 @@ (define-public sbcl-cl-diskspace (revision "1")) (package (name "sbcl-cl-diskspace") - (version (git-version "0.3.1" revision commit)) + (version (make-git-version "0.3.1" revision commit)) (source (origin (method git-fetch) @@ -5653,7 +5653,7 @@ (define-public sbcl-cl-docutils (revision "1")) (package (name "sbcl-cl-docutils") - (version (git-version "0.1.1" revision commit)) + (version (make-git-version "0.1.1" revision commit)) (source (origin (method git-fetch) @@ -5697,7 +5697,7 @@ (define-public sbcl-cl-dot (revision "0")) (package (name "sbcl-cl-dot") - (version (git-version "0.9.0" revision commit)) + (version (make-git-version "0.9.0" revision commit)) (source (origin (method git-fetch) @@ -5726,7 +5726,7 @@ (define-public sbcl-cl-emb (revision "1")) (package (name "sbcl-cl-emb") - (version (git-version "0.4.3" revision commit)) + (version (make-git-version "0.4.3" revision commit)) (home-page "https://common-lisp.net/project/cl-emb/") (source (origin @@ -5791,7 +5791,7 @@ (define-public sbcl-cl-ewkb (revision "0")) (package (name "sbcl-cl-ewkb") - (version (git-version "0.2" revision commit)) + (version (make-git-version "0.2" revision commit)) (source (origin (method git-fetch) @@ -5823,7 +5823,7 @@ (define-public sbcl-cl-fad (revision "1")) (package (name "sbcl-cl-fad") - (version (git-version "0.7.6" revision commit)) + (version (make-git-version "0.7.6" revision commit)) (source (origin (method git-fetch) @@ -5902,7 +5902,7 @@ (define-public sbcl-cl-fastcgi (revision "2")) (package (name "sbcl-cl-fastcgi") - (version (git-version "0.2" revision commit)) + (version (make-git-version "0.2" revision commit)) (source (origin (method git-fetch) @@ -5945,7 +5945,7 @@ (define-public sbcl-cl-flac (revision "0")) (package (name "sbcl-cl-flac") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -5992,7 +5992,7 @@ (define-public sbcl-cl-fond (revision "1")) (package (name "sbcl-cl-fond") - (version (git-version "1.1.0" revision commit)) + (version (make-git-version "1.1.0" revision commit)) (source (origin (method git-fetch) @@ -6078,7 +6078,7 @@ (define-public sbcl-cl-freetype2 (revision "1")) (package (name "sbcl-cl-freetype2") - (version (git-version "1.1" revision commit)) + (version (make-git-version "1.1" revision commit)) (source (origin (method git-fetch) @@ -6130,7 +6130,7 @@ (define-public sbcl-cl-ftp (revision "0")) (package (name "sbcl-cl-ftp") - (version (git-version "1.6.1" revision commit)) + (version (make-git-version "1.6.1" revision commit)) (source (origin (method git-fetch) @@ -6163,7 +6163,7 @@ (define-public sbcl-cl-gamepad (revision "3")) (package (name "sbcl-cl-gamepad") - (version (git-version "3.0.0" revision commit)) + (version (make-git-version "3.0.0" revision commit)) (source (origin (method git-fetch) @@ -6205,7 +6205,7 @@ (define-public sbcl-cl-geometry (let ((commit "24eddedc47b931cec27361752736ef0b54fc9984")) (package (name "sbcl-cl-geometry") - (version (git-version "0.0.3" "1" commit)) + (version (make-git-version "0.0.3" "1" commit)) (source (origin (method git-fetch) @@ -6241,7 +6241,7 @@ (define-public sbcl-cl-glfw3 (revision "1")) (package (name "sbcl-cl-glfw3") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -6284,7 +6284,7 @@ (define-public sbcl-cl-glib (revision "1")) (package (name "sbcl-cl-glib") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -6319,7 +6319,7 @@ (define-public sbcl-cl-gltf (revision "1")) (package (name "sbcl-cl-gltf") - (version (git-version "2.0.0" revision commit)) + (version (make-git-version "2.0.0" revision commit)) (source (origin (method git-fetch) @@ -6368,7 +6368,7 @@ (define-public sbcl-cl-gobject-introspection (revision "4")) (package (name "sbcl-cl-gobject-introspection") - (version (git-version "0.3" revision commit)) + (version (make-git-version "0.3" revision commit)) (home-page "https://github.com/andy128k/cl-gobject-introspection") (source (origin @@ -6420,7 +6420,7 @@ (define-public sbcl-cl-gobject-introspection-wrapper (revision "1")) (package (name "sbcl-cl-gobject-introspection-wrapper") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -6455,7 +6455,7 @@ (define-public sbcl-cl-gopher (revision "3")) (package (name "sbcl-cl-gopher") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -6502,7 +6502,7 @@ (define-public sbcl-cl-graph (revision "2")) (package (name "sbcl-cl-graph") - (version (git-version "0.10.2" revision commit)) + (version (make-git-version "0.10.2" revision commit)) (source (origin (method git-fetch) @@ -6549,7 +6549,7 @@ (define-public sbcl-cl-grnm (revision "0")) (package (name "sbcl-cl-grnm") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -6625,7 +6625,7 @@ (define-public sbcl-cl-gss (revision "1")) (package (name "sbcl-cl-gss") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -6671,7 +6671,7 @@ (define-public sbcl-cl-gtk4 (revision "2")) (package (name "sbcl-cl-gtk4") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -6708,7 +6708,7 @@ (define-public sbcl-cl-hamt (let ((commit "7a99eaaca1f952029def9ad5a2b80a612a712208")) (package (name "sbcl-cl-hamt") - (version (git-version "0.0.0" "1" commit)) + (version (make-git-version "0.0.0" "1" commit)) (source (origin (method git-fetch) @@ -6772,7 +6772,7 @@ (define-public sbcl-cl-hooks (package (name "sbcl-cl-hooks") (build-system asdf-build-system/sbcl) - (version (git-version "0.2.1" revision commit)) + (version (make-git-version "0.2.1" revision commit)) (home-page "https://github.com/scymtym/architecture.hooks") (source (origin @@ -6832,7 +6832,7 @@ (define-public sbcl-cl-html-diff (revision "0")) (package (name "sbcl-cl-html-diff") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -6864,7 +6864,7 @@ (define-public sbcl-cl-html5-parser (revision "1")) (package (name "sbcl-cl-html5-parser") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -6896,7 +6896,7 @@ (define-public sbcl-cl-https-everywhere (let ((commit "cbcc73b985a5b1c0ce0d4ec38bc982a0538d4bd8")) (package (name "sbcl-cl-https-everywhere") - (version (git-version "0.0.0" "1" commit)) + (version (make-git-version "0.0.0" "1" commit)) (source (origin (method git-fetch) @@ -6977,7 +6977,7 @@ (define-public sbcl-cl-i18n (revision "3")) (package (name "sbcl-cl-i18n") - (version (git-version "0.5.5" revision commit)) + (version (make-git-version "0.5.5" revision commit)) (source (origin (method git-fetch) @@ -7008,7 +7008,7 @@ (define-public sbcl-cl-iconv (revision "0")) (package (name "sbcl-cl-iconv") - (version (git-version "0.3" revision commit)) + (version (make-git-version "0.3" revision commit)) (source (origin (method git-fetch) @@ -7048,7 +7048,7 @@ (define-public sbcl-cl-indentify (let ((commit "eb770f434defa4cd41d84bca822428dfd0dbac53")) (package (name "sbcl-cl-indentify") - (version (git-version "0.1" "1" commit)) + (version (make-git-version "0.1" "1" commit)) (source (origin (method git-fetch) @@ -7082,7 +7082,7 @@ (define-public sbcl-cl-inflector (revision "1")) (package (name "sbcl-cl-inflector") - (version (git-version "0.2" revision commit)) + (version (make-git-version "0.2" revision commit)) (source (origin (method git-fetch) @@ -7116,7 +7116,7 @@ (define-public sbcl-cl-ini (revision "0")) (package (name "sbcl-cl-ini") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -7147,7 +7147,7 @@ (define-public sbcl-cl-inotify (revision "0")) (package (name "sbcl-cl-inotify") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -7183,7 +7183,7 @@ (define-public sbcl-cl-interpol (revision "1")) (package (name "sbcl-cl-interpol") - (version (git-version "0.2.7" revision commit)) + (version (make-git-version "0.2.7" revision commit)) (source (origin (method git-fetch) @@ -7220,7 +7220,7 @@ (define-public sbcl-cl-ipfs-api2 (revision "0")) (package (name "sbcl-cl-ipfs-api2") - (version (git-version "0.51" revision commit)) + (version (make-git-version "0.51" revision commit)) (source (origin (method git-fetch) @@ -7256,7 +7256,7 @@ (define-public sbcl-cl-irc (revision "0")) (package (name "sbcl-cl-irc") - (version (git-version "0.9.2" revision commit)) + (version (make-git-version "0.9.2" revision commit)) (source (origin (method git-fetch) @@ -7304,7 +7304,7 @@ (define-public sbcl-cl-isaac (revision "0")) (package (name "sbcl-cl-isaac") - (version (git-version "1.0.7" revision commit)) + (version (make-git-version "1.0.7" revision commit)) (source (origin (method git-fetch) @@ -7334,7 +7334,7 @@ (define-public sbcl-cl-jpeg (revision "1")) (package (name "sbcl-cl-jpeg") - (version (git-version "2.8" revision commit)) + (version (make-git-version "2.8" revision commit)) (source (origin (method git-fetch) @@ -7394,7 +7394,7 @@ (define-public sbcl-cl-json-pointer (revision "0")) (package (name "sbcl-cl-json-pointer") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -7435,7 +7435,7 @@ (define-public sbcl-cl-ledger (revision "1")) (package (name "sbcl-cl-ledger") - (version (git-version "4.0.0" revision commit)) + (version (make-git-version "4.0.0" revision commit)) (source (origin (method git-fetch) @@ -7480,7 +7480,7 @@ (define-public sbcl-cl-lex (revision "1")) (package (name "sbcl-cl-lex") - (version (git-version "1.1.3" revision commit)) + (version (make-git-version "1.1.3" revision commit)) (source (origin (method git-fetch) @@ -7512,7 +7512,7 @@ (define-public sbcl-cl-liballegro (revision "1")) (package (name "sbcl-cl-liballegro") - (version (git-version "0.2.15" revision commit)) + (version (make-git-version "0.2.15" revision commit)) (source (origin (method git-fetch) @@ -7557,7 +7557,7 @@ (define-public sbcl-cl-libsvm-format (revision "0")) (package (name "sbcl-cl-libsvm-format") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -7591,7 +7591,7 @@ (define-public sbcl-cl-libuv (revision "1")) (package (name "sbcl-cl-libuv") - (version (git-version "0.1.6" revision commit)) + (version (make-git-version "0.1.6" revision commit)) (source (origin (method git-fetch) @@ -7637,7 +7637,7 @@ (define-public sbcl-cl-libxml2 (let ((commit "8d03110c532c1a3fe15503fdfefe82f60669e4bd")) (package (name "sbcl-cl-libxml2") - (version (git-version "0.3.4" "1" commit)) + (version (make-git-version "0.3.4" "1" commit)) (source (origin (method git-fetch) @@ -7725,7 +7725,7 @@ (define-public sbcl-cl-libyaml (revision "1")) (package (name "sbcl-cl-libyaml") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -7770,7 +7770,7 @@ (define-public sbcl-cl-locale (revision "1")) (package (name "sbcl-cl-locale") - (version (git-version "0.1.1" revision commit)) + (version (make-git-version "0.1.1" revision commit)) (source (origin (method git-fetch) @@ -7846,7 +7846,7 @@ (define-public sbcl-cl-markdown (revision "0")) (package (name "sbcl-cl-markdown") - (version (git-version "0.10.6" revision commit)) + (version (make-git-version "0.10.6" revision commit)) (source (origin (method git-fetch) @@ -7890,7 +7890,7 @@ (define-public sbcl-cl-markless (revision "1")) (package (name "sbcl-cl-markless") - (version (git-version "1.1.0" revision commit)) + (version (make-git-version "1.1.0" revision commit)) (source (origin (method git-fetch) @@ -7938,7 +7938,7 @@ (define-public sbcl-cl-markup (let ((commit "e0eb7debf4bdff98d1f49d0f811321a6a637b390")) (package (name "sbcl-cl-markup") - (version (git-version "0.1" "1" commit)) + (version (make-git-version "0.1" "1" commit)) (source (origin (method git-fetch) @@ -7975,7 +7975,7 @@ (define-public sbcl-cl-mathstats (revision "1")) (package (name "sbcl-cl-mathstats") - (version (git-version "0.8.2" revision commit)) + (version (make-git-version "0.8.2" revision commit)) (source (origin (method git-fetch) @@ -8007,7 +8007,7 @@ (define-public sbcl-cl-messagepack (revision "0")) (package (name "sbcl-cl-messagepack") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -8041,7 +8041,7 @@ (define-public sbcl-cl-mime (package (name "sbcl-cl-mime") ;; One commit says "update to cl-mime-0.5.3", even though the .asd is at 0.5.1. - (version (git-version "0.5.3" revision commit)) + (version (make-git-version "0.5.3" revision commit)) (source (origin (method git-fetch) @@ -8076,7 +8076,7 @@ (define-public sbcl-cl-mimeparse (revision "0")) (package (name "sbcl-cl-mimeparse") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -8114,7 +8114,7 @@ (define-public sbcl-cl-mixed (revision "0")) (package (name "sbcl-cl-mixed") - (version (git-version "2.1.0" revision commit)) + (version (make-git-version "2.1.0" revision commit)) (source (origin (method git-fetch) @@ -8194,7 +8194,7 @@ (define-public sbcl-cl-modio (revision "1")) (package (name "sbcl-cl-modio") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -8261,7 +8261,7 @@ (define-public sbcl-cl-mount-info (revision "1")) (package (name "sbcl-cl-mount-info") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -8292,7 +8292,7 @@ (define-public sbcl-cl-mpg123 (revision "1")) (package (name "sbcl-cl-mpg123") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -8347,7 +8347,7 @@ (define-public sbcl-cl-murmurhash (revision "1")) (package (name "sbcl-cl-murmurhash") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (home-page "https://github.com/ruricolist/cl-murmurhash/") (source (origin @@ -8409,7 +8409,7 @@ (define-public sbcl-cl-mysql (revision "1")) (package (name "sbcl-cl-mysql") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -8454,7 +8454,7 @@ (define-public sbcl-cl-num-utils (revision "1")) (package (name "sbcl-cl-num-utils") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -8530,7 +8530,7 @@ (define-public sbcl-cl-online-learning (revision "1")) (package (name "sbcl-cl-online-learning") - (version (git-version "0.5" revision commit)) + (version (make-git-version "0.5" revision commit)) (source (origin (method git-fetch) @@ -8565,7 +8565,7 @@ (define-public sbcl-cl-opengl (revision "1")) (package (name "sbcl-cl-opengl") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -8616,7 +8616,7 @@ (define-public sbcl-cl-out123 (revision "2")) (package (name "sbcl-cl-out123") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -8666,7 +8666,7 @@ (define-public sbcl-cl-package-locks (revision "1")) (package (name "sbcl-cl-package-locks") - (version (git-version "0.0.2" revision commit)) + (version (make-git-version "0.0.2" revision commit)) (source (origin (method git-fetch) @@ -8698,7 +8698,7 @@ (define-public sbcl-cl-pango (revision "0")) (package (name "sbcl-cl-pango") - (version (git-version "0.5" revision commit)) + (version (make-git-version "0.5" revision commit)) (source (origin (method git-fetch) @@ -8750,7 +8750,7 @@ (define-public sbcl-cl-pass (revision "1")) (package (name "sbcl-cl-pass") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -8782,7 +8782,7 @@ (define-public sbcl-cl-pcg (revision "1")) (package (name "sbcl-cl-pcg") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -8825,7 +8825,7 @@ (define-public sbcl-cl-pdf (revision "4")) (package (name "sbcl-cl-pdf") - (version (git-version "2.0.0" revision commit)) + (version (make-git-version "2.0.0" revision commit)) (source (origin (method git-fetch) @@ -8858,7 +8858,7 @@ (define-public sbcl-cl-permutation (revision "0")) (package (name "sbcl-cl-permutation") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -8896,7 +8896,7 @@ (define-public sbcl-cl-portaudio (revision "1")) (package (name "sbcl-cl-portaudio") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -8936,7 +8936,7 @@ (define-public sbcl-cl-posix-mqueue (revision "1")) (package (name "sbcl-cl-posix-mqueue") - (version (git-version "0.1.2" revision commit)) + (version (make-git-version "0.1.2" revision commit)) (source (origin (method git-fetch) @@ -9048,7 +9048,7 @@ (define-public sbcl-cl-prevalence (package (name "sbcl-cl-prevalence") (build-system asdf-build-system/sbcl) - (version (git-version "5" revision commit)) + (version (make-git-version "5" revision commit)) (home-page "https://github.com/40ants/cl-prevalence") (source (origin @@ -9090,7 +9090,7 @@ (define-public sbcl-cl-progress-bar (let ((commit "9374170858663c8fe829e9fb5a29bd2cb48d95ae")) (package (name "sbcl-cl-progress-bar") - (version (git-version "0.0.0" "1" commit)) + (version (make-git-version "0.0.0" "1" commit)) (source (origin (method git-fetch) @@ -9121,7 +9121,7 @@ (define-public sbcl-cl-project (revision "1")) (package (name "sbcl-cl-project") - (version (git-version "0.3.1" revision commit)) + (version (make-git-version "0.3.1" revision commit)) (home-page "https://github.com/fukamachi/cl-project") (source (origin @@ -9189,7 +9189,7 @@ (define-public sbcl-cl-qprint (revision "1")) (package (name "sbcl-cl-qprint") - (version (git-version "0.9.0" revision commit)) + (version (make-git-version "0.9.0" revision commit)) (source (origin (method git-fetch) @@ -9281,7 +9281,7 @@ (define-public sbcl-cl-random (revision "1")) (package (name "sbcl-cl-random") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -9340,7 +9340,7 @@ (define-public sbcl-cl-random-forest (revision "1")) (package (name "sbcl-cl-random-forest") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -9381,7 +9381,7 @@ (define-public sbcl-cl-raylib (revision "0")) (package (name "sbcl-cl-raylib") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -9466,7 +9466,7 @@ (define-public sbcl-cl-readline (revision "1")) (package (name "sbcl-cl-readline") - (version (git-version "0.1.2" revision commit)) + (version (make-git-version "0.1.2" revision commit)) (source (origin (method git-fetch) @@ -9512,7 +9512,7 @@ (define-public sbcl-cl-redis (revision "1")) (package (name "sbcl-cl-redis") - (version (git-version "2.3.8" revision commit)) + (version (make-git-version "2.3.8" revision commit)) (source (origin (method git-fetch) @@ -9567,7 +9567,7 @@ (define-public sbcl-cl-reexport (package (name "sbcl-cl-reexport") (build-system asdf-build-system/sbcl) - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (home-page "https://github.com/takagi/cl-reexport") (source (origin @@ -9601,7 +9601,7 @@ (define-public sbcl-cl-rmath (revision "1")) (package (name "sbcl-cl-rmath") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -9646,7 +9646,7 @@ (define-public sbcl-cl-semver (revision "0")) (package (name "sbcl-cl-semver") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -9686,7 +9686,7 @@ (define-public sbcl-cl-setlocale (revision "0")) (package (name "sbcl-cl-setlocale") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -9717,7 +9717,7 @@ (define-public sbcl-cl-slice (revision "1")) (package (name "sbcl-cl-slice") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -9749,7 +9749,7 @@ (define-public sbcl-cl-slug (revision "1")) (package (name "sbcl-cl-slug") - (version (git-version "0.4.1" revision commit)) + (version (make-git-version "0.4.1" revision commit)) (source (origin (method git-fetch) @@ -9782,7 +9782,7 @@ (define-public sbcl-cl-smtp (revision "0")) (package (name "sbcl-cl-smtp") - (version (git-version "20191031.1" revision commit)) + (version (make-git-version "20191031.1" revision commit)) (source (origin (method git-fetch) @@ -9815,7 +9815,7 @@ (define-public sbcl-cl-spark (revision "1")) (package (name "sbcl-cl-spark") - (version (git-version "0.1.13" revision commit)) + (version (make-git-version "0.1.13" revision commit)) (source (origin (method git-fetch) @@ -9845,7 +9845,7 @@ (define-public sbcl-cl-speedy-queue (revision "1")) (package (name "sbcl-cl-speedy-queue") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -9918,7 +9918,7 @@ (define-public sbcl-cl+ssl (revision "6")) (package (name "sbcl-cl+ssl") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -9992,7 +9992,7 @@ (define-public sbcl-cl-steamworks (revision "1")) (package (name "sbcl-cl-steamworks") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -10029,7 +10029,7 @@ (define-public sbcl-cl-store (revision "1")) (package (name "sbcl-cl-store") - (version (git-version "0.8.11" revision commit)) + (version (make-git-version "0.8.11" revision commit)) (source (origin (method git-fetch) @@ -10099,7 +10099,7 @@ (define-public sbcl-cl-strftime (let ((commit "21cb57f2595faa26d687893963f24ec41822b63c")) (package (name "sbcl-cl-strftime") - (version (git-version "0.0.0" "1" commit)) + (version (make-git-version "0.0.0" "1" commit)) (source (origin (method git-fetch) @@ -10131,7 +10131,7 @@ (define-public sbcl-cl-string-match (changeset "5048480a61243e6f1b02884012c8f25cdbee6d97")) (package (name "sbcl-cl-string-match") - (version (git-version "0" revision changeset)) + (version (make-git-version "0" revision changeset)) (source (origin (method hg-fetch) @@ -10185,7 +10185,7 @@ (define-public sbcl-cl-strings (commit "93ec4177fc51f403a9f1ef0a8933f36d917f2140")) (package (name "sbcl-cl-strings") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -10218,7 +10218,7 @@ (define-public sbcl-cl-svg (revision "1")) (package (name "sbcl-cl-svg") - (version (git-version "0.0.3" revision commit)) + (version (make-git-version "0.0.3" revision commit)) (source (origin (method git-fetch) @@ -10247,7 +10247,7 @@ (define-public sbcl-cl-sxml (revision "1")) (package (name "sbcl-cl-sxml") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -10315,7 +10315,7 @@ (define-public sbcl-cl-syslog (revision "0")) (package (name "sbcl-cl-syslog") - (version (git-version "0.2.4" revision commit)) + (version (make-git-version "0.2.4" revision commit)) (source (origin (method git-fetch) @@ -10353,7 +10353,7 @@ (define-public sbcl-cl-template (revision "0")) (package (name "sbcl-cl-template") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (home-page "https://github.com/alpha123/cl-template") (source (origin @@ -10383,7 +10383,7 @@ (define-public sbcl-cl-tga (revision "0")) (package (name "sbcl-cl-tga") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -10413,7 +10413,7 @@ (define-public sbcl-cl-tld (let ((commit "f5014da8d831fa9481d4181d4450f10a52850c75")) (package (name "sbcl-cl-tld") - (version (git-version "0.1" "2" commit)) + (version (make-git-version "0.1" "2" commit)) (source (origin (method git-fetch) @@ -10442,7 +10442,7 @@ (define-public sbcl-cl-tls (revision "0")) (package (name "sbcl-cl-tls") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -10476,7 +10476,7 @@ (define-public sbcl-cl-typesetting (revision "1")) (package (name "sbcl-cl-typesetting") - (version (git-version "0.8.0" revision commit)) + (version (make-git-version "0.8.0" revision commit)) (source (origin (method git-fetch) @@ -10513,7 +10513,7 @@ (define-public sbcl-cl-uglify-js (revision "1")) (package (name "sbcl-cl-uglify-js") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -10641,7 +10641,7 @@ (define-public sbcl-cl-unification (revision "1")) (package (name "sbcl-cl-unification") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -10683,7 +10683,7 @@ (define-public sbcl-cl-utilities (revision "1")) (package (name "sbcl-cl-utilities") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method url-fetch) @@ -10796,7 +10796,7 @@ (define-public sbcl-cl-vorbis (revision "0")) (package (name "sbcl-cl-vorbis") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -10847,7 +10847,7 @@ (define-public sbcl-cl-wayland (revision "0")) (package (name "sbcl-cl-wayland") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -10949,7 +10949,7 @@ (define-public sbcl-cl-who (revision "3")) (package (name "sbcl-cl-who") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -10983,7 +10983,7 @@ (define-public sbcl-cl-xkb (revision "1")) (package (name "sbcl-cl-xkb") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -11039,7 +11039,7 @@ (define-public sbcl-cl-xmlspam (package (name "sbcl-cl-xmlspam") (build-system asdf-build-system/sbcl) - (version (git-version "0.0.0" "1" commit)) + (version (make-git-version "0.0.0" "1" commit)) (home-page "https://github.com/rogpeppe/cl-xmlspam") (source (origin @@ -11110,7 +11110,7 @@ (define-public sbcl-cl-yaml (revision "1")) (package (name "sbcl-cl-yaml") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -11145,7 +11145,7 @@ (define-public sbcl-cl-z85 (revision "1")) (package (name "sbcl-cl-z85") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -11176,7 +11176,7 @@ (define-public sbcl-clache (let ((commit "112976729565e1035532389ca25090ae99badd07")) (package (name "sbcl-clache") - (version (git-version "0.2.1" "1" commit)) + (version (make-git-version "0.2.1" "1" commit)) (source (origin (method git-fetch) @@ -11224,7 +11224,7 @@ (define-public sbcl-clack (revision "1")) (package (name "sbcl-clack") - (version (git-version "2.1.0" revision commit)) + (version (make-git-version "2.1.0" revision commit)) (source (origin (method git-fetch) @@ -11271,7 +11271,7 @@ (define-public sbcl-clad (name "sbcl-clad") (version ;; There's no version, but there's a timestamp - (git-version "2023-01-21" revision commit)) + (make-git-version "2023-01-21" revision commit)) (source (origin (method git-fetch) @@ -11303,7 +11303,7 @@ (define-public sbcl-clamp (let ((commit "02b8f3953e5753cc61a719807c82f3795cd28fe1")) (package (name "sbcl-clamp") - (version (git-version "0.3" "1" commit)) + (version (make-git-version "0.3" "1" commit)) (source (origin (method git-fetch) @@ -11386,7 +11386,7 @@ (define-public sbcl-classimp (revision "1")) (package (name "sbcl-classimp") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -11428,7 +11428,7 @@ (define-public sbcl-clavier (revision "1")) (package (name "sbcl-clavier") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -11463,7 +11463,7 @@ (define-public sbcl-claw (commit "3cd4a96fca95eb9e8d5d069426694669f81b2250")) (package (name "sbcl-claw") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -11528,7 +11528,7 @@ (define-public sbcl-claw-utils (package (name "sbcl-claw-utils") ;; version is not specified - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -11558,7 +11558,7 @@ (define-public sbcl-clawk (let ((commit "3a91634df686417114044a98c063cbe76bfac7b6")) (package (name "sbcl-clawk") - (version (git-version "4" "1" commit)) + (version (make-git-version "4" "1" commit)) (source (origin (method git-fetch) @@ -11587,7 +11587,7 @@ (define-public sbcl-clesh (let ((commit "44e96e04a72e5bc006dc4eb02ce8962348dd4a11")) (package (name "sbcl-clesh") - (version (git-version "0.0.0" "1" commit)) + (version (make-git-version "0.0.0" "1" commit)) (source (origin (method git-fetch) @@ -11619,7 +11619,7 @@ (define-public sbcl-clinenoise (revision "1")) (package (name "sbcl-clinenoise") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -11650,7 +11650,7 @@ (define-public sbcl-clingon (revision "1")) (package (name "sbcl-clingon") - (version (git-version "0.5.0" revision commit)) + (version (make-git-version "0.5.0" revision commit)) (source (origin (method git-fetch) @@ -11715,7 +11715,7 @@ (define-public sbcl-clip (revision "1")) (package (name "sbcl-clip") - (version (git-version "0.7.0" revision commit)) + (version (make-git-version "0.7.0" revision commit)) (source (origin (method git-fetch) @@ -11749,7 +11749,7 @@ (define-public sbcl-clml (revision "0")) (package (name "sbcl-clml") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -11789,7 +11789,7 @@ (define-public sbcl-clobber (revision "0")) (package (name "sbcl-clobber") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -11876,7 +11876,7 @@ (define-public sbcl-clop (package (name "sbcl-clop") ;; ASD file indicates 0.1.0, but changelog 1.0.1. - (version (git-version "1.0.1" revision commit)) + (version (make-git-version "1.0.1" revision commit)) (source (origin (method git-fetch) @@ -11913,7 +11913,7 @@ (define-public sbcl-closer-mop (revision "3")) (package (name "sbcl-closer-mop") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -11945,7 +11945,7 @@ (define-public sbcl-clostrum (revision "0")) (package (name "sbcl-clostrum") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -11976,7 +11976,7 @@ (define sbcl-closure-common (package (name "sbcl-closure-common") (build-system asdf-build-system/sbcl) - (version (git-version "20101006" revision commit)) + (version (make-git-version "20101006" revision commit)) (home-page "https://common-lisp.net/project/cxml/") (source (origin @@ -12003,7 +12003,7 @@ (define-public sbcl-closure-template (revision "0")) (package (name "sbcl-closure-template") - (version (git-version "0.2.1" revision commit)) + (version (make-git-version "0.2.1" revision commit)) (source (origin (method git-fetch) @@ -12207,7 +12207,7 @@ (define-public sbcl-clss (commit "f62b849189c5d1be378f0bd3d403cda8d4fe310b")) (package (name "sbcl-clss") - (version (git-version "0.3.1" revision commit)) + (version (make-git-version "0.3.1" revision commit)) (source (origin (method git-fetch) @@ -12237,7 +12237,7 @@ (define-public sbcl-cluffer (let ((commit "4aad29c276a58a593064e79972ee4d77cae0af4a")) (package (name "sbcl-cluffer") - (version (git-version "0.0.0" "1" commit)) + (version (make-git-version "0.0.0" "1" commit)) (source (origin (method git-fetch) @@ -12284,7 +12284,7 @@ (define-public sbcl-clump (let ((commit "1ea4dbac1cb86713acff9ae58727dd187d21048a")) (package (name "sbcl-clump") - (version (git-version "0.0.0" "1" commit)) + (version (make-git-version "0.0.0" "1" commit)) (source (origin (method git-fetch) @@ -12324,7 +12324,7 @@ (define-public sbcl-cluster (revision "0")) (package (name "sbcl-cluster") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -12397,7 +12397,7 @@ (define-public sbcl-clx-truetype (revision "1")) (package (name "sbcl-clx-truetype") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -12439,7 +12439,7 @@ (define-public sbcl-clx-xembed (revision "1")) (package (name "sbcl-clx-xembed") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (home-page "https://github.com/laynor/clx-xembed") (source (origin @@ -12471,7 +12471,7 @@ (define-public sbcl-cmd (revision "8")) (package (name "sbcl-cmd") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -12555,7 +12555,7 @@ (define-public sbcl-coalton (revision "4")) (package (name "sbcl-coalton") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -12595,7 +12595,7 @@ (define-public sbcl-coleslaw (revision "0")) (package (name "sbcl-coleslaw") - (version (git-version "0.9.7" revision commit)) + (version (make-git-version "0.9.7" revision commit)) (source (origin (method git-fetch) @@ -12660,7 +12660,7 @@ (define-public sbcl-collectors (revision "2")) (package (name "sbcl-collectors") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -12692,7 +12692,7 @@ (define-public sbcl-colored (revision "1")) (package (name "sbcl-colored") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -12724,7 +12724,7 @@ (define-public sbcl-colorize (let ((commit "ea676b584e0899cec82f21a9e6871172fe3c0eb5")) (package (name "sbcl-colorize") - (version (git-version "0.0.0" "1" commit)) + (version (make-git-version "0.0.0" "1" commit)) (source (origin (method git-fetch) @@ -12758,7 +12758,7 @@ (define-public sbcl-com.gigamonkeys.binary-data (revision "0")) (package (name "sbcl-com.gigamonkeys.binary-data") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -12832,7 +12832,7 @@ (define-public sbcl-command-line-arguments (revision "1")) (package (name "sbcl-command-line-arguments") - (version (git-version "2.0.0" revision commit)) + (version (make-git-version "2.0.0" revision commit)) (source (origin (method git-fetch) @@ -12864,7 +12864,7 @@ (define-public sbcl-common-lisp-jupyter (revision "0")) (package (name "sbcl-common-lisp-jupyter") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -12948,7 +12948,7 @@ (define-public sbcl-compiler-macro (revision "0")) (package (name "sbcl-compiler-macro") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -13024,7 +13024,7 @@ (define-public sbcl-computable-reals (let ((commit "fdc73d75e79d0a4ce6d01c822c950ae2eb137d39")) (package (name "sbcl-computable-reals") - (version (git-version "1.1.0" "1" commit)) + (version (make-git-version "1.1.0" "1" commit)) (source (origin (method git-fetch) @@ -13053,7 +13053,7 @@ (define-public sbcl-concrete-syntax-tree (revision "0")) (package (name "sbcl-concrete-syntax-tree") - (version (git-version "0.2.0" revision commit)) + (version (make-git-version "0.2.0" revision commit)) (source (origin (method git-fetch) @@ -13099,7 +13099,7 @@ (define-public sbcl-concurrent-hash-tables (revision "1")) (package (name "sbcl-concurrent-hash-tables") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -13163,7 +13163,7 @@ (define-public sbcl-conium (revision "1")) (package (name "sbcl-conium") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -13197,7 +13197,7 @@ (define-public sbcl-constantfold (revision "1")) (package (name "sbcl-constantfold") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -13235,7 +13235,7 @@ (define-public sbcl-contextl (revision "2")) (package (name "sbcl-contextl") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -13270,7 +13270,7 @@ (define-public sbcl-core-gp (revision "1")) (package (name "sbcl-core-gp") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -13303,7 +13303,7 @@ (define-public sbcl-croatoan (revision "2")) (package (name "sbcl-croatoan") - (version (git-version "0.3" revision commit)) + (version (make-git-version "0.3" revision commit)) (source (origin (method git-fetch) @@ -13344,7 +13344,7 @@ (define-public sbcl-crypto-shortcuts (revision "1")) (package (name "sbcl-crypto-shortcuts") - (version (git-version "2.0.0" revision commit)) + (version (make-git-version "2.0.0" revision commit)) (source (origin (method git-fetch) @@ -13408,7 +13408,7 @@ (define-public sbcl-ctype (let ((commit "6eb84dfbf1d41f251cc0c09f6e69a2b9415fd3d6")) (package (name "sbcl-ctype") - (version (git-version "0.0.0" "4" commit)) + (version (make-git-version "0.0.0" "4" commit)) (source (origin (method git-fetch) @@ -13445,7 +13445,7 @@ (define-public sbcl-curry-compose-reader-macros (revision "0")) (package (name "sbcl-curry-compose-reader-macros") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -13480,7 +13480,7 @@ (define-public sbcl-custom-hash-table (let ((commit "f26983133940f5edf826ebbc8077acc04816ddfa")) (package (name "sbcl-custom-hash-table") - (version (git-version "0.3" "1" commit)) + (version (make-git-version "0.3" "1" commit)) (source (origin (method git-fetch) @@ -13516,7 +13516,7 @@ (define-public sbcl-cxml (revision "1")) (package (name "sbcl-cxml") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -13548,7 +13548,7 @@ (define-public sbcl-cxml-rng (revision "1")) (package (name "sbcl-cxml-rng") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -13585,7 +13585,7 @@ (define-public sbcl-daemon (revision "1")) (package (name "sbcl-daemon") - (version (git-version "0.0.4" revision commit)) + (version (make-git-version "0.0.4" revision commit)) (source (origin (method git-fetch) @@ -13616,7 +13616,7 @@ (define-public sbcl-data-format-validation (revision "1")) (package (name "sbcl-data-format-validation") - (version (git-version "0.2.0" revision commit)) + (version (make-git-version "0.2.0" revision commit)) (source (origin (method git-fetch) @@ -13646,7 +13646,7 @@ (define-public sbcl-data-frame (revision "0")) (package (name "sbcl-data-frame") - (version (git-version "1.1.1" revision commit)) + (version (make-git-version "1.1.1" revision commit)) (source (origin (method git-fetch) @@ -13689,7 +13689,7 @@ (define-public sbcl-data-lens (revision "0")) (package (name "sbcl-data-lens") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -13724,7 +13724,7 @@ (define-public sbcl-data-sift (revision "1")) (package (name "sbcl-data-sift") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -13764,7 +13764,7 @@ (define-public sbcl-datafly (revision "1")) (package (name "sbcl-datafly") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (home-page "https://github.com/fukamachi/datafly") (source (origin @@ -13817,7 +13817,7 @@ (define-public sbcl-db3 (revision "1")) (package (name "sbcl-db3") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -13846,7 +13846,7 @@ (define-public sbcl-dbi (revision "2")) (package (name "sbcl-dbi") - (version (git-version "0.9.5" revision commit)) + (version (make-git-version "0.9.5" revision commit)) (source (origin (method git-fetch) @@ -13892,7 +13892,7 @@ (define-public sbcl-dbus (revision "2")) (package (name "sbcl-dbus") - (version (git-version "20231105" revision commit)) + (version (make-git-version "20231105" revision commit)) (home-page "https://github.com/death/dbus") (source (origin @@ -13960,7 +13960,7 @@ (define-public sbcl-deeds (commit "f5df54eac79b58a34030e0eb8acf3952c788410d")) (package (name "sbcl-deeds") - (version (git-version "1.1.1" revision commit)) + (version (make-git-version "1.1.1" revision commit)) (source (origin (method git-fetch) @@ -13991,7 +13991,7 @@ (define-public sbcl-definitions (let ((commit "1f4bd7a634a2299aea19cefb5da8041bbb27f2ec")) (package (name "sbcl-definitions") - (version (git-version "1.0.0" "1" commit)) + (version (make-git-version "1.0.0" "1" commit)) (source (origin (method git-fetch) @@ -14093,7 +14093,7 @@ (define-public sbcl-defpackage-plus (commit "5492e27e0bdb7b75fa5177ea4388519dc7a75f11")) (package (name "sbcl-defpackage-plus") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -14126,7 +14126,7 @@ (define-public sbcl-defstar (let ((commit "132829dac9f84fa7202a0c5793aa6accb8d2662a")) (package (name "sbcl-defstar") - (version (git-version "1.0.0" "1" commit)) + (version (make-git-version "1.0.0" "1" commit)) (source (origin (method git-fetch) @@ -14162,7 +14162,7 @@ (define-public sbcl-deploy (revision "2")) (package (name "sbcl-deploy") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -14196,7 +14196,7 @@ (define-public sbcl-depot (revision "1")) (package (name "sbcl-depot") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -14242,7 +14242,7 @@ (define-public sbcl-dexador (package (name "sbcl-dexador") (build-system asdf-build-system/sbcl) - (version (git-version "0.9.15" revision commit)) + (version (make-git-version "0.9.15" revision commit)) (home-page "https://github.com/fukamachi/dexador") (source (origin @@ -14307,7 +14307,7 @@ (define-public sbcl-dfio (revision "0")) (package (name "sbcl-dfio") - (version (git-version "1.0.2" revision commit)) + (version (make-git-version "1.0.2" revision commit)) (source (origin (method git-fetch) @@ -14346,7 +14346,7 @@ (define-public sbcl-diff (revision "1")) (package (name "sbcl-diff") - (version (git-version "0.4" revision commit)) + (version (make-git-version "0.4" revision commit)) (source (origin (method git-fetch) @@ -14381,7 +14381,7 @@ (define-public sbcl-dissect (let ((commit "a70cabcd748cf7c041196efd711e2dcca2bbbb2c")) (package (name "sbcl-dissect") - (version (git-version "1.0.0" "2" commit)) + (version (make-git-version "1.0.0" "2" commit)) (source (origin (method git-fetch) @@ -14417,7 +14417,7 @@ (define-public sbcl-distributions (revision "0")) (package (name "sbcl-distributions") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -14457,7 +14457,7 @@ (define-public sbcl-djula (revision "2")) (package (name "sbcl-djula") - (version (git-version "0.2.0" revision commit)) + (version (make-git-version "0.2.0" revision commit)) (source (origin (method git-fetch) @@ -14503,7 +14503,7 @@ (define-public sbcl-dns-client (revision "0")) (package (name "sbcl-dns-client") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -14538,7 +14538,7 @@ (define-public sbcl-do-urlencode (revision "1")) (package (name "sbcl-do-urlencode") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (home-page "https://github.com/drdo/do-urlencode") (source (origin @@ -14568,7 +14568,7 @@ (define-public sbcl-documentation-utils (revision "0")) (package (name "sbcl-documentation-utils") - (version (git-version "1.2.0" revision commit)) + (version (make-git-version "1.2.0" revision commit)) (source (origin (method git-fetch) @@ -14603,7 +14603,7 @@ (define-public sbcl-documentation-utils-extensions (let ((commit "f67f8a05d583174662a594b79356b201c1d9d750")) (package (name "sbcl-documentation-utils-extensions") - (version (git-version "0.0.0" "1" commit)) + (version (make-git-version "0.0.0" "1" commit)) (source (origin (method git-fetch) @@ -14714,7 +14714,7 @@ (define-public sbcl-draw-cons-tree (revision "0")) (package (name "sbcl-draw-cons-tree") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) ;; https://github.com/quicklisp/quicklisp-projects/issues/2149 (source (origin @@ -14779,7 +14779,7 @@ (define-public sbcl-duologue (revision "0")) (package (name "sbcl-duologue") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -14819,7 +14819,7 @@ (define-public sbcl-dynamic-classes (revision "0")) (package (name "sbcl-dynamic-classes") - (version (git-version "1.0.2" revision commit)) + (version (make-git-version "1.0.2" revision commit)) (source (origin (method git-fetch) @@ -14854,7 +14854,7 @@ (define-public sbcl-dynamic-mixins (let ((commit "7cc09bee7d68527f37406671fabe910e8235b746")) (package (name "sbcl-dynamic-mixins") - (version (git-version "0.0" "1" commit)) + (version (make-git-version "0.0" "1" commit)) (source (origin (method git-fetch) @@ -14885,7 +14885,7 @@ (define-public sbcl-eager-future2 (let ((commit "54df8effd9d9eccac917509590286b5ac5f9cb30")) (package (name "sbcl-eager-future2") - (version (git-version "0.0.0" "1" commit)) + (version (make-git-version "0.0.0" "1" commit)) (source (origin (method git-fetch) @@ -14919,7 +14919,7 @@ (define-public sbcl-easy-routes (revision "0")) (package (name "sbcl-easy-routes") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -14970,7 +14970,7 @@ (define-public sbcl-eazy-gnuplot (revision "0")) (package (name "sbcl-eazy-gnuplot") - (version (git-version "0.2.0" revision commit)) + (version (make-git-version "0.2.0" revision commit)) (source (origin (method git-fetch) @@ -15017,7 +15017,7 @@ (define-public sbcl-eclector (revision "0")) (package (name "sbcl-eclector") - (version (git-version "0.10.0" revision commit)) + (version (make-git-version "0.10.0" revision commit)) (source (origin (method git-fetch) @@ -15062,7 +15062,7 @@ (define-public sbcl-enchant (let ((commit "6af162a7bf10541cbcfcfa6513894900329713fa")) (package (name "sbcl-enchant") - (version (git-version "0.0.0" "1" commit)) + (version (make-git-version "0.0.0" "1" commit)) (home-page "https://github.com/tlikonen/cl-enchant") (source (origin @@ -15276,7 +15276,7 @@ (define-public sbcl-envy (revision "2")) (package (name "sbcl-envy") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (home-page "https://github.com/fukamachi/envy") (source (origin @@ -15347,7 +15347,7 @@ (define-public sbcl-esrap (revision "4")) (package (name "sbcl-esrap") - (version (git-version "0.18" revision commit)) + (version (make-git-version "0.18" revision commit)) (source (origin (method git-fetch) @@ -15390,7 +15390,7 @@ (define-public sbcl-evaled-when (revision "0")) (package (name "sbcl-evaled-when") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -15426,7 +15426,7 @@ (define-public sbcl-event-emitter (revision "0")) (package (name "sbcl-event-emitter") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (home-page "https://github.com/fukamachi/event-emitter") (source (origin @@ -15456,7 +15456,7 @@ (define-public sbcl-eventbus (revision "1")) (package (name "sbcl-eventbus") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -15484,7 +15484,7 @@ (define-public sbcl-exit-hooks (let ((commit "78050f4f55c138fcea86a9d720928782021b6012")) (package (name "sbcl-exit-hooks") - (version (git-version "0.0.0" "1" commit)) + (version (make-git-version "0.0.0" "1" commit)) (source (origin (method git-fetch) @@ -15517,7 +15517,7 @@ (define-public sbcl-exponential-backoff (let ((commit "8d9e8444d8b3184a524c12ce3449f91613ab714f")) (package (name "sbcl-exponential-backoff") - (version (git-version "0" "1" commit)) + (version (make-git-version "0" "1" commit)) (source (origin (method git-fetch) @@ -15551,7 +15551,7 @@ (define-public sbcl-external-program (revision "1")) (package (name "sbcl-external-program") - (version (git-version "0.0.6" revision commit)) + (version (make-git-version "0.0.6" revision commit)) (source (origin (method git-fetch) @@ -15587,7 +15587,7 @@ (define-public sbcl-f2cl (revision "1")) (package (name "sbcl-f2cl") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -15661,7 +15661,7 @@ (define-public sbcl-fare-csv (revision "0")) (package (name "sbcl-fare-csv") - (version (git-version "1.0.4" revision commit)) + (version (make-git-version "1.0.4" revision commit)) (source (origin (method git-fetch) @@ -15732,7 +15732,7 @@ (define-public sbcl-fare-mop (revision "1")) (package (name "sbcl-fare-mop") - (version (git-version "1.0.1" revision commit)) + (version (make-git-version "1.0.1" revision commit)) (source (origin (method git-fetch) @@ -15771,7 +15771,7 @@ (define-public sbcl-fare-quasiquote (package (name "sbcl-fare-quasiquote") (build-system asdf-build-system/sbcl) - (version (git-version "1.0.1" revision commit)) + (version (make-git-version "1.0.1" revision commit)) (home-page "https://gitlab.common-lisp.net/frideau/fare-quasiquote") (source (origin @@ -15827,7 +15827,7 @@ (define-public sbcl-fare-utils (revision "1")) (package (name "sbcl-fare-utils") - (version (git-version "1.0.0.5" revision commit)) + (version (make-git-version "1.0.0.5" revision commit)) (source (origin (method git-fetch) @@ -15865,7 +15865,7 @@ (define-public sbcl-fast-generic-functions (revision "2")) (package (name "sbcl-fast-generic-functions") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -15904,7 +15904,7 @@ (define-public sbcl-fast-http (revision "2")) (package (name "sbcl-fast-http") - (version (git-version "0.2.0" revision commit)) + (version (make-git-version "0.2.0" revision commit)) (source (origin (method git-fetch) @@ -15942,7 +15942,7 @@ (define-public sbcl-fast-io (revision "3")) (package (name "sbcl-fast-io") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -15976,7 +15976,7 @@ (define-public sbcl-fast-websocket (revision "1")) (package (name "sbcl-fast-websocket") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (home-page "https://github.com/fukamachi/fast-websocket") (source (origin @@ -16019,7 +16019,7 @@ (define-public sbcl-feeder (revision "1")) (package (name "sbcl-feeder") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -16055,7 +16055,7 @@ (define-public sbcl-ffa (revision "1")) (package (name "sbcl-ffa") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -16086,7 +16086,7 @@ (define-public sbcl-file-attributes (let ((commit "bbde396438f37d676de9775239115410bec4da2d")) (package (name "sbcl-file-attributes") - (version (git-version "1.0.0" "2" commit)) + (version (make-git-version "1.0.0" "2" commit)) (source (origin (method git-fetch) @@ -16117,7 +16117,7 @@ (define-public sbcl-file-finder (revision "0")) (package (name "sbcl-file-finder") - (version (git-version "0.2.0" revision commit)) + (version (make-git-version "0.2.0" revision commit)) (source (origin (method git-fetch) @@ -16153,7 +16153,7 @@ (define-public sbcl-file-notify (revision "0")) (package (name "sbcl-file-notify") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -16186,7 +16186,7 @@ (define-public sbcl-file-select (revision "1")) (package (name "sbcl-file-select") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -16222,7 +16222,7 @@ (define-public sbcl-filesystem-utils (revision "2")) (package (name "sbcl-filesystem-utils") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -16255,7 +16255,7 @@ (define-public sbcl-filtered-functions (let ((commit "130f69e7b9e1051bf569ef63364b09a3873f0ced")) (package (name "sbcl-filtered-functions") - (version (git-version "0.2.0" "1" commit)) + (version (make-git-version "0.2.0" "1" commit)) (source (origin (method git-fetch) @@ -16291,7 +16291,7 @@ (define-public sbcl-find-port (package (name "sbcl-find-port") (build-system asdf-build-system/sbcl) - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (home-page "https://github.com/eudoxia0/find-port") (source (origin @@ -16323,7 +16323,7 @@ (define-public sbcl-flamegraph (revision "1")) (package (name "sbcl-flamegraph") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -16353,7 +16353,7 @@ (define-public sbcl-flare (revision "1")) (package (name "sbcl-flare") - (version (git-version "1.1.0" revision commit)) + (version (make-git-version "1.1.0" revision commit)) (source (origin (method git-fetch) @@ -16391,7 +16391,7 @@ (define-public sbcl-flexi-streams (revision "1")) (package (name "sbcl-flexi-streams") - (version (git-version "1.0.20" revision commit)) + (version (make-git-version "1.0.20" revision commit)) (source (origin (method git-fetch) @@ -16438,7 +16438,7 @@ (define-public sbcl-flexichain (revision "2")) (package (name "sbcl-flexichain") - (version (git-version "1.5.1" revision commit)) + (version (make-git-version "1.5.1" revision commit)) (source (origin (method git-fetch) @@ -16470,7 +16470,7 @@ (define-public sbcl-float-features (revision "2")) (package (name "sbcl-float-features") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -16506,7 +16506,7 @@ (define-public sbcl-flow (revision "1")) (package (name "sbcl-flow") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -16553,7 +16553,7 @@ (define-public sbcl-flute (revision "1")) (package (name "sbcl-flute") - (version (git-version "0.2-dev" revision commit)) + (version (make-git-version "0.2-dev" revision commit)) (source (origin (method git-fetch) @@ -16586,7 +16586,7 @@ (define-public sbcl-fn (revision "1")) (package (name "sbcl-fn") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -16621,7 +16621,7 @@ (define-public sbcl-fof (revision "1")) (package (name "sbcl-fof") - (version (git-version "0.2.0" revision commit)) + (version (make-git-version "0.2.0" revision commit)) (source (origin (method git-fetch) @@ -16678,7 +16678,7 @@ (define-public sbcl-font-discovery (revision "1")) (package (name "sbcl-font-discovery") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -16710,7 +16710,7 @@ (define-public sbcl-for (revision "1")) (package (name "sbcl-for") - (version (git-version "1.2.0" revision commit)) + (version (make-git-version "1.2.0" revision commit)) (source (origin (method git-fetch) @@ -16746,7 +16746,7 @@ (define-public sbcl-forge (revision "1")) (package (name "sbcl-forge") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -16787,7 +16787,7 @@ (define-public sbcl-form-fiddle (revision "0")) (package (name "sbcl-form-fiddle") - (version (git-version "1.1.0" revision commit)) + (version (make-git-version "1.1.0" revision commit)) (source (origin (method git-fetch) @@ -16823,7 +16823,7 @@ (define-public sbcl-format-colors (revision "0")) (package (name "sbcl-format-colors") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -16852,7 +16852,7 @@ (define-public sbcl-formgrep (revision "0")) (package (name "sbcl-formgrep") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -16966,7 +16966,7 @@ (define-public sbcl-funds (revision "2")) (package (name "sbcl-funds") - (version (git-version "1" revision commit)) + (version (make-git-version "1" revision commit)) (source (origin (method git-fetch) @@ -16996,7 +16996,7 @@ (define-public sbcl-fuzzy-dates (revision "0")) (package (name "sbcl-fuzzy-dates") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -17031,7 +17031,7 @@ (define-public sbcl-fuzzy-match (revision "1")) (package (name "sbcl-fuzzy-match") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -17062,7 +17062,7 @@ (define-public sbcl-fxml (let ((commit "a0e73bb48ef03adea94a55986cc27f522074c8e1")) (package (name "sbcl-fxml") - (version (git-version "0.0.0" "1" commit)) + (version (make-git-version "0.0.0" "1" commit)) (source (origin (method git-fetch) @@ -17109,7 +17109,7 @@ (define-public sbcl-garbage-pools (revision "1")) (package (name "sbcl-garbage-pools") - (version (git-version "0.1.2" revision commit)) + (version (make-git-version "0.1.2" revision commit)) (source (origin (method git-fetch) @@ -17137,7 +17137,7 @@ (define-public sbcl-geco (revision "1")) (package (name "sbcl-geco") - (version (git-version "2.1.2" revision commit)) + (version (make-git-version "2.1.2" revision commit)) (source (origin (method git-fetch) @@ -17212,7 +17212,7 @@ (define-public sbcl-generic-comparability (revision "1")) (package (name "sbcl-generic-comparability") - (version (git-version "1.0.1" revision commit)) + (version (make-git-version "1.0.1" revision commit)) (source (origin (method git-fetch) @@ -17248,7 +17248,7 @@ (define-public sbcl-genhash (revision "1")) (package (name "sbcl-genhash") - (version (git-version "1.7" revision commit)) + (version (make-git-version "1.7" revision commit)) (source (origin (method git-fetch) @@ -17276,7 +17276,7 @@ (define-public sbcl-germinal (revision "0")) (package (name "sbcl-germinal") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -17320,7 +17320,7 @@ (define-public sbcl-gettext (revision "1")) (package (name "sbcl-gettext") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -17352,7 +17352,7 @@ (define-public sbcl-glkit (let ((commit "0d8e7c5fed4231f2177afcf0f3ff66f196ed6a46")) (package (name "sbcl-glkit") - (version (git-version "0.0" "1" commit)) + (version (make-git-version "0.0" "1" commit)) (source (origin (method git-fetch) @@ -17396,7 +17396,7 @@ (define-public sbcl-global-vars (revision "0")) (package (name "sbcl-global-vars") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (home-page "https://github.com/lmj/global-vars") (source (origin @@ -17436,7 +17436,7 @@ (define-public sbcl-glop (revision "1")) (package (name "sbcl-glop") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -17503,7 +17503,7 @@ (define-public sbcl-glsl-packing (revision "1")) (package (name "sbcl-glsl-packing") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -17537,7 +17537,7 @@ (define-public sbcl-glsl-spec (revision "1")) (package (name "sbcl-glsl-spec") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -17571,7 +17571,7 @@ (define-public sbcl-glsl-toolkit (revision "2")) (package (name "sbcl-glsl-toolkit") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -17602,7 +17602,7 @@ (define-public sbcl-glyphs (let ((commit "1ff5714e8c1dca327bc604dfe3e3d1f4b7755373")) (package (name "sbcl-glyphs") - (version (git-version "0.0.0" "1" commit)) + (version (make-git-version "0.0.0" "1" commit)) (source (origin (method git-fetch) @@ -17633,7 +17633,7 @@ (define-public sbcl-golden-utils (revision "4")) (package (name "sbcl-golden-utils") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (home-page "https://github.com/lisp-mirror/golden-utils") (source (origin @@ -17666,7 +17666,7 @@ (define-public sbcl-graph (revision "0")) (package (name "sbcl-graph") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -17712,7 +17712,7 @@ (define-public sbcl-green-threads (revision "1")) (package (name "sbcl-green-threads") - (version (git-version "0.3" revision commit)) + (version (make-git-version "0.3" revision commit)) (source (origin (method git-fetch) @@ -17760,7 +17760,7 @@ (define-public sbcl-gsll (revision "1")) (package (name "sbcl-gsll") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -17854,7 +17854,7 @@ (define-public sbcl-gtype (revision "2")) (package (name "sbcl-gtype") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -17898,7 +17898,7 @@ (define-public sbcl-harmony (revision "0")) (package (name "sbcl-harmony") - (version (git-version "2.0.0" revision commit)) + (version (make-git-version "2.0.0" revision commit)) (source (origin (method git-fetch) @@ -17935,7 +17935,7 @@ (define-public sbcl-hash-set (revision "0")) (package (name "sbcl-hash-set") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -17966,7 +17966,7 @@ (define-public sbcl-hdf5-cffi (revision "1")) (package (name "sbcl-hdf5-cffi") - (version (git-version "1.8.18" revision commit)) + (version (make-git-version "1.8.18" revision commit)) (source (origin (method git-fetch) @@ -18035,7 +18035,7 @@ (define-public sbcl-helambdap (revision "0")) (package (name "sbcl-helambdap") - (version (git-version "20220103" revision commit)) + (version (make-git-version "20220103" revision commit)) (source (origin (method git-fetch) @@ -18133,7 +18133,7 @@ (define-public sbcl-html-entities (let ((commit "4af018048e891f41d77e7d680ed3aeb639e1eedb")) (package (name "sbcl-html-entities") - (version (git-version "0.02" "1" commit)) + (version (make-git-version "0.02" "1" commit)) (source (origin (method git-fetch) @@ -18205,7 +18205,7 @@ (define-public sbcl-http-body (revision "2")) (package (name "sbcl-http-body") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -18345,7 +18345,7 @@ (define-public sbcl-hu.dwim.defclass-star (name "sbcl-hu.dwim.defclass-star") ;; We used to set version from the date when it was a darcs repo, so we ;; keep the year so that package gets updated on previous installs. - (version (git-version "2021" "2" commit)) + (version (make-git-version "2021" "2" commit)) (source (origin (method git-fetch) @@ -18395,7 +18395,7 @@ (define-public sbcl-hu.dwim.graphviz (revision "1")) (package (name "sbcl-hu.dwim.graphviz") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -18436,7 +18436,7 @@ (define-public sbcl-hunchenissr (revision "1")) (package (name "sbcl-hunchenissr") - (version (git-version "1" revision commit)) + (version (make-git-version "1" revision commit)) (source (origin (method git-fetch) @@ -18475,7 +18475,7 @@ (define-public sbcl-hunchenissr-routes (revision "1")) (package (name "sbcl-hunchenissr-routes") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -18509,7 +18509,7 @@ (define-public sbcl-hunchensocket (revision "0")) (package (name "sbcl-hunchensocket") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -18551,7 +18551,7 @@ (define-public sbcl-hunchentoot (revision "1")) (package (name "sbcl-hunchentoot") - (version (git-version "1.3.0" revision commit)) + (version (make-git-version "1.3.0" revision commit)) (source (origin (method git-fetch) @@ -18599,7 +18599,7 @@ (define-public sbcl-hunchentoot-errors (revision "0")) (package (name "sbcl-hunchentoot-errors") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -18633,7 +18633,7 @@ (define-public sbcl-hypergeometrica (revision "0")) (package (name "sbcl-hypergeometrica") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -18712,7 +18712,7 @@ (define-public sbcl-ieee-floats (package (name "sbcl-ieee-floats") (build-system asdf-build-system/sbcl) - (version (git-version "20170924" revision commit)) + (version (make-git-version "20170924" revision commit)) (home-page "https://github.com/marijnh/ieee-floats/") (source (origin @@ -18742,7 +18742,7 @@ (define-public sbcl-in-memory-streams (revision "1")) (package (name "sbcl-in-memory-streams") - (version (git-version "2.0" revision commit)) + (version (make-git-version "2.0" revision commit)) (source (origin (method git-fetch) @@ -18775,7 +18775,7 @@ (define-public sbcl-incless (revision "0")) (package (name "sbcl-incless") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -18810,7 +18810,7 @@ (define-public sbcl-inferior-shell (revision "1")) (package (name "sbcl-inferior-shell") - (version (git-version "2.0.5" revision commit)) + (version (make-git-version "2.0.5" revision commit)) (source (origin (method git-fetch) @@ -18844,7 +18844,7 @@ (define-public sbcl-infix-math (revision "0")) (package (name "sbcl-infix-math") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -18942,7 +18942,7 @@ (define-public sbcl-inquisitor (revision "0")) (package (name "sbcl-inquisitor") - (version (git-version "0.5" revision commit)) + (version (make-git-version "0.5" revision commit)) (source (origin (method git-fetch) @@ -18974,7 +18974,7 @@ (define-public sbcl-interface (revision "0")) (package (name "sbcl-interface") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -19007,7 +19007,7 @@ (define-public sbcl-introspect-environment (package (name "sbcl-introspect-environment") (build-system asdf-build-system/sbcl) - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (home-page "https://github.com/Bike/introspect-environment") (source (origin @@ -19052,7 +19052,7 @@ (define-public sbcl-iolib (revision "0")) (package (name "sbcl-iolib") - (version (git-version "0.8.4" revision commit)) + (version (make-git-version "0.8.4" revision commit)) (home-page "https://github.com/sionescu/iolib") (source (origin @@ -19148,7 +19148,7 @@ (define-public sbcl-issr-core (revision "1")) (package (name "sbcl-issr-core") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -19224,7 +19224,7 @@ (define-public sbcl-ixf (revision "1")) (package (name "sbcl-ixf") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -19261,7 +19261,7 @@ (define-public sbcl-jonathan (revision "1")) (package (name "sbcl-jonathan") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -19296,7 +19296,7 @@ (define-public sbcl-jose (package (name "sbcl-jose") (build-system asdf-build-system/sbcl) - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (home-page "https://github.com/fukamachi/jose") (source (origin @@ -19332,7 +19332,7 @@ (define-public sbcl-jpeg-turbo (revision "1")) (package (name "sbcl-jpeg-turbo") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -19455,7 +19455,7 @@ (define-public sbcl-json-streams (revision "1")) (package (name "sbcl-json-streams") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -19489,7 +19489,7 @@ (define-public sbcl-jsonrpc (revision "1")) (package (name "sbcl-jsonrpc") - (version (git-version "0.3.2" revision commit)) + (version (make-git-version "0.3.2" revision commit)) (source (origin (method git-fetch) @@ -19530,7 +19530,7 @@ (define-public sbcl-jsown (let ((commit "744c4407bef58dfa876d9da0b5c0205d869e7977")) (package (name "sbcl-jsown") - (version (git-version "1.0.1" "1" commit)) + (version (make-git-version "1.0.1" "1" commit)) (source (origin (method git-fetch) @@ -19650,7 +19650,7 @@ (define-public sbcl-kdlcl (revision "0")) (package (name "sbcl-kdlcl") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -19680,7 +19680,7 @@ (define-public sbcl-kebab (revision "1")) (package (name "sbcl-kebab") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (home-page "https://github.com/pocket7878/kebab") (source (origin @@ -19721,7 +19721,7 @@ (define-public sbcl-kmrcl (revision "1")) (package (name "sbcl-kmrcl") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -19761,7 +19761,7 @@ (define-public sbcl-kons-9 (revision "0")) (package (name "sbcl-kons-9") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -19815,7 +19815,7 @@ (define-public sbcl-lack (revision "1")) (package (name "sbcl-lack") - (version (git-version "0.3.0" revision commit)) + (version (make-git-version "0.3.0" revision commit)) (source (origin (method git-fetch) @@ -19886,7 +19886,7 @@ (define-public sbcl-lambda-fiddle (revision "1")) (package (name "sbcl-lambda-fiddle") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -19917,7 +19917,7 @@ (define-public sbcl-language-codes (let ((commit "e7aa0e37cb97a3d37d6bc7316b479d01bff8f42e")) (package (name "sbcl-language-codes") - (version (git-version "1.0.0" "1" commit)) + (version (make-git-version "1.0.0" "1" commit)) (source (origin (method git-fetch) @@ -19951,7 +19951,7 @@ (define-public sbcl-langutils (revision "0")) (package (name "sbcl-langutils") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -19995,7 +19995,7 @@ (define-public sbcl-lass (revision "1")) (package (name "sbcl-lass") - (version (git-version "0.6.0" revision commit)) + (version (make-git-version "0.6.0" revision commit)) (source (origin (method git-fetch) @@ -20029,7 +20029,7 @@ (define-public sbcl-legion (revision "1")) (package (name "sbcl-legion") - (version (git-version "0.1.1" revision commit)) + (version (make-git-version "0.1.1" revision commit)) (source (origin (method git-fetch) @@ -20068,7 +20068,7 @@ (define-public sbcl-legit (revision "3")) (package (name "sbcl-legit") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -20114,7 +20114,7 @@ (define-public sbcl-lem-mailbox (revision "0")) (package (name "sbcl-lem-mailbox") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -20147,7 +20147,7 @@ (define-public sbcl-let-over-lambda (revision "1")) (package (name "sbcl-let-over-lambda") - (version (git-version "1.0.1" revision commit)) + (version (make-git-version "1.0.1" revision commit)) (source (origin (method git-fetch) @@ -20192,7 +20192,7 @@ (define-public sbcl-let-plus (revision "2")) (package (name "sbcl-let-plus") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -20233,7 +20233,7 @@ (define-public sbcl-lev (revision "1")) (package (name "sbcl-lev") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -20351,7 +20351,7 @@ (define-public sbcl-linedit (revision "1")) (package (name "sbcl-linedit") - (version (git-version "0.17.6" revision commit)) + (version (make-git-version "0.17.6" revision commit)) (source (origin (method git-fetch) @@ -20383,7 +20383,7 @@ (define-public sbcl-lisp-namespace (package (name "sbcl-lisp-namespace") (build-system asdf-build-system/sbcl) - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (home-page "https://github.com/guicho271828/lisp-namespace") (source (origin @@ -20416,7 +20416,7 @@ (define-public sbcl-lisp-pay (revision "0")) (package (name "sbcl-lisp-pay") - (version (git-version "0.0.5" revision commit)) + (version (make-git-version "0.0.5" revision commit)) (source (origin (method git-fetch) @@ -20459,7 +20459,7 @@ (define-public sbcl-lisp-preprocessor (revision "0")) (package (name "sbcl-lisp-preprocessor") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -20494,7 +20494,7 @@ (define-public sbcl-lisp-stat (revision "0")) (package (name "sbcl-lisp-stat") - (version (git-version "1.2.0" revision commit)) + (version (make-git-version "1.2.0" revision commit)) (source (origin (method git-fetch) @@ -20538,7 +20538,7 @@ (define-public sbcl-lispbuilder-sdl (revision "2")) (package (name "sbcl-lispbuilder-sdl") - (version (git-version "0.9.8.2" revision commit)) + (version (make-git-version "0.9.8.2" revision commit)) (source (origin (method git-fetch) @@ -20583,7 +20583,7 @@ (define-public sbcl-list-named-class (revision "0")) (package (name "sbcl-list-named-class") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -20644,7 +20644,7 @@ (define-public sbcl-literate-lisp (revision "1")) (package (name "sbcl-literate-lisp") - (version (git-version "0.6" revision commit)) + (version (make-git-version "0.6" revision commit)) (source (origin (method git-fetch) @@ -20678,7 +20678,7 @@ (define-public sbcl-livesupport (revision "1")) (package (name "sbcl-livesupport") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -20708,7 +20708,7 @@ (define-public sbcl-lla (revision "2")) (package (name "sbcl-lla") - (version (git-version "0.4.0" revision commit)) + (version (make-git-version "0.4.0" revision commit)) (source (origin (method git-fetch) @@ -20764,7 +20764,7 @@ (define-public sbcl-lmdb (revision "0")) (package (name "sbcl-lmdb") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -20815,7 +20815,7 @@ (define-public sbcl-local-time (revision "4")) (package (name "sbcl-local-time") - (version (git-version "1.0.6" revision commit)) + (version (make-git-version "1.0.6" revision commit)) (source (origin (method git-fetch) @@ -20887,7 +20887,7 @@ (define-public sbcl-log4cl (revision "2")) (package (name "sbcl-log4cl") - (version (git-version "1.1.4" revision commit)) + (version (make-git-version "1.1.4" revision commit)) (source (origin (method git-fetch) @@ -20920,7 +20920,7 @@ (define-public sbcl-lorem-ipsum (revision "0")) (package (name "sbcl-lorem-ipsum") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -20951,7 +20951,7 @@ (define-public sbcl-lparallel (revision "1")) (package (name "sbcl-lparallel") - (version (git-version "2.8.4" revision commit)) + (version (make-git-version "2.8.4" revision commit)) (source (origin (method git-fetch) @@ -21008,7 +21008,7 @@ (define-public sbcl-lquery (commit "8048111c6b83956daa632e7a3ffbd8c9c203bd8d")) (package (name "sbcl-lquery") - (version (git-version "3.2.1" revision commit)) + (version (make-git-version "3.2.1" revision commit)) (source (origin (method git-fetch) @@ -21045,7 +21045,7 @@ (define-public sbcl-ltk (revision "0")) (package (name "sbcl-ltk") - (version (git-version "0.992" revision commit)) + (version (make-git-version "0.992" revision commit)) (source (origin (method git-fetch) @@ -21102,7 +21102,7 @@ (define-public sbcl-lunamech-matrix-api (revision "0")) (package (name "sbcl-lunamech-matrix-api") - (version (git-version "0.0.2" revision commit)) + (version (make-git-version "0.0.2" revision commit)) (source (origin (method git-fetch) @@ -21142,7 +21142,7 @@ (define-public sbcl-lw-compat (let ((commit "aabfe28c6c1a4949f9d7b3cb30319367c9fd1c0d")) (package (name "sbcl-lw-compat") - (version (git-version "1.0.0" "1" commit)) + (version (make-git-version "1.0.0" "1" commit)) (source (origin (method git-fetch) @@ -21173,7 +21173,7 @@ (define-public sbcl-lzlib (revision "2")) (package (name "sbcl-lzlib") - (version (git-version "2.0" revision commit)) + (version (make-git-version "2.0" revision commit)) (source (origin (method git-fetch) @@ -21217,7 +21217,7 @@ (define-public sbcl-machine-state (revision "2")) (package (name "sbcl-machine-state") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -21254,7 +21254,7 @@ (define-public sbcl-magic-ed (revision "1")) (package (name "sbcl-magic-ed") - (version (git-version "0.2" revision commit)) + (version (make-git-version "0.2" revision commit)) (source (origin (method git-fetch) @@ -21285,7 +21285,7 @@ (define-public sbcl-magicffi (let ((commit "d88f2f280c31f639e4e05be75215d8a8dce6aef2")) (package (name "sbcl-magicffi") - (version (git-version "0.0.0" "1" commit)) + (version (make-git-version "0.0.0" "1" commit)) (source (origin (method git-fetch) @@ -21378,7 +21378,7 @@ (define-public sbcl-maiden (revision "1")) (package (name "sbcl-maiden") - (version (git-version "3.1.0" revision commit)) + (version (make-git-version "3.1.0" revision commit)) (source (origin (method git-fetch) @@ -21433,7 +21433,7 @@ (define-public sbcl-maidenhead (revision "1")) (package (name "sbcl-maidenhead") - (version (git-version "1.1" revision commit)) + (version (make-git-version "1.1" revision commit)) (source (origin (method git-fetch) @@ -21466,7 +21466,7 @@ (define-public sbcl-make-hash (commit "ae0909cd8e697520a1085fac6f54ac2b448ebd21")) (package (name "sbcl-make-hash") - (version (git-version "1.0.2" revision commit)) + (version (make-git-version "1.0.2" revision commit)) (source (origin (method git-fetch) @@ -21498,7 +21498,7 @@ (define-public sbcl-map-bind (revision "0")) (package (name "sbcl-map-bind") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -21530,7 +21530,7 @@ (define-public sbcl-map-set (revision "1")) (package (name "sbcl-map-set") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method url-fetch) @@ -21563,7 +21563,7 @@ (define-public sbcl-markup-reader (revision "1")) (package (name "sbcl-markup-reader") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -21603,7 +21603,7 @@ (define-public sbcl-marray (revision "0")) (package (name "sbcl-marray") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -21641,7 +21641,7 @@ (define-public sbcl-marshal (revision "1")) (package (name "sbcl-marshal") - (version (git-version "1.3.0" revision commit)) + (version (make-git-version "1.3.0" revision commit)) (source (origin (method git-fetch) @@ -21673,7 +21673,7 @@ (define-public sbcl-mathkit (let ((commit "fd884f94b36ef5e9bc19459ad0b3cda6303d2a2a")) (package (name "sbcl-mathkit") - (version (git-version "0.0" "1" commit)) + (version (make-git-version "0.0" "1" commit)) (source (origin (method git-fetch) @@ -21705,7 +21705,7 @@ (define-public sbcl-maxpc (revision "1")) (package (name "sbcl-maxpc") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -21863,7 +21863,7 @@ (define-public sbcl-messagebox (revision "1")) (package (name "sbcl-messagebox") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -21906,7 +21906,7 @@ (define-public sbcl-meta (revision "0")) (package (name "sbcl-meta") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -21937,7 +21937,7 @@ (define-public sbcl-metabang-bind (revision "2")) (package (name "sbcl-metabang-bind") - (version (git-version "0.8.0" revision commit)) + (version (make-git-version "0.8.0" revision commit)) (source (origin (method git-fetch) @@ -21973,7 +21973,7 @@ (define-public sbcl-metacopy (revision "2")) (package (name "sbcl-metacopy") - (version (git-version "0.2.0" revision commit)) + (version (make-git-version "0.2.0" revision commit)) (source (origin (method git-fetch) @@ -22008,7 +22008,7 @@ (define-public sbcl-metatilities-base (revision "2")) (package (name "sbcl-metatilities-base") - (version (git-version "0.6.6" revision commit)) + (version (make-git-version "0.6.6" revision commit)) (source (origin (method git-fetch) @@ -22040,7 +22040,7 @@ (define-public sbcl-metering (revision "0")) (package (name "sbcl-metering") - (version (git-version "3.2" revision commit)) + (version (make-git-version "3.2" revision commit)) (source (origin (method git-fetch) @@ -22071,7 +22071,7 @@ (define-public sbcl-mgl-gpr (revision "1")) (package (name "sbcl-mgl-gpr") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -22103,7 +22103,7 @@ (define-public sbcl-mgl-pax (revision "1")) (package (name "sbcl-mgl-pax") - (version (git-version "0.3.0" revision commit)) + (version (make-git-version "0.3.0" revision commit)) (source (origin (method git-fetch) @@ -22163,7 +22163,7 @@ (define-public sbcl-mgrs (revision "1")) (package (name "sbcl-mgrs") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -22234,7 +22234,7 @@ (define-public sbcl-mito (revision "3")) (package (name "sbcl-mito") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (home-page "https://github.com/fukamachi/mito") (source (origin @@ -22346,7 +22346,7 @@ (define-public sbcl-mmap (revision "0")) (package (name "sbcl-mmap") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -22383,7 +22383,7 @@ (define-public sbcl-modf (revision "0")) (package (name "sbcl-modf") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -22419,7 +22419,7 @@ (define-public sbcl-modularize (revision "1")) (package (name "sbcl-modularize") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -22455,7 +22455,7 @@ (define-public sbcl-modularize-hooks (revision "1")) (package (name "sbcl-modularize-hooks") - (version (git-version "1.0.2" revision commit)) + (version (make-git-version "1.0.2" revision commit)) (source (origin (method git-fetch) @@ -22487,7 +22487,7 @@ (define-public sbcl-modularize-interfaces (revision "1")) (package (name "sbcl-modularize-interfaces") - (version (git-version "0.9.3" revision commit)) + (version (make-git-version "0.9.3" revision commit)) (source (origin (method git-fetch) @@ -22520,7 +22520,7 @@ (define-public sbcl-moira (revision "1")) (package (name "sbcl-moira") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -22556,7 +22556,7 @@ (define-public sbcl-more-conditions (revision "1")) (package (name "sbcl-more-conditions") - (version (git-version "0.4.5" revision commit)) + (version (make-git-version "0.4.5" revision commit)) (source (origin (method git-fetch) @@ -22589,7 +22589,7 @@ (define-public sbcl-montezuma (revision "1")) (package (name "sbcl-montezuma") - (version (git-version "0.1.3" revision commit)) + (version (make-git-version "0.1.3" revision commit)) (source (origin (method git-fetch) @@ -22649,7 +22649,7 @@ (define-public sbcl-moptilities (let ((commit "a436f16b357c96b82397ec018ea469574c10dd41")) (package (name "sbcl-moptilities") - (version (git-version "0.3.13" "1" commit)) + (version (make-git-version "0.3.13" "1" commit)) (home-page "https://github.com/gwkkwg/moptilities/") (source (origin @@ -22707,7 +22707,7 @@ (define-public sbcl-mssql (revision "1")) (package (name "sbcl-mssql") - (version (git-version "0.0.3" revision commit)) + (version (make-git-version "0.0.3" revision commit)) (source (origin (method git-fetch) @@ -22780,7 +22780,7 @@ (define-public sbcl-multilang-documentation (let ((commit "59e798a07e949e8957a20927f52aca425d84e4a0")) (package (name "sbcl-multilang-documentation") - (version (git-version "1.0.0" "1" commit)) + (version (make-git-version "1.0.0" "1" commit)) (source (origin (method git-fetch) @@ -22813,7 +22813,7 @@ (define-public sbcl-music-spelling (revision "0")) (package (name "sbcl-music-spelling") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -22845,7 +22845,7 @@ (define-public sbcl-mw-equiv (revision "1")) (package (name "sbcl-mw-equiv") - (version (git-version "0.1.2" revision commit)) + (version (make-git-version "0.1.2" revision commit)) (home-page "https://github.com/sharplispers/mw-equiv/") (source (origin @@ -22900,7 +22900,7 @@ (define-public sbcl-myway (revision "1")) (package (name "sbcl-myway") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -22985,7 +22985,7 @@ (define-public sbcl-named-readtables (revision "4")) (package (name "sbcl-named-readtables") - (version (git-version "0.9" revision commit)) + (version (make-git-version "0.9" revision commit)) (source (origin (method git-fetch) @@ -23022,7 +23022,7 @@ (define-public sbcl-napa-fft3 (revision "0")) (package (name "sbcl-napa-fft3") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -23332,7 +23332,7 @@ (define-public sbcl-nibbles (revision "3")) (package (name "sbcl-nibbles") - (version (git-version "0.14" revision commit)) + (version (make-git-version "0.14" revision commit)) (source (origin (method git-fetch) @@ -23380,7 +23380,7 @@ (define-public sbcl-ningle (revision "2")) (package (name "sbcl-ningle") - (version (git-version "0.3.0" revision commit)) + (version (make-git-version "0.3.0" revision commit)) (source (origin (method git-fetch) @@ -23545,7 +23545,7 @@ (define-public sbcl-nodgui (revision "2")) (package (name "sbcl-nodgui") - (version (git-version "0.7.2.0" revision commit)) + (version (make-git-version "0.7.2.0" revision commit)) (source (origin (method git-fetch) @@ -23608,7 +23608,7 @@ (define-public sbcl-nontrivial-gray-streams (revision "0")) (package (name "sbcl-nontrivial-gray-streams") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -23696,7 +23696,7 @@ (define-public sbcl-numcl (revision "3")) (package (name "sbcl-numcl") - (version (git-version "0.2.0" revision commit)) + (version (make-git-version "0.2.0" revision commit)) (source (origin (method git-fetch) @@ -23742,7 +23742,7 @@ (define-public sbcl-numerical-utilities (revision "0")) (package (name "sbcl-numerical-utilities") - (version (git-version "1.2.0" revision commit)) + (version (make-git-version "1.2.0" revision commit)) (source (origin (method git-fetch) @@ -23783,7 +23783,7 @@ (define-public sbcl-numpy-file-format (revision "2")) (package (name "sbcl-numpy-file-format") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -23847,7 +23847,7 @@ (define-public sbcl-olc (revision "1")) (package (name "sbcl-olc") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -23879,7 +23879,7 @@ (define-public sbcl-one-more-re-nightmare (revision "1")) (package (name "sbcl-one-more-re-nightmare") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -23932,7 +23932,7 @@ (define-public sbcl-open-with (revision "0")) (package (name "sbcl-open-with") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -23978,7 +23978,7 @@ (define-public sbcl-opticl (revision "1")) (package (name "sbcl-opticl") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -24019,7 +24019,7 @@ (define-public sbcl-opticl-core (revision "0")) (package (name "sbcl-opticl-core") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -24051,7 +24051,7 @@ (define-public sbcl-optima (package (name "sbcl-optima") (build-system asdf-build-system/sbcl) - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (home-page "https://github.com/m2ym/optima") (source (origin @@ -24090,7 +24090,7 @@ (define-public sbcl-org-sampler (revision "1")) (package (name "sbcl-org-sampler") - (version (git-version "0.2.1" revision commit)) + (version (make-git-version "0.2.1" revision commit)) (source (origin (method git-fetch) @@ -24124,7 +24124,7 @@ (define-public sbcl-origin (revision "1")) (package (name "sbcl-origin") - (version (git-version "2.0.0" revision commit)) + (version (make-git-version "2.0.0" revision commit)) (source (origin (method git-fetch) @@ -24157,7 +24157,7 @@ (define-public sbcl-osc (revision "0")) (package (name "sbcl-osc") - (version (git-version "0.9" revision commit)) + (version (make-git-version "0.9" revision commit)) (source (origin (method git-fetch) @@ -24190,7 +24190,7 @@ (define-public sbcl-osicat (revision "4")) (package (name "sbcl-osicat") - (version (git-version "0.7.0" revision commit)) + (version (make-git-version "0.7.0" revision commit)) (home-page "https://www.common-lisp.net/project/osicat/") (source (origin @@ -24279,7 +24279,7 @@ (define-public sbcl-overlord (let ((commit "a8f37b321a8aae1652fc50b78e74e57c771cc763")) (package (name "sbcl-overlord") - (version (git-version "0.0.0" "1" commit)) + (version (make-git-version "0.0.0" "1" commit)) (source (origin (method git-fetch) @@ -24352,7 +24352,7 @@ (define-public sbcl-parenscript (let ((commit "7a1ac46353cecd144fc91915ba9f122aafcf4766")) (package (name "sbcl-parenscript") - (version (git-version "2.7.1" "1" commit)) + (version (make-git-version "2.7.1" "1" commit)) (source (origin (method git-fetch) @@ -24411,7 +24411,7 @@ (define-public sbcl-parse (revision "1")) (package (name "sbcl-parse") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -24439,7 +24439,7 @@ (define-public sbcl-parse-declarations (revision "1")) (package (name "sbcl-parse-declarations") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -24480,7 +24480,7 @@ (define-public sbcl-parse-float (revision "2")) (package (name "sbcl-parse-float") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -24519,7 +24519,7 @@ (define-public sbcl-parse-js (revision "1")) (package (name "sbcl-parse-js") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -24627,7 +24627,7 @@ (define-public sbcl-parser-combinators (revision "1")) (package (name "sbcl-parser-combinators") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -24668,7 +24668,7 @@ (define-public sbcl-path-parse (revision "1")) (package (name "sbcl-path-parse") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -24701,7 +24701,7 @@ (define-public sbcl-pathname-utils (revision "4")) (package (name "sbcl-pathname-utils") - (version (git-version "1.1.0" revision commit)) + (version (make-git-version "1.1.0" revision commit)) (source (origin (method git-fetch) @@ -24748,7 +24748,7 @@ (define-public sbcl-pem (package (name "sbcl-pem") (build-system asdf-build-system/sbcl) - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (home-page "https://github.com/fukamachi/pem") (source (origin @@ -24782,7 +24782,7 @@ (define-public sbcl-percent-encoding (revision "1")) (package (name "sbcl-percent-encoding") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -24844,7 +24844,7 @@ (define-public sbcl-periods (revision "2")) (package (name "sbcl-periods") - (version (git-version "0.0.2" revision commit)) + (version (make-git-version "0.0.2" revision commit)) (source (origin (method git-fetch) @@ -24880,7 +24880,7 @@ (define-public sbcl-phos (let ((commit "6620b82b091cdfed655e1093ef045dbe518d5474")) (package (name "sbcl-phos") - (version (git-version "0.0.1" "1" commit)) + (version (make-git-version "0.0.1" "1" commit)) (source (origin (method git-fetch) @@ -24955,7 +24955,7 @@ (define-public sbcl-pileup (revision "1")) (package (name "sbcl-pileup") - (version (git-version "1.0.1" revision commit)) + (version (make-git-version "1.0.1" revision commit)) (source (origin (method git-fetch) @@ -24988,7 +24988,7 @@ (define-public sbcl-piping (revision "1")) (package (name "sbcl-piping") - (version (git-version "2.0.0" revision commit)) + (version (make-git-version "2.0.0" revision commit)) (source (origin (method git-fetch) @@ -25019,7 +25019,7 @@ (define-public sbcl-plump (revision "3")) (package (name "sbcl-plump") - (version (git-version "2.0.0" revision commit)) + (version (make-git-version "2.0.0" revision commit)) (source (origin (method git-fetch) @@ -25058,7 +25058,7 @@ (define-public sbcl-plump-sexp (revision "0")) (package (name "sbcl-plump-sexp") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -25094,7 +25094,7 @@ (define-public sbcl-png (revision "1")) (package (name "sbcl-png") - (version (git-version "0.6" revision commit)) + (version (make-git-version "0.6" revision commit)) (source (origin (method git-fetch) @@ -25138,7 +25138,7 @@ (define-public sbcl-png-read (revision "1")) (package (name "sbcl-png-read") - (version (git-version "0.3.1" revision commit)) + (version (make-git-version "0.3.1" revision commit)) (source (origin (method git-fetch) @@ -25167,7 +25167,7 @@ (define-public sbcl-pngload (revision "2")) (package (name "sbcl-pngload") - (version (git-version "2.0.0" revision commit)) + (version (make-git-version "2.0.0" revision commit)) (source (origin (method git-fetch) @@ -25209,7 +25209,7 @@ (define-public sbcl-policy-cond (revision "0")) (package (name "sbcl-policy-cond") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -25294,7 +25294,7 @@ (define-public sbcl-portable-condition-system (revision "0")) (package (name "sbcl-portable-condition-system") - (version (git-version "1.1.0" revision commit)) + (version (make-git-version "1.1.0" revision commit)) (source (origin (method git-fetch) @@ -25330,7 +25330,7 @@ (define-public sbcl-portable-threads (let ((commit "aa26bf38338a6b068bf8bfb3375d8d8c3b0a28df")) (package (name "sbcl-portable-threads") - (version (git-version "2.3" "2" commit)) + (version (make-git-version "2.3" "2" commit)) (source (origin (method git-fetch) @@ -25362,7 +25362,7 @@ (define-public sbcl-portal (revision "2")) (package (name "sbcl-portal") - (version (git-version "1.2" revision commit)) + (version (make-git-version "1.2" revision commit)) (source (origin (method git-fetch) @@ -25404,7 +25404,7 @@ (define-public sbcl-positional-lambda (revision "0")) (package (name "sbcl-positional-lambda") - (version (git-version "2.0" revision commit)) + (version (make-git-version "2.0" revision commit)) (source (origin (method git-fetch) @@ -25595,7 +25595,7 @@ (define-public sbcl-pp-toml (revision "0")) (package (name "sbcl-pp-toml") - (version (git-version "1.0.1" revision commit)) + (version (make-git-version "1.0.1" revision commit)) (source (origin (method git-fetch) @@ -25634,7 +25634,7 @@ (define-public sbcl-ppath (let ((commit "eb1a8173b4d1d691ea9a7699412123462f58c3ce")) (package (name "sbcl-ppath") - (version (git-version "0.1" "1" commit)) + (version (make-git-version "0.1" "1" commit)) (source (origin (method git-fetch) @@ -25678,7 +25678,7 @@ (define-public sbcl-print-licenses (package (name "sbcl-print-licenses") (build-system asdf-build-system/sbcl) - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -25710,7 +25710,7 @@ (define-public sbcl-printv (revision "2")) (package (name "sbcl-printv") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -25750,7 +25750,7 @@ (define-public sbcl-priority-queue (revision "0")) (package (name "sbcl-priority-queue") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -25780,7 +25780,7 @@ (define-public sbcl-proc-parse (let ((commit "ac3636834d561bdc2686c956dbd82494537285fd")) (package (name "sbcl-proc-parse") - (version (git-version "0.0.0" "1" commit)) + (version (make-git-version "0.0.0" "1" commit)) (source (origin (method git-fetch) @@ -25819,7 +25819,7 @@ (define-public sbcl-progressons (revision "0")) (package (name "sbcl-progressons") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -25896,7 +25896,7 @@ (define-public sbcl-promise (revision "0")) (package (name "sbcl-promise") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -25935,7 +25935,7 @@ (define-public sbcl-prompter (revision "0")) (package (name "sbcl-prompter") - (version (git-version "0.1.1" revision commit)) + (version (make-git-version "0.1.1" revision commit)) (source (origin (method git-fetch) @@ -25982,7 +25982,7 @@ (define-public sbcl-purgatory (revision "1")) (package (name "sbcl-purgatory") - (version (git-version "0.1.2" revision commit)) + (version (make-git-version "0.1.2" revision commit)) (source (origin (method git-fetch) @@ -26016,7 +26016,7 @@ (define-public sbcl-puri (revision "2")) (package (name "sbcl-puri") - (version (git-version "1.5.7" revision commit)) + (version (make-git-version "1.5.7" revision commit)) (source (origin (method git-fetch) @@ -26093,7 +26093,7 @@ (define-public sbcl-py4cl (revision "2")) (package (name "sbcl-py4cl") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -26163,7 +26163,7 @@ (define-public sbcl-pythonic-string-reader (let ((commit "47a70ba1e32362e03dad6ef8e6f36180b560f86a")) (package (name "sbcl-pythonic-string-reader") - (version (git-version "0.0.0" "1" commit)) + (version (make-git-version "0.0.0" "1" commit)) (source (origin (method git-fetch) @@ -26198,7 +26198,7 @@ (define-public sbcl-pzmq (revision "2")) (package (name "sbcl-pzmq") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -26273,7 +26273,7 @@ (define-public sbcl-qmynd (revision "1")) (package (name "sbcl-qmynd") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -26349,7 +26349,7 @@ (define-public sbcl-queues (let ((commit "47d4da65e9ea20953b74aeeab7e89a831b66bc94")) (package (name "sbcl-queues") - (version (git-version "0.0.0" "1" commit)) + (version (make-git-version "0.0.0" "1" commit)) (source (origin (method git-fetch) @@ -26387,7 +26387,7 @@ (define-public sbcl-quicklisp-stats (revision "0")) (package (name "sbcl-quicklisp-stats") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -26452,7 +26452,7 @@ (define-public sbcl-quicksearch (let ((commit "fb02ecf7c876ec580ab18c7d2c8c7814c06af599")) (package (name "sbcl-quicksearch") - (version (git-version "0.01.04" "1" commit)) + (version (make-git-version "0.01.04" "1" commit)) (source (origin (method git-fetch) @@ -26497,7 +26497,7 @@ (define-public sbcl-quri (revision "0")) (package (name "sbcl-quri") - (version (git-version "0.7.0" revision commit)) + (version (make-git-version "0.7.0" revision commit)) (source (origin (method git-fetch) @@ -26529,7 +26529,7 @@ (define-public sbcl-radiance (revision "3")) (package (name "sbcl-radiance") - (version (git-version "2.1.2" revision commit)) + (version (make-git-version "2.1.2" revision commit)) (source (origin (method git-fetch) @@ -26596,7 +26596,7 @@ (define-public sbcl-radiance-contribs (revision "1")) (package (name "sbcl-radiance-contribs") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -26639,7 +26639,7 @@ (define-public sbcl-random-sample (revision "0")) (package (name "sbcl-random-sample") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -26675,7 +26675,7 @@ (define-public sbcl-random-state (revision "1")) (package (name "sbcl-random-state") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -26714,7 +26714,7 @@ (define-public sbcl-re (revision "1")) (package (name "sbcl-re") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -26792,7 +26792,7 @@ (define-public sbcl-regex (let ((commit "fbc9a9f313b9edc1788f33d4b23a29151635ae22")) (package (name "sbcl-regex") - (version (git-version "1" "1" commit)) + (version (make-git-version "1" "1" commit)) (source (origin (method git-fetch) @@ -26819,7 +26819,7 @@ (define-public sbcl-repl-utilities (let ((commit "7e300df663177ea4581f4e7e9c601377881dd986")) (package (name "sbcl-repl-utilities") - (version (git-version "0.0.0" "1" commit)) + (version (make-git-version "0.0.0" "1" commit)) (source (origin (method git-fetch) @@ -26851,7 +26851,7 @@ (define-public sbcl-restas (revision "1")) (package (name "sbcl-restas") - (version (git-version "0.1.4" revision commit)) + (version (make-git-version "0.1.4" revision commit)) (source (origin (method git-fetch) @@ -26897,7 +26897,7 @@ (define-public sbcl-retrospectiff (revision "1")) (package (name "sbcl-retrospectiff") - (version (git-version "0.2" revision commit)) + (version (make-git-version "0.2" revision commit)) (source (origin (method git-fetch) @@ -26935,7 +26935,7 @@ (define-public sbcl-rfc2388 (revision "1")) (package (name "sbcl-rfc2388") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -26965,7 +26965,7 @@ (define-public sbcl-routes (revision "1")) (package (name "sbcl-routes") - (version (git-version "0.2.5" revision commit)) + (version (make-git-version "0.2.5" revision commit)) (source (origin (method git-fetch) @@ -27010,7 +27010,7 @@ (define-public sbcl-rss (let ((commit "51d0145e91b86327ae5c36364f9c3048052e7a58")) (package (name "sbcl-rss") - (version (git-version "0.9.1.1" "2" commit)) + (version (make-git-version "0.9.1.1" "2" commit)) (source (origin (method git-fetch) @@ -27045,7 +27045,7 @@ (define-public sbcl-rtg-math (revision "1")) (package (name "sbcl-rtg-math") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -27076,7 +27076,7 @@ (define-public sbcl-rucksack (revision "0")) (package (name "sbcl-rucksack") - (version (git-version "0.1.20" revision commit)) + (version (make-git-version "0.1.20" revision commit)) (source (origin (method git-fetch) @@ -27102,7 +27102,7 @@ (define-public sbcl-rutils (revision "0")) (package (name "sbcl-rutils") - (version (git-version "5.2.1" revision commit)) + (version (make-git-version "5.2.1" revision commit)) (source (origin (method git-fetch) @@ -27146,7 +27146,7 @@ (define-public sbcl-s-base64 (revision "0")) (package (name "sbcl-s-base64") - (version (git-version "2" revision commit)) + (version (make-git-version "2" revision commit)) (source (origin (method git-fetch) @@ -27179,7 +27179,7 @@ (define-public sbcl-s-graphviz (revision "1")) (package (name "sbcl-s-graphviz") - (version (git-version "2.0" revision commit)) + (version (make-git-version "2.0" revision commit)) (source (origin (method git-fetch) @@ -27213,7 +27213,7 @@ (define-public sbcl-s-sysdeps (package (name "sbcl-s-sysdeps") (build-system asdf-build-system/sbcl) - (version (git-version "1" revision commit)) + (version (make-git-version "1" revision commit)) (home-page "https://github.com/svenvc/s-sysdeps") (source (origin @@ -27330,7 +27330,7 @@ (define-public sbcl-safe-read (revision "0")) (package (name "sbcl-safe-read") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -27392,7 +27392,7 @@ (define-public sbcl-sb-cga (let ((commit "9a554ea1c01cac998ff7eaa5f767bc5bcdc4c094")) (package (name "sbcl-sb-cga") - (version (git-version "1.0.1" "1" commit)) + (version (make-git-version "1.0.1" "1" commit)) (source (origin (method git-fetch) @@ -27426,7 +27426,7 @@ (define-public sbcl-schemeish (revision "2")) (package (name "sbcl-schemeish") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -27468,7 +27468,7 @@ (define-public sbcl-screamer (let ((commit "ce50614024de090b376107668da5e53232540ec7")) (package (name "sbcl-screamer") - (version (git-version "0.0.1" "1" commit)) + (version (make-git-version "0.0.1" "1" commit)) (source (origin (method git-fetch) @@ -27512,7 +27512,7 @@ (define-public sbcl-sdf (revision "1")) (package (name "sbcl-sdf") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -27553,7 +27553,7 @@ (define-public sbcl-sdl2 (revision "2")) (package (name "sbcl-sdl2") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -27599,7 +27599,7 @@ (define-public sbcl-sdl2-image (revision "1")) (package (name "sbcl-sdl2-image") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -27640,7 +27640,7 @@ (define-public sbcl-sdl2kit (let ((commit "aae663224a10ece2b0c374aa5942a3f0bc1b3c2f")) (package (name "sbcl-sdl2kit") - (version (git-version "0.0.0" "1" commit)) + (version (make-git-version "0.0.0" "1" commit)) (source (origin (method git-fetch) @@ -27675,7 +27675,7 @@ (define-public sbcl-sdl2-mixer (revision "1")) (package (name "sbcl-sdl2-mixer") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -27718,7 +27718,7 @@ (define-public sbcl-sdl2-ttf (revision "1")) (package (name "sbcl-sdl2-ttf") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -27770,7 +27770,7 @@ (define-public sbcl-sealable-metaobjects (let ((commit "e09ec97252e0844528f61abdc0c7ee256875f8ee")) (package (name "sbcl-sealable-metaobjects") - (version (git-version "0.0.0" "1" commit)) + (version (make-git-version "0.0.0" "1" commit)) (source (origin (method git-fetch) @@ -27805,7 +27805,7 @@ (define-public sbcl-secret-values (revision "0")) (package (name "sbcl-secret-values") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -27837,7 +27837,7 @@ (define-public sbcl-seedable-rng (revision "1")) (package (name "sbcl-seedable-rng") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -27869,7 +27869,7 @@ (define-public sbcl-select (revision "0")) (package (name "sbcl-select") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -27904,7 +27904,7 @@ (define-public sbcl-serapeum (revision "12")) (package (name "sbcl-serapeum") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (home-page "https://github.com/ruricolist/serapeum") (source (origin @@ -27959,7 +27959,7 @@ (define-public sbcl-series (revision "1")) (package (name "sbcl-series") - (version (git-version "2.2.11" revision commit)) + (version (make-git-version "2.2.11" revision commit)) (source (origin (method git-fetch) @@ -27997,7 +27997,7 @@ (define-public sbcl-sha1 (revision "0")) (package (name "sbcl-sha1") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (home-page "https://github.com/massung/sha1") (source (origin @@ -28030,7 +28030,7 @@ (define-public sbcl-shadow (revision "1")) (package (name "sbcl-shadow") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -28103,7 +28103,7 @@ (define-public sbcl-shasht (revision "2")) (package (name "sbcl-shasht") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -28139,7 +28139,7 @@ (define-public sbcl-shlex (revision "2")) (package (name "sbcl-shlex") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -28171,7 +28171,7 @@ (define-public sbcl-simple-date-time (revision "1")) (package (name "sbcl-simple-date-time") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -28200,7 +28200,7 @@ (define-public sbcl-simple-guess (revision "0")) (package (name "sbcl-simple-guess") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -28238,7 +28238,7 @@ (define-public sbcl-simple-inferiors (let ((commit "deac886354e03f8a9502ce96f12a0459ce3be671")) (package (name "sbcl-simple-inferiors") - (version (git-version "1.1.0" "1" commit)) + (version (make-git-version "1.1.0" "1" commit)) (source (origin (method git-fetch) @@ -28338,7 +28338,7 @@ (define-public sbcl-simple-parallel-tasks (revision "1")) (package (name "sbcl-simple-parallel-tasks") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -28370,7 +28370,7 @@ (define-public sbcl-simple-rgb (revision "1")) (package (name "sbcl-simple-rgb") - (version (git-version "0.01" revision commit)) + (version (make-git-version "0.01" revision commit)) (source (origin (method git-fetch) @@ -28403,7 +28403,7 @@ (define-public sbcl-simple-routes (revision "1")) (package (name "sbcl-simple-routes") - (version (git-version "0.3" revision commit)) + (version (make-git-version "0.3" revision commit)) (source (origin (method git-fetch) @@ -28435,7 +28435,7 @@ (define-public sbcl-simple-tasks (revision "1")) (package (name "sbcl-simple-tasks") - (version (git-version "1.3.0" revision commit)) + (version (make-git-version "1.3.0" revision commit)) (source (origin (method git-fetch) @@ -28464,7 +28464,7 @@ (define-public sbcl-simplified-types (revision "0")) (package (name "sbcl-simplified-types") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -28504,7 +28504,7 @@ (define-public sbcl-sketch (let ((commit "4cc00b08e202c7adda41391463096cf9df1705c3")) (package (name "sbcl-sketch") - (version (git-version "2017-11" "1" commit)) + (version (make-git-version "2017-11" "1" commit)) (source (origin (method git-fetch) @@ -28549,7 +28549,7 @@ (define-public sbcl-skippy (revision "0")) (package (name "sbcl-skippy") - (version (git-version "1.3.12" revision commit)) + (version (make-git-version "1.3.12" revision commit)) (source (origin (method git-fetch) @@ -28629,7 +28629,7 @@ (define-public sbcl-slite (revision "0")) (package (name "sbcl-slite") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -28676,7 +28676,7 @@ (define-public sbcl-slot-extra-options (let ((commit "29517d980325cd63744f1acf4cfe5c8ccec2b318")) (package (name "sbcl-slot-extra-options") - (version (git-version "1.1.1" "1" commit)) + (version (make-git-version "1.1.1" "1" commit)) (source (origin (method git-fetch) @@ -28719,7 +28719,7 @@ (define-public sbcl-micros (revision "2")) (package (name "sbcl-micros") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -28750,7 +28750,7 @@ (define-public sbcl-slynk (revision "9")) (package (name "sbcl-slynk") - (version (git-version "1.0.43" revision commit)) + (version (make-git-version "1.0.43" revision commit)) (source (origin (method git-fetch) @@ -28823,7 +28823,7 @@ (define-public sbcl-smart-buffer (revision "1")) (package (name "sbcl-smart-buffer") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -28859,7 +28859,7 @@ (define-public sbcl-smug (revision "0")) (package (name "sbcl-smug") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -28895,7 +28895,7 @@ (define-public sbcl-snakes (revision "0")) (package (name "sbcl-snakes") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -28932,7 +28932,7 @@ (define-public sbcl-spatial-trees (revision "1")) (package (name "sbcl-spatial-trees") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -28970,7 +28970,7 @@ (define-public sbcl-special-functions (revision "0")) (package (name "sbcl-special-functions") - (version (git-version "1.2.0" revision commit)) + (version (make-git-version "1.2.0" revision commit)) (source (origin (method git-fetch) @@ -29012,7 +29012,7 @@ (define-public sbcl-specialization-store (revision "1")) (package (name "sbcl-specialization-store") - (version (git-version "0.0.5" revision commit)) + (version (make-git-version "0.0.5" revision commit)) (source (origin (method git-fetch) @@ -29050,7 +29050,7 @@ (define-public sbcl-specialized-function (revision "3")) (package (name "sbcl-specialized-function") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -29090,7 +29090,7 @@ (define-public sbcl-speechless (revision "1")) (package (name "sbcl-speechless") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -29139,7 +29139,7 @@ (define-public sbcl-spinneret (let ((commit "d4398b5a344b5c59e497c9ee78fdbae7cc434f74")) (package (name "sbcl-spinneret") - (version (git-version "3.0" "6" commit)) + (version (make-git-version "3.0" "6" commit)) (source (origin (method git-fetch) @@ -29230,7 +29230,7 @@ (define-public sbcl-st-json (revision "0")) (package (name "sbcl-st-json") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -29266,7 +29266,7 @@ (define-public sbcl-staple (revision "1")) (package (name "sbcl-staple") - (version (git-version "2.0.0" revision commit)) + (version (make-git-version "2.0.0" revision commit)) (source (origin (method git-fetch) @@ -29393,7 +29393,7 @@ (define-public sbcl-statistics (revision "0")) (package (name "sbcl-statistics") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -29429,7 +29429,7 @@ (define-public sbcl-stdutils (revision "0")) (package (name "sbcl-stdutils") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -29462,7 +29462,7 @@ (define-public sbcl-stealth-mixin (revision "0")) (package (name "sbcl-stealth-mixin") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -29496,7 +29496,7 @@ (define-public sbcl-stmx (revision "3")) (package (name "sbcl-stmx") - (version (git-version "2.0.5" revision commit)) + (version (make-git-version "2.0.5" revision commit)) (source (origin (method git-fetch) @@ -29544,7 +29544,7 @@ (define-public sbcl-string-case (revision "0")) (package (name "sbcl-string-case") - (version (git-version "0.0.2" revision commit)) + (version (make-git-version "0.0.2" revision commit)) (home-page "https://github.com/pkhuong/string-case") (source (origin @@ -29577,7 +29577,7 @@ (define-public sbcl-string-pokemonize (revision "0")) (package (name "sbcl-string-pokemonize") - (version (git-version "20210503" revision commit)) + (version (make-git-version "20210503" revision commit)) (source (origin (method git-fetch) @@ -29612,7 +29612,7 @@ (define-public sbcl-stripe (revision "0")) (package (name "sbcl-stripe") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -29643,7 +29643,7 @@ (define-public sbcl-supertrace (let ((commit "66d22c3ff131ecd1c8048dfced1d62ed6024ecb0")) (package (name "sbcl-supertrace") - (version (git-version "0.1.0" "1" commit)) + (version (make-git-version "0.1.0" "1" commit)) (source (origin (method git-fetch) @@ -29709,7 +29709,7 @@ (define-public sbcl-sxql (revision "4")) (package (name "sbcl-sxql") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -29747,7 +29747,7 @@ (define-public sbcl-sxql-composer (revision "1")) (package (name "sbcl-sxql-composer") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -29817,7 +29817,7 @@ (define-public sbcl-symbol-munger (revision "2")) (package (name "sbcl-symbol-munger") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -29862,7 +29862,7 @@ (define-public sbcl-system-load (revision "0")) (package (name "sbcl-system-load") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -29890,7 +29890,7 @@ (define-public sbcl-system-locale (let ((commit "4b334bc2fa45651bcaa28ae7d9331095d6bf0a17")) (package (name "sbcl-system-locale") - (version (git-version "1.0.0" "1" commit)) + (version (make-git-version "1.0.0" "1" commit)) (source (origin (method git-fetch) @@ -29922,7 +29922,7 @@ (define-public sbcl-tailrec (revision "2")) (package (name "sbcl-tailrec") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -29954,7 +29954,7 @@ (define-public sbcl-tar (revision "0")) (package (name "sbcl-tar") - (version (git-version "0.2.3" revision commit)) + (version (make-git-version "0.2.3" revision commit)) (source (origin (method git-fetch) @@ -30002,7 +30002,7 @@ (define-public sbcl-tar-file (revision "0")) (package (name "sbcl-tar-file") - (version (git-version "0.2.1" revision commit)) + (version (make-git-version "0.2.1" revision commit)) (source (origin (method git-fetch) @@ -30051,7 +30051,7 @@ (define-public sbcl-terminal-keypress (revision "1")) (package (name "sbcl-terminal-keypress") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -30092,7 +30092,7 @@ (define-public sbcl-terminal-size (revision "1")) (package (name "sbcl-terminal-size") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -30125,7 +30125,7 @@ (define-public sbcl-terminfo (revision "1")) (package (name "sbcl-terminfo") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -30158,7 +30158,7 @@ (define-public sbcl-termp (revision "0")) (package (name "sbcl-termp") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -30191,7 +30191,7 @@ (define-public sbcl-terrable (revision "1")) (package (name "sbcl-terrable") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -30224,7 +30224,7 @@ (define-public sbcl-the-cost-of-nothing (revision "0")) (package (name "sbcl-the-cost-of-nothing") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -30267,7 +30267,7 @@ (define-public sbcl-tooter (revision "6")) (package (name "sbcl-tooter") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -30301,7 +30301,7 @@ (define-public sbcl-transmission (let ((commit "4bbf1d2761bfa5dfa79b7bc12c3238089b994d95")) (package (name "sbcl-transmission") - (version (git-version "0.1" "1" commit)) + (version (make-git-version "0.1" "1" commit)) (source (origin (method git-fetch) @@ -30336,7 +30336,7 @@ (define-public sbcl-trees (let ((commit "7b06048af0248c4302088c758208276f9faf2beb")) (package (name "sbcl-trees") - (version (git-version "0.11" "1" commit)) + (version (make-git-version "0.11" "1" commit)) (source (origin (method git-fetch) @@ -30426,7 +30426,7 @@ (define-public sbcl-trial (revision "2")) (package (name "sbcl-trial") - (version (git-version "1.2.0" revision commit)) + (version (make-git-version "1.2.0" revision commit)) (source (origin (method git-fetch) @@ -30542,7 +30542,7 @@ (define-public sbcl-tripod (revision "1")) (package (name "sbcl-tripod") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -30610,7 +30610,7 @@ (define-public sbcl-trivia.trivial (revision "0")) (package (name "sbcl-trivia.trivial") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -30697,7 +30697,7 @@ (define-public sbcl-trivial-adjust-simple-array (package (name "sbcl-trivial-adjust-simple-array") ;; It's currently at 0.0.1, but so is the other commits - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -30732,7 +30732,7 @@ (define-public sbcl-trivial-arguments (revision "1")) (package (name "sbcl-trivial-arguments") - (version (git-version "1.1.0" revision commit)) + (version (make-git-version "1.1.0" revision commit)) (source (origin (method git-fetch) @@ -30763,7 +30763,7 @@ (define-public sbcl-trivial-backtrace (revision "2")) (package (name "sbcl-trivial-backtrace") - (version (git-version "1.1.0" revision commit)) + (version (make-git-version "1.1.0" revision commit)) (source (origin (method git-fetch) @@ -30811,7 +30811,7 @@ (define-public sbcl-trivial-battery (revision "1")) (package (name "sbcl-trivial-battery") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -30841,7 +30841,7 @@ (define-public sbcl-trivial-benchmark (revision "2")) (package (name "sbcl-trivial-benchmark") - (version (git-version "2.0.0" revision commit)) + (version (make-git-version "2.0.0" revision commit)) (source (origin (method git-fetch) @@ -30878,7 +30878,7 @@ (define-public sbcl-trivial-channels (revision "1")) (package (name "sbcl-trivial-channels") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -30908,7 +30908,7 @@ (define-public sbcl-trivial-clipboard (revision "8")) (package (name "sbcl-trivial-clipboard") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -30959,7 +30959,7 @@ (define-public sbcl-trivial-cltl2 (package (name "sbcl-trivial-cltl2") (build-system asdf-build-system/sbcl) - (version (git-version "0.1.1" revision commit)) + (version (make-git-version "0.1.1" revision commit)) (home-page "https://github.com/Zulu-Inuoe/trivial-cltl2") (source (origin @@ -30988,7 +30988,7 @@ (define-public sbcl-trivial-custom-debugger (let ((commit "a560594a673bbcd88136af82086107ee5ff9ca81")) (package (name "sbcl-trivial-custom-debugger") - (version (git-version "1.0.0" "1" commit)) + (version (make-git-version "1.0.0" "1" commit)) (source (origin (method git-fetch) @@ -31028,7 +31028,7 @@ (define-public sbcl-trivial-do (let ((commit "03a1729f1e71bad3ebcf6cf098a0cce52dfa1163")) (package (name "sbcl-trivial-do") - (version (git-version "0.1" "1" commit)) + (version (make-git-version "0.1" "1" commit)) (source (origin (method git-fetch) @@ -31060,7 +31060,7 @@ (define-public sbcl-trivial-download (let ((commit "d2472061d86b1cf3d32f388daacd4e32a13af699")) (package (name "sbcl-trivial-download") - (version (git-version "0.3" "1" commit)) + (version (make-git-version "0.3" "1" commit)) (source (origin (method git-fetch) @@ -31090,7 +31090,7 @@ (define-public sbcl-trivial-escapes (let ((commit "1eca78da2078495d09893be58c28b3aa7b8cc4d1")) (package (name "sbcl-trivial-escapes") - (version (git-version "1.2.0" "1" commit)) + (version (make-git-version "1.2.0" "1" commit)) (source (origin (method git-fetch) @@ -31125,7 +31125,7 @@ (define-public sbcl-trivial-extensible-sequences (revision "0")) (package (name "sbcl-trivial-extensible-sequences") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -31195,7 +31195,7 @@ (define-public sbcl-trivial-file-size (revision "0")) (package (name "sbcl-trivial-file-size") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (home-page "https://github.com/ruricolist/trivial-file-size") (source (origin @@ -31233,7 +31233,7 @@ (define-public sbcl-trivial-garbage (revision "0")) (package (name "sbcl-trivial-garbage") - (version (git-version "0.21" revision commit)) + (version (make-git-version "0.21" revision commit)) (source (origin (method git-fetch) @@ -31267,7 +31267,7 @@ (define-public sbcl-trivial-gray-streams (commit "2b3823edbc78a450db4891fd2b566ca0316a7876")) (package (name "sbcl-trivial-gray-streams") - (version (git-version "2.0" revision commit)) + (version (make-git-version "2.0" revision commit)) (source (origin (method git-fetch) @@ -31301,7 +31301,7 @@ (define-public sbcl-trivial-indent (revision "1")) (package (name "sbcl-trivial-indent") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -31336,7 +31336,7 @@ (define-public sbcl-trivial-macroexpand-all (revision "0")) (package (name "sbcl-trivial-macroexpand-all") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (home-page "https://github.com/cbaggers/trivial-macroexpand-all") (source (origin @@ -31368,7 +31368,7 @@ (define-public sbcl-trivial-main-thread (revision "1")) (package (name "sbcl-trivial-main-thread") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -31400,7 +31400,7 @@ (define-public sbcl-trivial-mimes (revision "2")) (package (name "sbcl-trivial-mimes") - (version (git-version "1.1.0" revision commit)) + (version (make-git-version "1.1.0" revision commit)) (source (origin (method git-fetch) @@ -31433,7 +31433,7 @@ (define-public sbcl-trivial-monitored-thread (revision "0")) (package (name "sbcl-trivial-monitored-thread") - (version (git-version "0.3.11" revision commit)) + (version (make-git-version "0.3.11" revision commit)) (source (origin (method git-fetch) @@ -31466,7 +31466,7 @@ (define-public sbcl-trivial-octet-streams (revision "1")) (package (name "sbcl-trivial-octet-streams") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -31495,7 +31495,7 @@ (define-public sbcl-trivial-open-browser (revision "1")) (package (name "sbcl-trivial-open-browser") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -31561,7 +31561,7 @@ (define-public sbcl-trivial-raw-io (revision "1")) (package (name "sbcl-trivial-raw-io") - (version (git-version "0.0.2" revision commit)) + (version (make-git-version "0.0.2" revision commit)) (source (origin (method git-fetch) @@ -31593,7 +31593,7 @@ (define-public sbcl-trivial-rfc-1123 (revision "0")) (package (name "sbcl-trivial-rfc-1123") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -31622,7 +31622,7 @@ (define-public sbcl-trivial-shell (let ((commit "e02ec191b34b52deca5d1c4ee99d4fa13b8772e0")) (package (name "sbcl-trivial-shell") - (version (git-version "0.2.0" "1" commit)) + (version (make-git-version "0.2.0" "1" commit)) (source (origin (method git-fetch) @@ -31686,7 +31686,7 @@ (define-public sbcl-trivial-timeout (revision "2")) (package (name "sbcl-trivial-timeout") - (version (git-version "0.1.5" revision commit)) + (version (make-git-version "0.1.5" revision commit)) (source (origin (method git-fetch) @@ -31747,7 +31747,7 @@ (define-public sbcl-trivial-utf-8 (revision "2")) (package (name "sbcl-trivial-utf-8") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -31787,7 +31787,7 @@ (define-public sbcl-trivial-utilities (revision "0")) (package (name "sbcl-trivial-utilities") - (version (git-version "0.4.0" revision commit)) + (version (make-git-version "0.4.0" revision commit)) (source (origin (method git-fetch) @@ -31822,7 +31822,7 @@ (define-public sbcl-trivial-with-current-source-form (revision "1")) (package (name "sbcl-trivial-with-current-source-form") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -31861,7 +31861,7 @@ (define-public sbcl-trivial-ws (revision "0")) (package (name "sbcl-trivial-ws") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -31900,7 +31900,7 @@ (define-public sbcl-trivialib-type-unify (revision "1")) (package (name "sbcl-trivialib-type-unify") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -31940,7 +31940,7 @@ (define-public sbcl-trucler (revision "1")) (package (name "sbcl-trucler") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -31980,7 +31980,7 @@ (define-public sbcl-type-i (package (name "sbcl-type-i") (build-system asdf-build-system/sbcl) - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (home-page "https://github.com/guicho271828/type-i") (source (origin @@ -32019,7 +32019,7 @@ (define-public sbcl-type-r (revision "1")) (package (name "sbcl-type-r") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -32055,7 +32055,7 @@ (define-public sbcl-type-templates (revision "0")) (package (name "sbcl-type-templates") - (version (git-version "4.0.0" revision commit)) + (version (make-git-version "4.0.0" revision commit)) (source (origin (method git-fetch) @@ -32096,7 +32096,7 @@ (define-public sbcl-typo (revision "0")) (package (name "sbcl-typo") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -32132,7 +32132,7 @@ (define-public sbcl-uax-14 (revision "1")) (package (name "sbcl-uax-14") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -32215,7 +32215,7 @@ (define-public sbcl-ubiquitous (revision "1")) (package (name "sbcl-ubiquitous") - (version (git-version "2.0.0" revision commit)) + (version (make-git-version "2.0.0" revision commit)) (source (origin (method git-fetch) @@ -32251,7 +32251,7 @@ (define-public sbcl-ucons (revision "0")) (package (name "sbcl-ucons") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -32335,7 +32335,7 @@ (define-public sbcl-umbra (revision "1")) (package (name "sbcl-umbra") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -32366,7 +32366,7 @@ (define-public sbcl-unix-opts (revision "1")) (package (name "sbcl-unix-opts") - (version (git-version "0.1.7" revision commit)) + (version (make-git-version "0.1.7" revision commit)) (source (origin (method git-fetch) @@ -32488,7 +32488,7 @@ (define-public sbcl-utf8-input-stream (revision "0")) (package (name "sbcl-utf8-input-stream") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -32520,7 +32520,7 @@ (define-public sbcl-utils-kt (let ((commit "4adfe2889036ab5ffdd3cc2182ca2cc692bf11ff")) (package (name "sbcl-utils-kt") - (version (git-version "2007-12-02" "1" commit)) + (version (make-git-version "2007-12-02" "1" commit)) (source (origin (method git-fetch) @@ -32552,7 +32552,7 @@ (define-public sbcl-utm-ups (revision "0")) (package (name "sbcl-utm-ups") - (version (git-version "1.2" revision commit)) + (version (make-git-version "1.2" revision commit)) (source (origin (method git-fetch) @@ -32584,7 +32584,7 @@ (define-public sbcl-uuid (let ((commit "e7d6680c3138385c0708f7aaf0c96622eeb140e8")) (package (name "sbcl-uuid") - (version (git-version "2012.12.26" "1" commit)) + (version (make-git-version "2012.12.26" "1" commit)) (source (origin (method git-fetch) @@ -32616,7 +32616,7 @@ (define-public sbcl-varjo (revision "1")) (package (name "sbcl-varjo") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -32657,7 +32657,7 @@ (define-public sbcl-vas-string-metrics (revision "1")) (package (name "sbcl-vas-string-metrics") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -32702,7 +32702,7 @@ (define-public sbcl-verbose (revision "1")) (package (name "sbcl-verbose") - (version (git-version "2.0.0" revision commit)) + (version (make-git-version "2.0.0" revision commit)) (source (origin (method git-fetch) @@ -32734,7 +32734,7 @@ (define-public sbcl-vernacular (let ((commit "79be179e9ada423b3ec41d2a1ea6f6e0266ed21f")) (package (name "sbcl-vernacular") - (version (git-version "0.8.0" "1" commit)) + (version (make-git-version "0.8.0" "1" commit)) (source (origin (method git-fetch) @@ -32790,7 +32790,7 @@ (define-public sbcl-vgplot (revision "0")) (package (name "sbcl-vgplot") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -32824,7 +32824,7 @@ (define-public sbcl-colony (revision "0")) (package (name "sbcl-colony") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -32905,7 +32905,7 @@ (define-public sbcl-vom (revision "1")) (package (name "sbcl-vom") - (version (git-version "0.1.4" revision commit)) + (version (make-git-version "0.1.4" revision commit)) (source (origin (method git-fetch) @@ -32992,7 +32992,7 @@ (define-public sbcl-websocket-driver (revision "1")) (package (name "sbcl-websocket-driver") - (version (git-version "0.2.0" revision commit)) + (version (make-git-version "0.2.0" revision commit)) (home-page "https://github.com/fukamachi/websocket-driver") (source (origin @@ -33032,7 +33032,7 @@ (define-public sbcl-which (revision "1")) (package (name "sbcl-which") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -33065,7 +33065,7 @@ (define-public sbcl-wild-package-inferred-system (revision "0")) (package (name "sbcl-wild-package-inferred-system") - (version (git-version "0.2.0" revision commit)) + (version (make-git-version "0.2.0" revision commit)) (source (origin (method git-fetch) @@ -33096,7 +33096,7 @@ (define-public sbcl-with-user-abort (revision "0")) (package (name "sbcl-with-user-abort") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -33125,7 +33125,7 @@ (define-public sbcl-woo (revision "2")) (package (name "sbcl-woo") - (version (git-version "0.12.0" revision commit)) + (version (make-git-version "0.12.0" revision commit)) (source (origin (method git-fetch) @@ -33186,7 +33186,7 @@ (define-public sbcl-wordnet (revision "0")) (package (name "sbcl-wordnet") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -33219,7 +33219,7 @@ (define-public sbcl-wu-decimal (revision "0")) (package (name "sbcl-wu-decimal") - (version (git-version "2.0.0" revision commit)) + (version (make-git-version "2.0.0" revision commit)) (source (origin (method git-fetch) @@ -33257,7 +33257,7 @@ (define-public sbcl-xhtmlambda (version ;; The source repository doesn't provide any version nor revision, but ;; a timestamp - (git-version "2022-01-21" revision commit)) + (make-git-version "2022-01-21" revision commit)) (source (origin (method git-fetch) @@ -33290,7 +33290,7 @@ (define-public sbcl-xkbcommon (revision "0")) (package (name "sbcl-xkbcommon") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -33395,7 +33395,7 @@ (define-public sbcl-xpath (let ((commit "d364da693a534e23bd5eb3a85420e9c25e6c75b3")) (package (name "sbcl-xpath") - (version (git-version "0.1" "1" commit)) + (version (make-git-version "0.1" "1" commit)) (source (origin (method git-fetch) @@ -33426,7 +33426,7 @@ (define-public sbcl-xsubseq (revision "1")) (package (name "sbcl-xsubseq") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -33491,7 +33491,7 @@ (define-public sbcl-yxorp (revision "4")) (package (name "sbcl-yxorp") - (version (git-version "0.4" revision commit)) + (version (make-git-version "0.4" revision commit)) (source (origin (method git-fetch) @@ -33569,7 +33569,7 @@ (define-public sbcl-zip (revision "1")) (package (name "sbcl-zip") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -33602,7 +33602,7 @@ (define-public sbcl-zippy (revision "1")) (package (name "sbcl-zippy") - (version (git-version "1.1.0" revision commit)) + (version (make-git-version "1.1.0" revision commit)) (source (origin (method git-fetch) @@ -33738,7 +33738,7 @@ (define-public sbcl-zr-utils (revision "0")) (package (name "sbcl-zr-utils") - (version (git-version "0.0.0.0" revision commit)) + (version (make-git-version "0.0.0.0" revision commit)) (source (origin (method git-fetch) @@ -33817,7 +33817,7 @@ (define-public sbcl-zsort (revision "1")) (package (name "sbcl-zsort") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -33851,7 +33851,7 @@ (define-public sbcl-zstd (revision "1")) (package (name "sbcl-zstd") - (version (git-version "2.0" revision commit)) + (version (make-git-version "2.0" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index ee03ed5ee8a..51dcd151e5f 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -164,7 +164,7 @@ (define-public carp (revision "1")) (package (name "carp") - (version (git-version "0.5.5" revision commit)) + (version (make-git-version "0.5.5" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1279,7 +1279,7 @@ (define-public s7-bootstrap (hidden-package (package (name "s7-bootstrap") - (version (git-version "24.1" revision commit)) + (version (make-git-version "24.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1652,7 +1652,7 @@ (define man-for-txr (revision "41")) (package (name "man-for-txr") - (version (git-version "1.6g" revision commit)) + (version (make-git-version "1.6g" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm index ff438598147..53d48052f81 100644 --- a/gnu/packages/logging.scm +++ b/gnu/packages/logging.scm @@ -125,7 +125,7 @@ (define-public logmich (revision "0")) (package (name "logmich") - (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/lua.scm b/gnu/packages/lua.scm index 59598f20c55..ad480e0c5ca 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -180,7 +180,7 @@ (define-public luajit (commit "04dca7911ea255f37be799c18d74c305b921c1a6")) (package (name "luajit") - (version (git-version branch "0" commit)) + (version (make-git-version branch "0" commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/luanti.scm b/gnu/packages/luanti.scm index 246c174d452..43861b5dd38 100644 --- a/gnu/packages/luanti.scm +++ b/gnu/packages/luanti.scm @@ -190,7 +190,7 @@ (define-public minetest-game (revision "1")) (package (name "luanti-game") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -349,7 +349,7 @@ (define-public luanti-ethereal (revision "0")) (package (name "luanti-ethereal") - (version (git-version "1.29" revision commit)) + (version (make-git-version "1.29" revision commit)) (source (origin (method git-fetch) @@ -406,7 +406,7 @@ (define-public luanti-mesecons (revision "63")) (package (name "luanti-mesecons") - (version (git-version "1.2.1" revision commit)) + (version (make-git-version "1.2.1" revision commit)) (source (origin (method git-fetch) @@ -609,7 +609,7 @@ (define-public luanti-throwing (revision "0")) (package (name "luanti-throwing") - (version (git-version "1.1" revision commit)) + (version (make-git-version "1.1" revision commit)) (source (origin (method git-fetch) @@ -637,7 +637,7 @@ (define-public luanti-throwing-arrows (revision "0")) (package (name "luanti-throwing-arrows") - (version (git-version "1.1" revision commit)) + (version (make-git-version "1.1" revision commit)) (source (origin (method git-fetch) From patchwork Sat Jul 26 02:39:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43294 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 7D05627BC4B; Sat, 26 Jul 2025 03:50:48 +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 E6FAC27BC49 for ; Sat, 26 Jul 2025 03:50:46 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufUzc-0006ut-Ny; Fri, 25 Jul 2025 22:50:37 -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 1ufUx9-0004yI-NO for guix-patches@gnu.org; Fri, 25 Jul 2025 22:48:05 -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 1ufUx9-0006NE-DH for guix-patches@gnu.org; Fri, 25 Jul 2025 22:48:03 -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=vp4SGdAU4DUYTgorNDiISoMw+AgxEDf4XLGI7KX/330=; b=H5S8mYqHxUYmHOW7PmBMqZlzOE7W5UPamaZBE1jA0Ln9iR3uqylkZ4ohL19j2a+0Hs9fkB1YwqZtTWds3tYOJCq2YgZOU+b87UGKEp39tua+S8GtsNDW9OVt1Fhx6yf3IAD7xmriQDIS/Lncw61Nmja+HP1NqFLKTIjCq6A9Mj3gIBLwR/sabHq1+zF2o9rhuUM9WNtMFU0OZAgTaKE36eOLoOPupWRZnxoolJ2RVtMS46/6zANc9C+YYBxeidj6Qvs9f1Z5WKebZM5avn6Riczon43eEGNm085fCVWksMIuwCvnmoVDBUymfAlPyEaIAmL3ZvSYgrSMoAJMe07bcQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ufUx9-0008Pp-1z for guix-patches@gnu.org; Fri, 25 Jul 2025 22:48:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79099] [PATCH 22/34] gnu/packages/m*.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:03 +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.175349805832215 (code B ref 79099); Sat, 26 Jul 2025 02:48:03 +0000 Received: (at 79099) by debbugs.gnu.org; 26 Jul 2025 02:47:38 +0000 Received: from localhost ([127.0.0.1]:38220 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ufUwg-0008NL-Pj for submit@debbugs.gnu.org; Fri, 25 Jul 2025 22:47:38 -0400 Received: from 2.mo563.mail-out.ovh.net ([46.105.33.33]:37177) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ufUwb-0008Mt-CP for 79099@debbugs.gnu.org; Fri, 25 Jul 2025 22:47:32 -0400 Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net [79.137.60.37]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4bppr32sz6z6TSf; Sat, 26 Jul 2025 02:40:19 +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:19 +0000 (UTC) Received: from mta3.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.109.231.192]) by director4.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bppr31X6wz251V; Sat, 26 Jul 2025 02:40:19 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.7]) by mta3.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id D65FB94313E; Sat, 26 Jul 2025 02:40:18 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-104R0051bfdbe68-50f9-4ae8-9d2a-0ebe5d261245, 7BFD41D65738CBEA4850BE66907D66307393418F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sat, 26 Jul 2025 04:39:28 +0200 Message-ID: <20250726023951.11862-22-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: 4617034046039909090 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdekhedvfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvheelieffheetvdelhfffffejfefgudfhteekveehieetudeiudfgkeeutdehjeenucffohhmrghinhepghhithhhuhgsrdgtohhmnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgepvdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledtleelseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehieefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=vp4SGdAU4DUYTgorNDiISoMw+AgxEDf4XLGI7KX/330=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1753497619; v=1; b=rfeAniW/WoScq8Go5XvE+/NFjtnH6L8IcRm4qBon+S7EcOQV6ReQcJ/R6jfsMaKTl/hIPUZn pR5Su60BQHnZ2OoJaSDJUZqVDd0pUW7UXrWKxL6b9CmMWV+Uw2YCGztRHk/yYJqfcSMLD1olBRh D9V2UnPIZUpOeJ7Zs50cshCpG381zf6ybbgarsTUO4RPtDKaOkOJqTq10ZE8SF6xj30z7conqzw 9wz0ZZsPxInhmPm22Mr3BVAypCl4rU1mNvoqgOrqamyxdo/1A49zJQMcZQ+fuGN6uqK1wS7CmLd iaGSHoKSFTWJQovVgiCsfWIk9z5r7ju3ebsJDtvq8qDdg== 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 "m*.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/machine-learning.scm | 42 ++++++++++++------------- gnu/packages/mail.scm | 14 ++++----- gnu/packages/maths.scm | 40 ++++++++++++------------ gnu/packages/matrix.scm | 2 +- gnu/packages/messaging.scm | 11 ++++--- gnu/packages/monitoring.scm | 4 +-- gnu/packages/mp3.scm | 2 +- gnu/packages/multiprecision.scm | 2 +- gnu/packages/music.scm | 52 +++++++++++++++---------------- 9 files changed, 85 insertions(+), 84 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index d7ad9625ce8..1f11ac2a448 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -985,7 +985,7 @@ (define-public r-rcppml/devel (revision "2")) (package (name "r-rcppml-devel") - (version (git-version "0.5.6" revision commit)) + (version (make-git-version "0.5.6" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1078,7 +1078,7 @@ (define-public python-hopcroftkarp (revision "1")) (package (name "python-hopcroftkarp") - (version (git-version "1.2.5" revision commit)) + (version (make-git-version "1.2.5" revision commit)) (source (origin (method git-fetch) @@ -1821,7 +1821,7 @@ (define-public gemmlowp (revision "1")) (package (name "gemmlowp") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (home-page "https://github.com/google/gemmlowp") (source (origin (method git-fetch) @@ -2079,7 +2079,7 @@ (define-public python-scikit-learn-extra (revision "1")) (package (name "python-scikit-learn-extra") - (version (git-version "0.3.0" revision commit)) + (version (make-git-version "0.3.0" revision commit)) (source (origin (method git-fetch) @@ -2566,7 +2566,7 @@ (define-public python-torchdiffeq (revision "0")) (package (name "python-torchdiffeq") - (version (git-version "0.2.5" revision commit)) + (version (make-git-version "0.2.5" revision commit)) (source (origin (method git-fetch) @@ -2797,7 +2797,7 @@ (define-public kaldi (revision "2")) (package (name "kaldi") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -2915,7 +2915,7 @@ (define kaldi-for-vosk (package (inherit kaldi) (name "kaldi") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -3013,7 +3013,7 @@ (define-public gst-kaldi-nnet2-online (revision "3")) (package (name "gst-kaldi-nnet2-online") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -3084,7 +3084,7 @@ (define-public kaldi-gstreamer-server (revision "3")) (package (name "kaldi-gstreamer-server") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -3959,7 +3959,7 @@ (define-public dmlc-core-next (package (inherit dmlc-core) (name "dmlc-core") - (version (git-version "0.5" revision commit)) + (version (make-git-version "0.5" revision commit)) (source (origin (method git-fetch) @@ -4294,7 +4294,7 @@ (define-public gloo (revision "2")) (package (name "gloo") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -4425,7 +4425,7 @@ (define-public nnpack (revision "2")) (package (name "nnpack") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (home-page "https://github.com/Maratyszcza/NNPACK") (source (origin (method git-fetch) @@ -4469,7 +4469,7 @@ (define-public qnnpack (revision "0")) (package (name "qnnpack") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -4522,7 +4522,7 @@ (define-public xnnpack (revision "4")) (package (name "xnnpack") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (home-page "https://github.com/google/XNNPACK") ;fork of QNNPACK (source (origin @@ -4674,7 +4674,7 @@ (define-public xnnpack-for-r-torch (revision "2")) (package (inherit xnnpack) - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -4773,7 +4773,7 @@ (define-public tensorpipe (revision "0")) (package (name "tensorpipe") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -4809,7 +4809,7 @@ (define-public tvm (revision "1")) (package (name "tvm") - (version (git-version "0.20.dev0" revision commit)) + (version (make-git-version "0.20.dev0" revision commit)) (source (origin (method git-fetch) @@ -4898,7 +4898,7 @@ (define-public foxi (revision "0")) (package (name "foxi") - (version (git-version "1.4.1" revision commit)) + (version (make-git-version "1.4.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -5468,7 +5468,7 @@ (define-public python-pytorch-geometric (revision "0")) (package (name "python-pytorch-geometric") - (version (git-version "2.6.1" revision commit)) + (version (make-git-version "2.6.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -5718,7 +5718,7 @@ (define-public python-pytorch-lightning (revision "0")) (package (name "python-pytorch-lightning") - (version (git-version "2.5.2" revision commit)) + (version (make-git-version "2.5.2" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -6828,7 +6828,7 @@ (define-public nerd-dictation (revision "1")) (package (name "nerd-dictation") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 08c551d86a2..aa434b8b2a8 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -464,7 +464,7 @@ (define-public mairix (revision "0")) (package (name "mairix") - (version (git-version "0.24" revision commit)) + (version (make-git-version "0.24" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1115,7 +1115,7 @@ (define-public ripmime (revision "1")) (package (name "ripmime") - (version (git-version "1.4.0.10" revision commit)) + (version (make-git-version "1.4.0.10" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1232,7 +1232,7 @@ (define-public offlineimap3 (revision "0")) (package (name "offlineimap3") - (version (git-version "8.0.0" revision commit)) + (version (make-git-version "8.0.0" revision commit)) (source (origin (method git-fetch) @@ -1287,7 +1287,7 @@ (define-public emacs-mew (revision "1")) (package (name "emacs-mew") - (version (git-version "6.9" revision commit)) + (version (make-git-version "6.9" revision commit)) (source (origin (method git-fetch) @@ -1480,7 +1480,7 @@ (define-public notifymuch (revision "1")) (package (name "notifymuch") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) @@ -4457,7 +4457,7 @@ (define-public l2md (revision "2")) (package (name "l2md") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -5134,7 +5134,7 @@ (define-public sendgmail (revision "1")) (package (name "sendgmail") - (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/maths.scm b/gnu/packages/maths.scm index 5be65120279..50ee2108f9b 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -519,7 +519,7 @@ (define-public dozenal (commit "328bc03ad544179f2cccda36763358c4216f188e")) (package (name "dozenal") - (version (git-version "12010904-3" revision commit)) + (version (make-git-version "12010904-3" revision commit)) (source (origin (method git-fetch) @@ -2994,7 +2994,7 @@ (define-public python-cylp (define-public gecode (let* ((commit "f7f0d7c273d6844698f01cec8229ebe0b66a016a") - (version (git-version "6.2.0" "1" commit))) + (version (vc-version "6.2.0" "1" commit))) (package (name "gecode") (version version) @@ -3072,7 +3072,7 @@ (define-public libfixmath (revision "1")) (package (name "libfixmath") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -3170,7 +3170,7 @@ (define-public libflame (revision "0")) (package (name "libflame") - (version (git-version "5.2.0" revision commit)) + (version (make-git-version "5.2.0" revision commit)) (outputs '("out" "static")) (home-page "https://github.com/flame/libflame") (source (origin @@ -5484,7 +5484,7 @@ (define-public gklib (revision "1")) (package (name "gklib") - (version (git-version "5.1.1" revision commit)) + (version (make-git-version "5.1.1" revision commit)) (source (origin (method git-fetch) @@ -8378,7 +8378,7 @@ (define-public symfpu (revision "0")) (package (name "symfpu") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -8412,7 +8412,7 @@ (define-public symfpu Description: library for IEEE-754 floats~@ Cflags: -I${includedir}~%" (assoc-ref outputs "out") - #$version)))))))) + #$(package-version this-package))))))))) (synopsis "Concrete and symbolic implementation of IEEE-754 floating-point numbers") (description @@ -8683,7 +8683,7 @@ (define-public elemental (revision "0")) (package (name "elemental") - (version (git-version "0.87.7" revision commit)) + (version (make-git-version "0.87.7" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -8795,7 +8795,7 @@ (define-public tiny-bignum (let ((commit "1d7a1f9b8e77316187a6b3eae8e68d60a6f9a4d4")) (package (name "tiny-bignum") - (version (git-version "0" "0" commit)) + (version (make-git-version "0" "0" commit)) (source (origin (method git-fetch) @@ -9378,7 +9378,7 @@ (define-public dune-subgrid (let ((commit "e71cc9c2514356c7cd989f0c13661f10c37c58df")) (package (name "dune-subgrid") - (version (git-version "2.10.0" "1" commit)) + (version (make-git-version "2.10.0" "1" commit)) (source (origin (method git-fetch) @@ -9515,7 +9515,7 @@ (define-public dune-pdelab (let ((commit "d5dddb6b1c21b95e867ff53cca159ad676689f5c")) (package (name "dune-pdelab") - (version (git-version "2.8.0" "0" commit)) + (version (make-git-version "2.8.0" "0" commit)) (source (origin (method git-fetch) @@ -9891,7 +9891,7 @@ (define-public btor2tools (revision "2")) (package (name "btor2tools") - (version (git-version "1.0.0-pre" revision commit)) + (version (make-git-version "1.0.0-pre" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -9973,7 +9973,7 @@ (define-public libtaylor (revision "0")) (package (name "libtaylor") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -10137,7 +10137,7 @@ (define-public cadiback (package (name "cadiback") ;; Note: version taken from VERSION file - (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 @@ -10195,7 +10195,7 @@ (define cadiback-for-cryptominisat (package (inherit cadiback) (name "cadiback-for-cryptominisat") - (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 @@ -10223,7 +10223,7 @@ (define-public louvain-community (revision "2")) (package (name "louvain-community") - (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 @@ -10620,7 +10620,7 @@ (define-public fxdiv (revision "1")) (package (name "fxdiv") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (home-page "https://github.com/Maratyszcza/FXdiv") (source (origin (method git-fetch) @@ -10649,7 +10649,7 @@ (define-public fp16 (revision "1")) (package (name "fp16") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (home-page "https://github.com/Maratyszcza/FP16") (source (origin (method git-fetch) @@ -10698,7 +10698,7 @@ (define-public optizelle (let ((commit "ed4160b5287518448caeb34789d92dc6a0b7e2cc")) (package (name "optizelle") - (version (git-version "1.3.0" "0" commit)) + (version (make-git-version "1.3.0" "0" commit)) (source (origin (method git-fetch) @@ -11048,7 +11048,7 @@ (define-public ruy (revision "1")) (package (name "ruy") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/matrix.scm b/gnu/packages/matrix.scm index c8edaf5d5aa..0db44a1c6ea 100644 --- a/gnu/packages/matrix.scm +++ b/gnu/packages/matrix.scm @@ -314,7 +314,7 @@ (define-public pantalaimon (revision "0")) (package (name "pantalaimon") - (version (git-version "0.10.5" revision commit)) + (version (make-git-version "0.10.5" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 0ac125442f1..f46726545ad 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -769,7 +769,7 @@ (define-public bitlbee-discord (revision "1")) (package (name "bitlbee-discord") - (version (git-version "0.4.3" revision commit)) + (version (make-git-version "0.4.3" revision commit)) (source (origin (method git-fetch) @@ -813,7 +813,7 @@ (define-public purple-mattermost (revision "0")) (package (name "purple-mattermost") - (version (git-version "1.2" revision commit)) + (version (make-git-version "1.2" revision commit)) (home-page "https://github.com/EionRobb/purple-mattermost") (source (origin (method git-fetch) @@ -841,7 +841,8 @@ (define-public purple-mattermost "/share/pixmaps/pidgin/protocols\n"))) #t)))) #:make-flags (list "CC=gcc" - ,(string-append "PLUGIN_VERSION=" version)) + ,(string-append "PLUGIN_VERSION=" + (package-version this-package))) #:tests? #f)) (inputs (list glib json-glib discount pidgin)) (native-inputs (list pkg-config)) @@ -2721,7 +2722,7 @@ (define-public tdlib (revision "0")) (package (name "tdlib") - (version (git-version "1.8.45" revision commit)) + (version (make-git-version "1.8.45" revision commit)) (source (origin (method git-fetch) @@ -3017,7 +3018,7 @@ (define-public movim-desktop (package (name "movim-desktop") (version - (git-version "0.14.0" revision commit)) + (make-git-version "0.14.0" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index 66b1a761d9c..1494f7d33b4 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -472,7 +472,7 @@ (define-public graphite-web (revision "2")) (package (name "graphite-web") - (version (git-version "1.1.10" revision commit)) + (version (make-git-version "1.1.10" revision commit)) (source (origin (method git-fetch) @@ -695,7 +695,7 @@ (define-public temper-exporter (revision "0")) (package (name "temper-exporter") - (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/mp3.scm b/gnu/packages/mp3.scm index d2b97372d10..696db65476b 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -287,7 +287,7 @@ (define-public minimp3 (revision "0")) (package (name "minimp3") - (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/multiprecision.scm b/gnu/packages/multiprecision.scm index bafbc8b6c7c..fceb15d7fe5 100644 --- a/gnu/packages/multiprecision.scm +++ b/gnu/packages/multiprecision.scm @@ -166,7 +166,7 @@ (define-public mpfi (revision "1")) (package (name "mpfi") - (version (git-version "1.5.4" revision commit)) + (version (make-git-version "1.5.4" revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 680f8d488e8..56caaae3732 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -605,7 +605,7 @@ (define-public ctrlr (revision "1")) (package (name "ctrlr") - (version (git-version "5.5.9" revision commit)) + (version (make-git-version "5.5.9" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1260,7 +1260,7 @@ (define-public extempore (url "https://github.com/extemporelang/extempore-assets") (commit commit))) (file-name (git-file-name "extempore-assets" - (git-version version revision commit))) + (make-git-version version revision commit))) (sha256 (base32 "1pxmcbngd9qx8m71d5rfsmf4h31jnsnd3wjh8vb0rwskif22xz8l"))))) ("libffi" ,libffi) @@ -1275,7 +1275,7 @@ (define-public extempore (package (inherit stb-image) (name "stb-image-for-extempore") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1297,7 +1297,7 @@ (define-public extempore (package (inherit portmidi) (name "portmidi-for-extempore") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1897,7 +1897,7 @@ (define-public non-sequencer (revision "5")) (package (name "non-sequencer") - (version (git-version "1.9.5" revision commit)) + (version (make-git-version "1.9.5" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -2033,7 +2033,7 @@ (define-public tascam-gtk (revision "0")) (package (name "tascam-gtk") - (version (git-version "0.4" revision commit)) + (version (make-git-version "0.4" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -3251,7 +3251,7 @@ (define-public python-pyportmidi (revision "0")) (package (name "python-pyportmidi") - (version (git-version "0.0.7" revision commit)) + (version (make-git-version "0.0.7" revision commit)) (source (origin (method git-fetch) @@ -3282,7 +3282,7 @@ (define-public python-pysmf (revision "1")) (package (name "python-pysmf") - (version (git-version "0.1.1" revision commit)) + (version (make-git-version "0.1.1" revision commit)) (source (origin (method git-fetch) @@ -3892,7 +3892,7 @@ (define-public mod-host (revision "4")) (package (name "mod-host") - (version (git-version "0.10.6" revision commit)) + (version (make-git-version "0.10.6" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -4003,7 +4003,7 @@ (define-public curseradio (revision "1")) (package (name "curseradio") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -4254,7 +4254,7 @@ (define-public instantmusic (revision "1")) (package (name "instantmusic") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -4642,7 +4642,7 @@ (define-public mididings (revision "2")) (package (name "mididings") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -4749,7 +4749,7 @@ (define-public gx-vbass-preamp-lv2 (revision "3")) (package (inherit gx-guvnor-lv2) (name "gx-vbass-preamp-lv2") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -4867,7 +4867,7 @@ (define-public gx-saturator-lv2 (revision "4")) (package (inherit gx-vbass-preamp-lv2) (name "gx-saturator-lv2") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -5004,7 +5004,7 @@ (define-public rkrlv2 (revision "2")) (package (name "rkrlv2") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -5885,7 +5885,7 @@ (define-public luppp (commit "23da1497f80dbace48b7807afd3570c57a4d5994")) (package (name "luppp") - (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 @@ -5944,7 +5944,7 @@ (define-public sorcer (commit "94107b26e3e00e32504c8fb3fbf7572514d3b6bc")) (package (name "sorcer") - (version (git-version "1.1.3" revision commit)) + (version (make-git-version "1.1.3" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -6278,7 +6278,7 @@ (define-public demlo (revision "1")) (package (name "demlo") - (version (git-version "3.8" revision commit)) + (version (make-git-version "3.8" revision commit)) (source (origin (method git-fetch) @@ -6363,7 +6363,7 @@ (define-public go-github-com-wtolson-go-taglib (revision "0")) (package (name "go-github-com-wtolson-go-taglib") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -6405,7 +6405,7 @@ (define-public go-github-com-aarzilli-golua (revision "0")) (package (name "go-github-com-aarzilli-golua") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -6453,7 +6453,7 @@ (define-public go-github-com-stevedonovan-luar (revision "0")) (package (name "go-github-com-stevedonovan-luar") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -6496,7 +6496,7 @@ (define-public go-gitlab-com-ambrevar-golua-unicode (revision "0")) (package (name "go-gitlab-com-ambrevar-golua-unicode") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -7093,7 +7093,7 @@ (define-public distrho-ports (revision "0")) (package (name "distrho-ports") - (version (git-version "2021-03-15" revision commit)) + (version (make-git-version "2021-03-15" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -7737,7 +7737,7 @@ (define-public tap-lv2 (revision "1")) (package (name "tap-lv2") - (version (git-version "0.0" revision commit)) + (version (make-git-version "0.0" revision commit)) (source (origin (method git-fetch) @@ -7859,7 +7859,7 @@ (define-public shiru-lv2 (revision "1")) (package (name "shiru-lv2") - (version (git-version "0.0" revision commit)) + (version (make-git-version "0.0" revision commit)) (source (origin (method git-fetch) @@ -8155,7 +8155,7 @@ (define-public orca-music (package (name "orca-music") ;; No upstream version numbers; Using commit instead. - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference From patchwork Sat Jul 26 02:39:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43286 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 85F3427BC49; Sat, 26 Jul 2025 03:43:08 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C104F27BC4A for ; Sat, 26 Jul 2025 03:43:06 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufUr5-0000a3-9V; Fri, 25 Jul 2025 22:41:50 -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 1ufUqy-0000Ub-7V for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:40 -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 1ufUqx-0005TY-Ud for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:39 -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=MS10C3j3ICObLXG2wKoYsaEYOpgM4SxWyWyehpBi36c=; b=K8jgc2EQC0IGPc+5aUfmu/5uYvB5MClIiHf8DpC5vslLI5OMbNQlnci/mWoTvCj6VBK/KLkbHwJ4YIQxBcGuY4i3BVa9ODe1ucKhOd1fYV0lmJP8HgKgC4sO6Sc1eHQ/tNj887gFqlHK20CG0D2xt8g3vLvy0y+uu0cYTlfndLW7EuqNa5Ndq1AAZvFSAHtyn1F3tdGpVjeTZw2xJFPoL3jKuvVdIkvgEawuiGfSoQZlVATryieQPzD1Hp/5P7ddx9EUPtnu6XQ/2236uMzpCb2jlGhkpPQ84Zfm8qB1+QLy9Mg26lx/5OFq7iGorkSfutERyJWVld4dGLqNaqxDvw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ufUqx-0007wK-2i for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:39 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79099] [PATCH 23/34] gnu/packages/n*.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:39 +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.175349769630490 (code B ref 79099); Sat, 26 Jul 2025 02:41:39 +0000 Received: (at 79099) by debbugs.gnu.org; 26 Jul 2025 02:41:36 +0000 Received: from localhost ([127.0.0.1]:38157 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ufUqs-0007vV-0I for submit@debbugs.gnu.org; Fri, 25 Jul 2025 22:41:35 -0400 Received: from 4.mo562.mail-out.ovh.net ([46.105.38.146]:57371) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ufUpi-0007h7-4o for 79099@debbugs.gnu.org; Fri, 25 Jul 2025 22:40:46 -0400 Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net [51.68.80.175]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4bppr43CKBz1y4m; Sat, 26 Jul 2025 02:40:20 +0000 (UTC) Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net. [127.0.0.1]) by director1.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79099@debbugs.gnu.org>; Sat, 26 Jul 2025 02:40:20 +0000 (UTC) Received: from mta2.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.101.67]) by director1.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bppr4192bz5xTv; Sat, 26 Jul 2025 02:40:20 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.11]) by mta2.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id C41EE3E3062; Sat, 26 Jul 2025 02:40:19 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-99G003e3afffd6-dc55-4df2-989d-4ff047d4af38, 7BFD41D65738CBEA4850BE66907D66307393418F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sat, 26 Jul 2025 04:39:29 +0200 Message-ID: <20250726023951.11862-23-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: 4617315518513930978 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdekhedvfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeevueduteegteffleehkedukeegtdektdefheelhfefudeiledtudehtdfhveeufeenucffohhmrghinhepjhgrmhhirdhnvghtnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledtleelseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=MS10C3j3ICObLXG2wKoYsaEYOpgM4SxWyWyehpBi36c=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1753497620; v=1; b=U+aXRPoAMO40OXvuC/P82IzDVTHBenYchH1NdqPlB+MoCTOUPHKZRSvlAl0SH1IK94qmsv8K ON3Ebod3lvj6cs395oi8uL0fgO1sIB5jFxuqfsGzVFqotgH4Ya1m60Y4DI57gQVCqTobmiuK/Eu tbt24SDnJnHJzCZunoXW8aeCg32L1iHLy265xzcMzn/cj0LVLCG6HC6kK6jjwQ/cvG7SL2XbgW9 22IrxNDEfXnSqrvcR/EBRLROrHAA9YgruuG2vzcWoGOYbg0+xJ698qcTXYZ5tLd2IsO2RBd5l10 jPyDEBUhKkavC1wHVQQoG7+IQ8P6p5EEkQLre64AxiLSw== 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 "n*.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/networking.scm | 14 +++++++------- gnu/packages/node-xyz.scm | 4 ++-- gnu/packages/nutrition.scm | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 9dc4b24cd04..18d73c5f1b8 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -372,7 +372,7 @@ (define-public netperf (commit "3bc455b23f901dae377ca0a558e1e32aa56b31c4")) (package (name "netperf") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -633,7 +633,7 @@ (define-public rtmpdump (version "2.4")) ;as mentioned in README and man pages (package (name "rtmpdump") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) @@ -1564,7 +1564,7 @@ (define-public libnatpmp (revision "0")) (package (name "libnatpmp") - (version (git-version base-version revision commit)) + (version (make-git-version base-version revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -2065,7 +2065,7 @@ (define-public go-sctp (revision "3")) (package (name "go-sctp") - (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 @@ -2754,7 +2754,7 @@ (define-public enet-moonlight (package (inherit enet) (name "enet") - (version (git-version "1.3.17" revision commit)) + (version (make-git-version "1.3.17" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -4102,7 +4102,7 @@ (define-public dhtnet (name "dhtnet") ;; The base version is taken from the CMakeLists.txt file (see: ;; https://review.jami.net/plugins/gitiles/dhtnet/+/master/CMakeLists.txt#3). - (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 @@ -4217,7 +4217,7 @@ (define-public iwd (revision "1")) (package (name "iwd") - (version (git-version "3.8" revision commit)) + (version (make-git-version "3.8" revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index c3a2ac28ef9..309686ca6dd 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -788,7 +788,7 @@ (define-public node-oop (revision "1")) (package (name "node-oop") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -1530,7 +1530,7 @@ (define-public node-stack-trace (revision "1")) (package (name "node-stack-trace") - (version (git-version "0.0.10" revision commit)) + (version (make-git-version "0.0.10" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/nutrition.scm b/gnu/packages/nutrition.scm index 1cfce633b5c..b770223140c 100644 --- a/gnu/packages/nutrition.scm +++ b/gnu/packages/nutrition.scm @@ -89,7 +89,7 @@ (define-public gourmet (commit "8af29c8ded24528030e5ae2ea3461f61c1e5a575")) (package (name "gourmet") - (version (git-version "0.17.4" revision commit)) + (version (make-git-version "0.17.4" revision commit)) (source (origin (method git-fetch) From patchwork Sat Jul 26 02:39:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43293 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 D383C27BC4B; Sat, 26 Jul 2025 03:50:15 +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 BC73A27BC4A for ; Sat, 26 Jul 2025 03:50:14 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufUz2-0006Su-Qd; Fri, 25 Jul 2025 22:50:01 -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 1ufUx8-0004y5-QB for guix-patches@gnu.org; Fri, 25 Jul 2025 22:48:04 -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 1ufUx8-0006N6-GP for guix-patches@gnu.org; Fri, 25 Jul 2025 22:48:02 -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=oT0P6kZ0MjqIMVd55xV/PfiHh3g5Os96vjy1dmQ9Xq0=; b=JB8cPp16NvZ9r5TbYcTyHojeFYZNtx34JEb1cJaP6t6nhcan4+9psZA9/ABKoPdjLDtOYJNwXRST4ucyOkJllSMdUixAa4UrpJ7OUFrFA0yCCQ4FN8HfAr0Dnr1daluVbCpEmsiGdn3OxmPTPVul/6Tk1VQ+XGyKN7zzgkuRPsxQ5Wd7JD0znVY3KjFCzDSZ7SEXD+wv/U2IhuJhWl45pvmBUp5bsjZBg161qXhHSJ3Dxt0YmG7MCEgg7NFHmnOaG1KRcy0fbptNPrvL0ADDh8pTx09Sz3EEJbTKDVyrX3TW1iesuLfZPLNOWqmiCWsbhY+SmZboaHmM97tOTKkvqQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ufUx8-0008Pa-3f for guix-patches@gnu.org; Fri, 25 Jul 2025 22:48:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79099] [PATCH 24/34] gnu/packages/o*.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:01 +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.175349804532152 (code B ref 79099); Sat, 26 Jul 2025 02:48:01 +0000 Received: (at 79099) by debbugs.gnu.org; 26 Jul 2025 02:47:25 +0000 Received: from localhost ([127.0.0.1]:38216 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ufUwV-0008MT-E4 for submit@debbugs.gnu.org; Fri, 25 Jul 2025 22:47:24 -0400 Received: from 7.mo563.mail-out.ovh.net ([46.105.59.58]:52035) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ufUwK-0008Lr-LC for 79099@debbugs.gnu.org; Fri, 25 Jul 2025 22:47:20 -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 4bppr46yyzz5yHx; Sat, 26 Jul 2025 02:40:20 +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:20 +0000 (UTC) Received: from mta11.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.43.206]) by director2.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bppr464hkz1xrp; Sat, 26 Jul 2025 02:40:20 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.4]) by mta11.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 8E2ED9A3176; Sat, 26 Jul 2025 02:40:20 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-106R0066a1d22db-017d-4147-aa41-a006b3ad716e, 7BFD41D65738CBEA4850BE66907D66307393418F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sat, 26 Jul 2025 04:39:30 +0200 Message-ID: <20250726023951.11862-24-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: 4617315519998321378 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdekhedvfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvheelieffheetvdelhfffffejfefgudfhteekveehieetudeiudfgkeeutdehjeenucffohhmrghinhepghhithhhuhgsrdgtohhmnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgepvdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledtleelseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehieefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=oT0P6kZ0MjqIMVd55xV/PfiHh3g5Os96vjy1dmQ9Xq0=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1753497621; v=1; b=ZpsFn2f0fXmCzN68wLE+QtpVkgtbfEPmiRyO4ULajaHd2m0xctSPghGJZa8U27RIyfLrUsz4 zYX6TLC7Vlj8aJg/1A71LxM4nQi+ez5AM4mRRJTF3KoRnVfNGqRwKJuwJN4SKOnJoJNpcg2Mn+7 qEw3H0FS0lzND6+vJ31+Dgy1c35NbT4S1j17ZnVZ52wE10udxOB/Wpe2gnsxZ6bLCs3AErJf5LQ LupRXFUlaf1WOgZDBRqET9BsDTiY+JfWaaFaByxsaKwVHdilOHTOp/R26eNExir/C5goYCOS1ZM BVdr0MZMB/y1gWs80o/OaJ6vSL3EYyJYnuRepMr9Wq3wA== 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 "o*.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/ocaml.scm | 18 +++++++++--------- gnu/packages/ocr.scm | 2 +- gnu/packages/opencog.scm | 12 ++++++------ 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 88c9241e205..a0004b6c4b0 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -128,7 +128,7 @@ (define-public camlboot (revision "1")) (package (name "camlboot") - (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 @@ -2583,7 +2583,7 @@ (define-public ocaml-calendar (package (name "ocaml-calendar") ;; Makefile.in says 2.04. - (version (git-version "2.04" revision commit)) + (version (make-git-version "2.04" revision commit)) (source (origin (method git-fetch) @@ -2953,7 +2953,7 @@ (define-public ocaml-pyml (commit "e33f4c49cc97e7bc6f8e5faaa64cce994470642e")) (package (name "ocaml-pyml") - (version (git-version "20220905" revision commit)) + (version (make-git-version "20220905" revision commit)) (source (origin (method git-fetch) @@ -5380,7 +5380,7 @@ (define-public bap (commit "f995d28a4a34abb4cef8e0b3bd3c41cd710ccf1a")) (package (name "bap") - (version (git-version "2.6.0-alpha" revision commit)) + (version (make-git-version "2.6.0-alpha" revision commit)) (home-page "https://github.com/BinaryAnalysisPlatform/bap") (source (origin (method git-fetch) @@ -5495,7 +5495,7 @@ (define-public ocaml-charinfo-width (let ((commit "20aaaa6dca8f1e0b1ace55b6f2a8ba5e5910b620")) (package (name "ocaml-charinfo-width") - (version (git-version "1.1.0" "1" commit)) + (version (make-git-version "1.1.0" "1" commit)) (home-page "https://github.com/kandu/charinfo_width/") (source (origin (method git-fetch) @@ -5747,7 +5747,7 @@ (define-public ocaml5.0-ctypes (package (inherit ocaml-ctypes) (name "ocaml-ctypes") - (version (git-version "0.20.1" revision commit)) + (version (make-git-version "0.20.1" revision commit)) (home-page "https://github.com/ocamllabs/ocaml-ctypes") (arguments (append @@ -6544,7 +6544,7 @@ (define-public ocaml5.0-base (package (inherit ocaml-base) (name "ocaml-base") - (version (git-version "0.15.0" revision commit)) + (version (make-git-version "0.15.0" revision commit)) (source (origin (method git-fetch) @@ -6690,7 +6690,7 @@ (define-public ocaml-cinaps (revision "0")) (package (name "ocaml-cinaps") - (version (git-version "0.15.1" revision commit)) + (version (make-git-version "0.15.1" revision commit)) (home-page "https://github.com/ocaml-ppx/cinaps") (source (origin @@ -7477,7 +7477,7 @@ (define-public ocaml5.0-ppx-expect (package (inherit ocaml-ppx-expect) (name "ocaml-ppx-expect") - (version (git-version "0.15.0" revision commit)) + (version (make-git-version "0.15.0" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/ocr.scm b/gnu/packages/ocr.scm index adb71bcc37e..21fcdaefe63 100644 --- a/gnu/packages/ocr.scm +++ b/gnu/packages/ocr.scm @@ -238,7 +238,7 @@ (define-public zinnia (let* ((commit "581faa8f6f15e4a7b21964be3a5ec36265c80e5b") (revision "1") ;; version copied from 'configure.in' - (version (git-version "0.07" revision commit))) + (version (vc-version "0.07" revision commit))) (package (name "zinnia") (version version) diff --git a/gnu/packages/opencog.scm b/gnu/packages/opencog.scm index 998d9b47ae5..69b9556ea80 100644 --- a/gnu/packages/opencog.scm +++ b/gnu/packages/opencog.scm @@ -40,7 +40,7 @@ (define-public cogutil (revision "1")) (package (name "cogutil") - (version (git-version "2.0.3" revision commit)) + (version (make-git-version "2.0.3" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -72,7 +72,7 @@ (define-public atomspace (revision "1")) (package (name "atomspace") - (version (git-version "5.0.3" revision commit)) + (version (make-git-version "5.0.3" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -114,7 +114,7 @@ (define-public cogserver (revision "2")) (package (name "cogserver") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -152,7 +152,7 @@ (define-public attention (revision "1")) (package (name "attention") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -197,7 +197,7 @@ (define-public opencog (revision "1")) (package (name "opencog") - (version (git-version "0.1.4" revision commit)) + (version (make-git-version "0.1.4" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -248,7 +248,7 @@ (define-public agi-bio (revision "1")) (package (name "agi-bio") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference 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) From patchwork Sat Jul 26 02:39:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43278 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 141C327BC4B; Sat, 26 Jul 2025 03:42:50 +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 82C8827BC49 for ; Sat, 26 Jul 2025 03:42:49 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufUrc-0000kz-TL; Fri, 25 Jul 2025 22:42:22 -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 1ufUqz-0000Vq-55 for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:42 -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 1ufUqy-0005Te-Pz for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:40 -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=k3v7oHkpSa4CFc9Ix8R43pmt1mJeAgQKFexZUVzPdIU=; b=SaYahXwL6yRSqEsfU3w3ymb58c1SHqfwnmmcoHMdaKJHd4/7AhgIH6EMnE3w60o8HPX6KoxnCqmTJO4QsiEuBuZ5bNF9YWCl3kR6bBAKk1FQQPWM0Z6V5lW1+b3YEk89MRSCI5SkTL1WZQbrAc772lernC9v+GUVxWhQdgfCrCG4JitddfGI1poCHTUKBCwIAvyWGm1IP3Y46Uy1BEc7qjojdihsLkOGzriFw3p4NEUadIJX7zk4TmOYtTy4gjre3S8y3JuFaDFPeACexpGSIsZw4RiFiPGO/ZLY1uX/XJ0V4YulxplDV5wFdhv9YQhaf+Q2iT8lQkrpuATivFsopA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ufUqy-0007wU-C8 for guix-patches@gnu.org; Fri, 25 Jul 2025 22:41:40 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79099] [PATCH 26/34] gnu/packages/q*.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:40 +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.175349769730507 (code B ref 79099); Sat, 26 Jul 2025 02:41:40 +0000 Received: (at 79099) by debbugs.gnu.org; 26 Jul 2025 02:41:37 +0000 Received: from localhost ([127.0.0.1]:38160 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ufUqt-0007vp-QG for submit@debbugs.gnu.org; Fri, 25 Jul 2025 22:41:36 -0400 Received: from 6.mo562.mail-out.ovh.net ([46.105.48.43]:43441) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ufUpk-0007hq-7i for 79099@debbugs.gnu.org; Fri, 25 Jul 2025 22:40:47 -0400 Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net [79.137.60.36]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4bppr662lwz2byJ; Sat, 26 Jul 2025 02:40:22 +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:22 +0000 (UTC) Received: from mta7.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.54.159]) by director2.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bppr6560gz1xpf; Sat, 26 Jul 2025 02:40:22 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.6]) by mta7.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 646C4B8315C; Sat, 26 Jul 2025 02:40:22 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-101G0043162a275-dbfd-4fc1-9414-68ed1172cefe, 7BFD41D65738CBEA4850BE66907D66307393418F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sat, 26 Jul 2025 04:39:32 +0200 Message-ID: <20250726023951.11862-26-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: 4617878469912290018 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdekhedvfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelffejteeutefhfeekfffffedvudekjeekgfeludeitdfhkeevhfeivdfhffeggeenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggeenucevlhhushhtvghrufhiiigvpedvnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeeltdelleesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeivdgmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=k3v7oHkpSa4CFc9Ix8R43pmt1mJeAgQKFexZUVzPdIU=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1753497622; v=1; b=0XGYFkR0b/rPPRPoS0wvdWfOTGh6naydUeAkv5FsEuG0U6O19ngXsZ5yzP0wSbN8+d4i4Uks 4CY34VBoEhkW+o3ulQ21PB+8gbe8YP9EFXtCyf8bd+EDrn93lJw69DdVhZ3VbAoA0XGaaLbO7C6 mrtWVfiT2iaBV7SOEehnKharvDhEPWu3PLaR2gXzYkGV6UQe99EzbrOUHG6sXhUf9ZxbDhGc1BE cZyJ5vmlQwGDd40Sj3VWe4mVDcyK7o3UOuct5I3CHD6jJtXLZEYdu3MRNtmji/ooMrdvI7WGjrP Vr7CHJ4AmGg+qKNFbNeJGGj+NQB9voHQ2pd9sPYtYjblg== 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 "q*.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/qt.scm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 4e46a754fd8..cc1a3cc503a 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -191,7 +191,7 @@ (define-public qmdnsengine (revision "1")) (package (name "qmdnsengine") - (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 @@ -216,7 +216,7 @@ (define-public qite (revision "74")) (package (name "qite") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -405,7 +405,7 @@ (define-public materialdecoration (package (name "materialdecoration") (version - (git-version "1.1.0" revision commit)) + (make-git-version "1.1.0" revision commit)) (source (origin (method git-fetch) @@ -4016,7 +4016,7 @@ (define-public single-application-qt5 (revision "1")) (package (name "single-application-qt5") - (version (git-version "3.2.0" revision commit)) + (version (make-git-version "3.2.0" revision commit)) (source (origin (method git-fetch) @@ -4723,7 +4723,7 @@ (define-public qtimgui (revision "0")) (package (name "qtimgui") - (version (git-version "0.0" revision commit)) + (version (make-git-version "0.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -4843,7 +4843,7 @@ (define-public qtsolutions (revision "54")) (package (name "qtsolutions") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -5073,7 +5073,7 @@ (define-public qcodeeditor (revision "0")) (package (name "qcodeeditor") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -5194,7 +5194,7 @@ (define-public qtwidgetanimationframework (revision "0")) (package (name "qtwidgetanimationframework") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -5254,7 +5254,7 @@ (define-public qtcolorwidgets (revision "1")) (package (name "qtcolorwidgets") - (version (git-version "2.2.0" revision commit)) + (version (make-git-version "2.2.0" revision commit)) (source (origin (method git-fetch) @@ -5895,7 +5895,7 @@ (define-public kdsoap (revision "0")) (package (name "kdsoap") - (version (git-version "2.2.0" revision commit)) + (version (make-git-version "2.2.0" revision commit)) (source (origin (method git-fetch) @@ -6123,7 +6123,7 @@ (define-public signond-qt6 (package (inherit signond) (name "signond-qt6") - (version (git-version "8.61" revision commit)) + (version (make-git-version "8.61" revision commit)) (source (origin (method git-fetch) (uri (git-reference From patchwork Sat Jul 26 02:39:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43295 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 2EEE627BC4B; Sat, 26 Jul 2025 03:50:51 +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 1FF9427BC49 for ; Sat, 26 Jul 2025 03:50:50 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufUzp-00077G-B8; Fri, 25 Jul 2025 22:50:49 -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 1ufUxF-000517-Qi for guix-patches@gnu.org; Fri, 25 Jul 2025 22:48:16 -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 1ufUxE-0006Nm-23 for guix-patches@gnu.org; Fri, 25 Jul 2025 22:48:08 -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=avKG5l17oINVzwpneJ+TA8dwEHflIvUbIxctEPf/9Ww=; b=PtPpCk3JonAS1Pa0gUubwE64EP+6PTa3BSsu8TsjncHqeoJnw/WlaPxp3PUUID3MWQAp7z80B6Y9cmCMN3/mKQkix3yBX565iTr9dLGdRYlra3fpy3i55HzbuliF0G0gMVucf+X52S6bub15PegmVR7p9u7T38oke/rsn42hxYpRFC76PrFcYQrmAk7aDo/SNBHfe+pD2DnfFI0sK41klIa05jUBtvnkfDED1+Y+k7sBhBvvN4069NlROcU8ths3poJX5PxAm1c9pL1zgy+Zkzkxdl1/t1E7yqgmcnLE5bTth3su1W/DTqsvgXXPOD+ZHuWzUoaB6c/ZlyRl2sU9oA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ufUxD-0008Qt-Or for guix-patches@gnu.org; Fri, 25 Jul 2025 22:48:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79099] [PATCH 27/34] gnu/packages/r*.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: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.175349808432370 (code B ref 79099); Sat, 26 Jul 2025 02:48:07 +0000 Received: (at 79099) by debbugs.gnu.org; 26 Jul 2025 02:48:04 +0000 Received: from localhost ([127.0.0.1]:38241 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ufUx8-0008Pk-FX for submit@debbugs.gnu.org; Fri, 25 Jul 2025 22:48:04 -0400 Received: from 1.mo562.mail-out.ovh.net ([178.33.109.175]:54833) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ufUws-0008O1-5T for 79099@debbugs.gnu.org; Fri, 25 Jul 2025 22:47:56 -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 4bppr80QHCz20JY; Sat, 26 Jul 2025 02:40:24 +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:23 +0000 (UTC) Received: from mta10.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.164.115]) by director4.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bppr76LQFz251Q; Sat, 26 Jul 2025 02:40:23 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.9]) by mta10.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 6685F7831B2; Sat, 26 Jul 2025 02:40:23 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-99G003e217954d-ca86-46c5-bfdc-6e594d1119d8, 7BFD41D65738CBEA4850BE66907D66307393418F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sat, 26 Jul 2025 04:39:33 +0200 Message-ID: <20250726023951.11862-27-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: 4618159944365892322 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdekhedvfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvheelieffheetvdelhfffffejfefgudfhteekveehieetudeiudfgkeeutdehjeenucffohhmrghinhepghhithhhuhgsrdgtohhmnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgepvdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledtleelseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=avKG5l17oINVzwpneJ+TA8dwEHflIvUbIxctEPf/9Ww=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1753497624; v=1; b=B1BPdYGZuLKfts0scdGtXmB/7zZavePhjWW3/djpt7oyqvTaf/dhWr1gO7i6QWrzaG8u2whE bILdHRlsU1ZEoljL9De0lu44Q5RnTXTm0qVuRpDgTI79NZSTIAaN2CTz/qdiUEVVB82ilc7ysQF OiQknM1pDEgrYNwY+gDkHH/uDQubEnzff2sNVFMlnHzHKYWzK9s0xHjbc71+/r+b10FAYtQJAiT fQcugWipbJxuoz1IV3k1hL0n4MJFK/21NlnNwP6rhDE4uTTtiwcAPf0e+vYgqGSxfzQPpI9eMvD wotpZZnSEjTFWWfPQ/J7jChniSjEfCadEO1/S9A5+R/uA== 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 "r*.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/radio.scm | 40 +++++++++++++++++------------------ gnu/packages/raspberry-pi.scm | 8 +++---- gnu/packages/rdf.scm | 2 +- gnu/packages/robotics.scm | 4 ++-- gnu/packages/ruby-xyz.scm | 36 +++++++++++++++---------------- gnu/packages/rust.scm | 2 +- 6 files changed, 46 insertions(+), 46 deletions(-) diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 5e05dd1bcf4..4607aae3af7 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -135,7 +135,7 @@ (define-public libfec (revision "1")) (package (name "libfec") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) @@ -162,7 +162,7 @@ (define-public libcorrect (revision "1")) (package (name "libcorrect") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -389,7 +389,7 @@ (define-public airspy (revision "1")) (package (name "airspy") - (version (git-version "1.0.10" revision commit)) + (version (make-git-version "1.0.10" revision commit)) (source (origin (method git-fetch) @@ -440,7 +440,7 @@ (define-public airspyhf (revision "1")) (package (name "airspyhf") - (version (git-version "1.6.8" revision commit)) + (version (make-git-version "1.6.8" revision commit)) (source (origin (method git-fetch) @@ -567,7 +567,7 @@ (define-public soapyaudio (revision "0")) (package (name "soapyaudio") - (version (git-version "0.1.1" revision commit)) + (version (make-git-version "0.1.1" revision commit)) (source (origin (method git-fetch) @@ -618,7 +618,7 @@ (define-public soapybladerf (revision "1")) (package (name "soapybladerf") - (version (git-version "0.4.1" revision commit)) + (version (make-git-version "0.4.1" revision commit)) (source (origin (method git-fetch) @@ -643,7 +643,7 @@ (define-public soapyhackrf (revision "1")) (package (name "soapyhackrf") - (version (git-version "0.3.4" revision commit)) + (version (make-git-version "0.3.4" revision commit)) (source (origin (method git-fetch) @@ -669,7 +669,7 @@ (define-public soapymultisdr (revision "1")) (package (name "soapymultisdr") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -694,7 +694,7 @@ (define-public soapyremote (revision "1")) (package (name "soapyremote") - (version (git-version "0.5.2" revision commit)) + (version (make-git-version "0.5.2" revision commit)) (source (origin (method git-fetch) @@ -834,7 +834,7 @@ (define-public aptdec (revision "3")) (package (name "aptdec") - (version (git-version "1.7" revision commit)) + (version (make-git-version "1.7" revision commit)) (source (origin (method git-fetch) @@ -1166,7 +1166,7 @@ (define-public gr-dsd (revision "0")) (package (name "gr-dsd") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -1221,7 +1221,7 @@ (define-public gr-iqbal (revision "0")) (package (name "gr-iqbal") - (version (git-version "0.38.2" revision commit)) + (version (make-git-version "0.38.2" revision commit)) (source (origin (method git-fetch) @@ -2420,7 +2420,7 @@ (define-public ggmorse (revision "1")) (package (name "ggmorse") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -2535,7 +2535,7 @@ (define-public go-github-com-mesilliac-pulse-simple (revision "0")) (package (name "go-github-com-mesilliac-pulse-simple") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -2570,7 +2570,7 @@ (define-public go-github-com-akosmarton-papipes (revision "0")) (package (name "go-github-com-akosmarton-papipes") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -2839,7 +2839,7 @@ (define-public libdab (revision "1")) (package (name "libdab") - (version (git-version "0.8" revision commit)) + (version (make-git-version "0.8" revision commit)) (source (origin (method git-fetch) @@ -2870,7 +2870,7 @@ (define-public dsd (revision "1")) (package (name "dsd") - (version (git-version "1.7.0" revision commit)) + (version (make-git-version "1.7.0" revision commit)) (source (origin (method git-fetch) @@ -3052,7 +3052,7 @@ (define-public sdr++ (revision "1")) (package (name "sdr++") - (version (git-version "1.1.0" revision commit)) + (version (make-git-version "1.1.0" revision commit)) (source (origin (method git-fetch) @@ -3289,7 +3289,7 @@ (define-public rx-tools (revision "1")) (package (name "rx-tools") - (version (git-version "1.0.3" revision commit)) + (version (make-git-version "1.0.3" revision commit)) (source (origin (method git-fetch) @@ -3549,7 +3549,7 @@ (define-public chirp (revision "4")) (package (name "chirp") - (version (git-version "0.4.0" revision commit)) + (version (make-git-version "0.4.0" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/raspberry-pi.scm b/gnu/packages/raspberry-pi.scm index 8580628f20d..af711b794af 100644 --- a/gnu/packages/raspberry-pi.scm +++ b/gnu/packages/raspberry-pi.scm @@ -89,7 +89,7 @@ (define-public raspi-gpio (revision "1")) (package (name "raspi-gpio") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -384,7 +384,7 @@ (define-public raspberrypi-userland (commit "54fd97ae4066a10b6b02089bc769ceed328737e0")) (package (name "raspberrypi-userland") - (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 @@ -435,7 +435,7 @@ (define-public rpi-fbcp (commit "af8d32246c23cb23e4030e6588668a14341f5ddc")) (package (name "rpi-fbcp") - (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 @@ -551,7 +551,7 @@ (define-public waveshare-dtoverlays (revision "0")) (package (name "waveshare-dtoverlays") - (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/rdf.scm b/gnu/packages/rdf.scm index 869b0fc81fd..248e2f44b78 100644 --- a/gnu/packages/rdf.scm +++ b/gnu/packages/rdf.scm @@ -262,7 +262,7 @@ (define-public redland (revision "0")) (package (name "redland") - (version (git-version "1.0.17" revision commit)) + (version (make-git-version "1.0.17" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/robotics.scm b/gnu/packages/robotics.scm index e8f6e1dee69..80e9c750781 100644 --- a/gnu/packages/robotics.scm +++ b/gnu/packages/robotics.scm @@ -40,7 +40,7 @@ (define-public enki (revision "0")) (package (name "enki") - (version (git-version "2.0pre" revision commit)) + (version (make-git-version "2.0pre" revision commit)) (home-page "https://github.com/enki-community/enki/") (source (origin (method git-fetch) @@ -79,7 +79,7 @@ (define-public aseba (revision "0")) (package (name "aseba") - (version (git-version "1.6.0" revision commit)) + (version (make-git-version "1.6.0" revision commit)) (home-page "https://github.com/aseba-community/aseba") (source (origin (method git-fetch) diff --git a/gnu/packages/ruby-xyz.scm b/gnu/packages/ruby-xyz.scm index b893d444bdd..f9851a5c59c 100644 --- a/gnu/packages/ruby-xyz.scm +++ b/gnu/packages/ruby-xyz.scm @@ -690,7 +690,7 @@ (define-public ruby-rspec-stubbed-env (commit "9d767dec77a6d130f6ad83c48a00a5c81b14b9fa")) (package (name "ruby-rspec-stubbed-env") - (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 @@ -2102,7 +2102,7 @@ (define-public ruby-sporkmonger-rack-mount (commit "076aa2c47d9a4c081f1e9bcb56a826a9e72bd5c3")) (package (name "ruby-sporkmonger-rack-mount") - (version (git-version "0.8.3" revision commit)) + (version (make-git-version "0.8.3" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -3525,7 +3525,7 @@ (define-public ruby-hydra-minimal (revision "1")) (package (name "ruby-hydra-minimal") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (home-page "https://github.com/hyphenation/hydra") (source (origin (method git-fetch) @@ -3561,7 +3561,7 @@ (define-public ruby-hydra-minimal/pinned (hidden-package (package (inherit ruby-hydra-minimal) - (version (git-version "0.0" revision commit)) + (version (make-git-version "0.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -4103,7 +4103,7 @@ (define-public ruby-flores (revision "0")) (package (name "ruby-flores") - (version (git-version "0.0.8" revision commit)) + (version (make-git-version "0.0.8" revision commit)) (source (origin (method git-fetch) @@ -4583,7 +4583,7 @@ (define-public ruby-test-construct (revision "0")) (package (name "ruby-test-construct") - (version (git-version "2.0.2" revision commit)) + (version (make-git-version "2.0.2" revision commit)) (source (origin (method git-fetch) @@ -5474,7 +5474,7 @@ (define-public ruby-minitest-stub-const (revision "0")) (package (name "ruby-minitest-stub-const") - (version (git-version "0.6" revision commit)) ;for Rakefile + (version (make-git-version "0.6" revision commit)) ;for Rakefile (source (origin (method git-fetch) @@ -6873,7 +6873,7 @@ (define-public ruby-tzinfo (revision "0")) (package (name "ruby-tzinfo") - (version (git-version "2.0.6" revision commit)) + (version (make-git-version "2.0.6" revision commit)) (source (origin (method git-fetch) @@ -7203,7 +7203,7 @@ (define-public ruby-immutable-struct (revision "0")) (package (name "ruby-immutable-struct") - (version (git-version "2.4.1" revision commit)) + (version (make-git-version "2.4.1" revision commit)) (source (origin (method git-fetch) @@ -7807,7 +7807,7 @@ (define-public ruby-pg (revision "0")) (package (name "ruby-pg") - (version (git-version "1.5.9" revision commit)) + (version (make-git-version "1.5.9" revision commit)) (home-page "https://github.com/ged/ruby-pg") (source (origin @@ -9138,7 +9138,7 @@ (define-public ruby-stackprof (revision "0")) (package (name "ruby-stackprof") - (version (git-version "0.2.27" revision commit)) + (version (make-git-version "0.2.27" revision commit)) (source (origin (method git-fetch) @@ -9320,7 +9320,7 @@ (define-public ruby-vcr-expat (commit-dont-touch "842b2bf89099dc91f2c643d0d85d1abd54eb7e85")) ; (package (name "ruby-vcr-expat") - (version (git-version "5.0.0" revision commit-dont-touch)) + (version (make-git-version "5.0.0" revision commit-dont-touch)) (source (origin (method git-fetch) (uri (git-reference @@ -12554,7 +12554,7 @@ (define-public ruby-terminfo (revision "0")) (package (name "ruby-terminfo") - (version (git-version "0.2" revision commit)) + (version (make-git-version "0.2" revision commit)) (source (origin (method git-fetch) @@ -13009,7 +13009,7 @@ (define-public ruby-pdf-inspector (commit "00ee4c92ff917118785ebec188e81effc968abeb")) (package (name "ruby-pdf-inspector") - (version (git-version "1.3.0" revision commit)) + (version (make-git-version "1.3.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -13362,7 +13362,7 @@ (define-public ruby-hashie (revision "0")) (package (name "ruby-hashie") - (version (git-version "5.0.0" revision commit)) + (version (make-git-version "5.0.0" revision commit)) (source (origin (method git-fetch) ;for tests (uri (git-reference @@ -13469,7 +13469,7 @@ (define-public ruby-yaml-lint (revision "0")) (package (name "ruby-yaml-lint") - (version (git-version "0.1.2" revision commit)) + (version (make-git-version "0.1.2" revision commit)) (source (origin (method git-fetch) @@ -15066,7 +15066,7 @@ (define-public ruby-rugged (revision "0")) (package (name "ruby-rugged") - (version (git-version "1.6.2" revision commit)) + (version (make-git-version "1.6.2" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -15995,7 +15995,7 @@ (define-public ruby-websocket (revision "1")) (package (name "ruby-websocket") - (version (git-version "1.2.9" revision commit)) + (version (make-git-version "1.2.9" revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index abaf7166fd5..9244b2c648d 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -139,7 +139,7 @@ (define %mrustc-source (uri (git-reference (url "https://github.com/thepowersgang/mrustc") (commit %mrustc-commit))) - (file-name (git-file-name name (git-version version revision commit))) + (file-name (git-file-name name (make-git-version version revision commit))) (sha256 (base32 "1yyjfl1z6d5r9sv7zl90kqyjw1lqd2cqzwh2syi7yvrpslhihrhy")) (patches (search-patches "mrustc-patches.patch")) From patchwork Sat Jul 26 02:39:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43299 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 783DF27BC49; Sat, 26 Jul 2025 03:51:28 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0EA3027BC4A for ; Sat, 26 Jul 2025 03:51:27 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufV0J-0007PA-Gg; Fri, 25 Jul 2025 22:51:19 -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 1ufUxF-00051A-RU for guix-patches@gnu.org; Fri, 25 Jul 2025 22:48:16 -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 1ufUxD-0006Nl-70 for guix-patches@gnu.org; Fri, 25 Jul 2025 22:48:08 -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=R7sar7sMPoJmPtDvGtjOqKI+pxUOd/rv9MAhN5AkykQ=; b=NHocPIO/ljZNpDg4u6yniBcY4EzMt3rn31J5HgTaq6s7ExwLM6CP/K5lTOJx7fpLFvfIkjxK8c9nMvBcBoy0SQeAVQXqMcAvBISS/GlAMyjsgzMGlbEUbQVpdLCSXavOejrgu3J1kOGYq1zc74VDHry401sG8cqaHlSxbMjDG//cQHKJ1HZvr72GQ3+HBMA4XHshvvwEsnuwQRr16xzGjs7Sa07L8ENlXZwQYOMKSoHJLu1OtqAxzaAY/3H5bc8GhHkET/cTMbN3TJKRcAnujFadJwxTiOOm3AlmcU/c7wcHKmI8w4A07gnClV0PceIg/+4XJuKVx9G+DN1n0ObqSg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ufUxC-0008Qb-EQ for guix-patches@gnu.org; Fri, 25 Jul 2025 22:48:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79099] [PATCH 28/34] gnu/packages/s*.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:06 +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.175349808232346 (code B ref 79099); Sat, 26 Jul 2025 02:48:06 +0000 Received: (at 79099) by debbugs.gnu.org; 26 Jul 2025 02:48:02 +0000 Received: from localhost ([127.0.0.1]:38238 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ufUx6-0008PR-Ry for submit@debbugs.gnu.org; Fri, 25 Jul 2025 22:48:02 -0400 Received: from 2.mo562.mail-out.ovh.net ([178.33.252.217]:41411) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ufUwr-0008O0-T6 for 79099@debbugs.gnu.org; Fri, 25 Jul 2025 22:47:53 -0400 Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net [51.68.80.175]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4bppr91y4Pz2c1s; Sat, 26 Jul 2025 02:40:25 +0000 (UTC) Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net. [127.0.0.1]) by director1.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79099@debbugs.gnu.org>; Sat, 26 Jul 2025 02:40:25 +0000 (UTC) Received: from mta10.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.188.114]) by director1.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bppr87556z5wHs; Sat, 26 Jul 2025 02:40:24 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.11]) by mta10.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 942F0783168; Sat, 26 Jul 2025 02:40:24 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-99G003f68f868b-555b-4a2a-a00e-a7860fca77d7, 7BFD41D65738CBEA4850BE66907D66307393418F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sat, 26 Jul 2025 04:39:34 +0200 Message-ID: <20250726023951.11862-28-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: 4618722895543919330 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdekhedvfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeefkeejgffgteeffeekieeiheevffffleejiedttdevffetvddvjeevhefhvdetvdenucffohhmrghinheptghouggvsggvrhhgrdhorhhgpdhgihhthhhusgdrtghomhenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeeltdelleesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeivdgmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=R7sar7sMPoJmPtDvGtjOqKI+pxUOd/rv9MAhN5AkykQ=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1753497625; v=1; b=wB2ckAk17wmsSplp51Ij8iuaW8Ivy6W2LHSiDW+hWcvkXlNQ0KSc4Tan2ezXqGXgf3McClg3 Fst1UYRxtYHbhRqBSJ2h26fgiRWXzWEODaXKGmBcxOPIoWsTBlgv92pQEXJsEUsdbftjTeaG6Ge BRcEwScWHoFWjLCTA3grbhLFSInnL+RjjIHxUPy3ia4FYwNBLonL05t0TFf5bzHy8fR3kxRidGP uaEjbOQ4HDQLwc7etxM1F4uleDSRPtF1fGLqzasro1GKdSaqFhgJ+W517yaQr0a4jyf3jBER4Sl iRTFFw1q53iSBTjzi6oT877B87hOe1Zr3Ay4XvAasm6FQ== 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 "s*.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/scanner.scm | 2 +- gnu/packages/scheme.scm | 10 +++++----- gnu/packages/sdl.scm | 2 +- gnu/packages/search.scm | 2 +- gnu/packages/serialization.scm | 4 ++-- gnu/packages/shells.scm | 4 ++-- gnu/packages/shellutils.scm | 4 ++-- gnu/packages/specifications.scm | 10 +++++----- gnu/packages/ssh.scm | 8 +++++--- gnu/packages/statistics.scm | 18 +++++++++--------- gnu/packages/stb.scm | 2 +- gnu/packages/suckless.scm | 14 +++++++------- gnu/packages/sugar.scm | 30 +++++++++++++++--------------- gnu/packages/sync.scm | 4 ++-- gnu/packages/syncthing.scm | 2 +- gnu/packages/syndication.scm | 2 +- 16 files changed, 60 insertions(+), 58 deletions(-) diff --git a/gnu/packages/scanner.scm b/gnu/packages/scanner.scm index 259e378b658..fa7b44ee265 100644 --- a/gnu/packages/scanner.scm +++ b/gnu/packages/scanner.scm @@ -257,7 +257,7 @@ (define-public utsushi (let ((commit "839d06a5a80b353cb604eb9f7d352a1648ab1fdf")) (package (name "utsushi") - (version (git-version "0.65.0" "1" commit)) + (version (make-git-version "0.65.0" "1" commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 81b948f8cf4..89db0454971 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -644,7 +644,7 @@ (define-public unsyntax (revision "0")) (package (name "unsyntax") - (version (git-version "0.0.3" revision commit)) + (version (make-git-version "0.0.3" revision commit)) (source (origin (method git-fetch) @@ -676,7 +676,7 @@ (define-public unsyntax ;; Tell git-version-gen the correct version number. (call-with-output-file ".tarball-version" (lambda (port) - (display #$version port))))) + (display #$(package-version this-package) port))))) (add-before 'configure 'patch-exec-paths (lambda _ ;; Fix hard-coded references to chibi-scheme, using the @@ -706,7 +706,7 @@ (define-public sicp (revision "3")) (package (name "sicp") - (version (git-version "20180718" revision commit)) + (version (make-git-version "20180718" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1229,7 +1229,7 @@ (define-public sbcl-airship-scheme (revision "0")) (package (name "sbcl-airship-scheme") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -1510,7 +1510,7 @@ (define-public r7rs-small-texinfo (revision "3")) (package (name "r7rs-small-texinfo") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (home-page "https://codeberg.org/Zipheir/r7rs-small-texinfo/") (source (origin diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 9b5b8c9a105..07a087a9cbe 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -776,7 +776,7 @@ (define-public sdl2-gamecontrollerdb (revision "2")) (package (name "sdl2-gamecontrollerdb") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm index c0e3654fd8f..6e433a39eaa 100644 --- a/gnu/packages/search.scm +++ b/gnu/packages/search.scm @@ -302,7 +302,7 @@ (define-public dataparksearch (revision "0")) (package (name "dataparksearch") - (version (git-version "4.54" revision commit)) + (version (make-git-version "4.54" revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 89d362c52f3..20b0cd479c0 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -668,7 +668,7 @@ (define-public json.sh (revision "1")) (package (name "json.sh") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -1055,7 +1055,7 @@ (define-public libnop (revision "0")) (package (name "libnop") - (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/shells.scm b/gnu/packages/shells.scm index 84e19254ad9..594d2d4a882 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -658,7 +658,7 @@ (define-public scsh (revision "0")) (package (name "scsh") - (version (git-version "0.7" revision commit)) + (version (make-git-version "0.7" revision commit)) (source (origin (method git-fetch) @@ -755,7 +755,7 @@ (define-public s-shell (revision "2")) (package (name "s-shell") - (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/shellutils.scm b/gnu/packages/shellutils.scm index 4d611e7d969..97682e36ef5 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -729,7 +729,7 @@ (define-public tran (package (name "tran") ;; The latest upstream version seems to be "v5". - (version (git-version "5.0.0" revision commit)) + (version (make-git-version "5.0.0" revision commit)) (source (origin (method git-fetch) @@ -911,7 +911,7 @@ (define-public shell-functools (revision "0")) (package (name "shell-functools") - (version (git-version "0.3.0" revision commit)) + (version (make-git-version "0.3.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/specifications.scm b/gnu/packages/specifications.scm index d0f121fb56c..89fc62ec047 100644 --- a/gnu/packages/specifications.scm +++ b/gnu/packages/specifications.scm @@ -59,7 +59,7 @@ (define-public specification-ipld (revision "0")) (package (name "specification-ipld") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -89,7 +89,7 @@ (define-public specification-multibase (revision "1")) (package (name "specification-multibase") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -116,7 +116,7 @@ (define-public specification-multicodec (revision "0")) (package (name "specification-multicodec") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -144,7 +144,7 @@ (define-public specification-multihash (revision "0")) (package (name "specification-multihash") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -208,7 +208,7 @@ (define-public specification-specreduce-data (revision "0")) (package (name "specification-specreduce-data") - (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/ssh.scm b/gnu/packages/ssh.scm index 1fecee078f7..1386fcfa559 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -447,7 +447,7 @@ (define-public corkscrew (commit "268b71e88ee51fddceab96d665b327394f1feb12")) (package (name "corkscrew") - (version (git-version "2.0" revision commit)) + (version (make-git-version "2.0" revision commit)) (source (origin (method git-fetch) @@ -467,7 +467,8 @@ (define-public corkscrew (lambda _ (substitute* "configure.ac" ;; Our version differs significantly. - (("2.0") (string-append ,version " (Guix)"))) + (("2.0") + (string-append ,(package-version this-package) " (Guix)"))) (substitute* "corkscrew.c" ;; This domain's since been squat. (("\\(agroman@agroman\\.net\\)") @@ -475,7 +476,8 @@ (define-public corkscrew (add-after 'install 'install-documentation (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (doc (string-append out "/share/doc/" ,name "-" ,version))) + (doc (string-append out "/share/doc/" ,name "-" + ,(package-version this-package)))) (install-file "README.md" doc) #t)))))) (native-inputs diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index a8cfd9104af..9eaf1a52fa9 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2648,7 +2648,7 @@ (define-public r-tgconfig (revision "1")) (package (name "r-tgconfig") - (version (git-version "0.1.2" revision commit)) + (version (make-git-version "0.1.2" revision commit)) (source (origin (method git-fetch) @@ -2680,7 +2680,7 @@ (define-public r-tgutil (revision "1")) (package (name "r-tgutil") - (version (git-version "0.1.15" revision commit)) + (version (make-git-version "0.1.15" revision commit)) (source (origin (method git-fetch) @@ -2720,7 +2720,7 @@ (define-public r-catterplots (revision "3")) (package (name "r-catterplots") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -2744,7 +2744,7 @@ (define-public r-nnlm (revision "1")) (package (name "r-nnlm") - (version (git-version "0.4.4" revision commit)) + (version (make-git-version "0.4.4" revision commit)) (source (origin (method git-fetch) @@ -2775,7 +2775,7 @@ (define-public r-swne (revision "1")) (package (name "r-swne") - (version (git-version "0.6.20" revision commit)) + (version (make-git-version "0.6.20" revision commit)) (source (origin (method git-fetch) @@ -2829,7 +2829,7 @@ (define-public r-languageserver (revision "1")) (package (name "r-languageserver") - (version (git-version "0.3.12" revision commit)) + (version (make-git-version "0.3.12" revision commit)) (source (origin (method git-fetch) @@ -3252,7 +3252,7 @@ (define-public xlispstat (revision "0")) (package (name "xlispstat") - (version (git-version "3.52.23" revision commit)) + (version (make-git-version "3.52.23" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -3364,7 +3364,7 @@ (define-public r-mixedpower (revision "2")) (package (name "r-mixedpower") - (version (git-version "2.0" revision commit)) + (version (make-git-version "2.0" revision commit)) (source (origin ;; Not available on CRAN. @@ -3395,7 +3395,7 @@ (define-public r-colorway (revision "1")) (package (name "r-colorway") - (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/stb.scm b/gnu/packages/stb.scm index f3be6a56ec4..7b83692a018 100644 --- a/gnu/packages/stb.scm +++ b/gnu/packages/stb.scm @@ -34,7 +34,7 @@ (define stb (package (name "stb") (home-page "https://github.com/nothings/stb") - (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/suckless.scm b/gnu/packages/suckless.scm index 416f7cbbe1d..1fb1d53c0f7 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -144,7 +144,7 @@ (define-public slstatus (revision "0")) (package (name "slstatus") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -942,7 +942,7 @@ (define-public libutf (commit "ff4c60635e1f455b0a0b4200f8183fbd5a88225b")) (package (name "libutf") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -989,7 +989,7 @@ (define-public lchat (commit "e3b64e67b9b9d832462382246474ce1e7d92217c")) (package (name "lchat") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -1068,7 +1068,7 @@ (define-public sbase (revision "0")) (package (name "sbase") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -1195,7 +1195,7 @@ (define-public farbfeld (let ((commit "ab5e3dfc9cdb476218538c6687df9f44826d8f11") (revision "0")) (package (name "farbfeld") - (version (git-version "4" revision commit)) + (version (make-git-version "4" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1236,7 +1236,7 @@ (define-public snafu (revision "0")) (package (name "snafu") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -1300,7 +1300,7 @@ (define-public lib9 (revision "0")) (package (name "lib9") - (version (git-version "7" revision commit)) + (version (make-git-version "7" revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/sugar.scm b/gnu/packages/sugar.scm index c95f645212a..0c159244802 100644 --- a/gnu/packages/sugar.scm +++ b/gnu/packages/sugar.scm @@ -413,7 +413,7 @@ (define-public sugar-block-party-activity (revision "1")) (package (name "sugar-block-party-activity") - (version (git-version "12" revision commit)) + (version (make-git-version "12" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -513,7 +513,7 @@ (define-public sugar-cellgame-activity (revision "1")) (package (name "sugar-cellgame-activity") - (version (git-version "5" revision commit)) + (version (make-git-version "5" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -573,7 +573,7 @@ (define-public sugar-chat-activity (revision "1")) (package (name "sugar-chat-activity") - (version (git-version "86" revision commit)) + (version (make-git-version "86" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -623,7 +623,7 @@ (define-public sugar-classify-cats-activity (revision "1")) (package (name "sugar-classify-cats-activity") - (version (git-version "2" revision commit)) + (version (make-git-version "2" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -670,7 +670,7 @@ (define-public sugar-commander-activity (revision "1")) (package (name "sugar-commander-activity") - (version (git-version "11" revision commit)) + (version (make-git-version "11" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -736,7 +736,7 @@ (define-public sugar-help-activity (revision "1")) (package (name "sugar-help-activity") - (version (git-version "20" revision commit)) + (version (make-git-version "20" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -785,7 +785,7 @@ (define-public sugar-jukebox-activity (revision "2")) (package (name "sugar-jukebox-activity") - (version (git-version "36" revision commit)) + (version (make-git-version "36" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -832,7 +832,7 @@ (define-public sugar-log-activity (revision "1")) (package (name "sugar-log-activity") - (version (git-version "42" revision commit)) + (version (make-git-version "42" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -937,7 +937,7 @@ (define-public sugar-physics-activity (revision "1")) (package (name "sugar-physics-activity") - (version (git-version "35" revision commit)) + (version (make-git-version "35" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -998,7 +998,7 @@ (define-public sugar-portfolio-activity (revision "1")) (package (name "sugar-portfolio-activity") - (version (git-version "52" revision commit)) + (version (make-git-version "52" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1097,7 +1097,7 @@ (define-public sugar-river-crossing-activity (revision "1")) (package (name "sugar-river-crossing-activity") - (version (git-version "1" revision commit)) + (version (make-git-version "1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1157,7 +1157,7 @@ (define-public sugar-terminal-activity (revision "1")) (package (name "sugar-terminal-activity") - (version (git-version "47" revision commit)) + (version (make-git-version "47" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1202,7 +1202,7 @@ (define-public sugar-turtleart-activity (revision "1")) (package (name "sugar-turtleart-activity") - (version (git-version "202" revision commit)) + (version (make-git-version "202" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1288,7 +1288,7 @@ (define-public sugar-turtlepond-activity (revision "1")) (package (name "sugar-turtlepond-activity") - (version (git-version "10" revision commit)) + (version (make-git-version "10" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1395,7 +1395,7 @@ (define-public sugar-write-activity (revision "1")) (package (name "sugar-write-activity") - (version (git-version "101" revision commit)) + (version (make-git-version "101" revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index 568f2e3de06..a01214a6b37 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -484,7 +484,7 @@ (define-public usync (commit "09a8059a1adc22666d3ecf7872e22e6846c3ac9e")) (package (name "usync") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -520,7 +520,7 @@ (define-public casync (revision "0")) (package (name "casync") - (version (git-version "2" revision commit)) + (version (make-git-version "2" revision commit)) (home-page "https://github.com/systemd/casync/") (source (origin (method git-fetch) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index e64bfb1efc8..3543a303e20 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -143,7 +143,7 @@ (define-public syncthing-gtk (commit "1e84f332e413ba123bcd443443ffc2b435ffafd2")) (package (name "syncthing-gtk") - (version (git-version "0.9.4.4" revision commit)) + (version (make-git-version "0.9.4.4" revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index dfe6a782be2..ade1245f240 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -590,7 +590,7 @@ (define-public syndication-domination (commit "75920321062d682437f3fb0319dad227d8b18f6c")) (package (name "syndication-domination") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference From patchwork Sat Jul 26 02:39:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43298 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 0AF0827BC49; Sat, 26 Jul 2025 03:51:22 +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.3 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,URIBL_SBL_A 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 8E3F627BC49 for ; Sat, 26 Jul 2025 03:51:20 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufUzm-000738-2Z; 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 1ufUxC-0004yg-44 for guix-patches@gnu.org; Fri, 25 Jul 2025 22:48:07 -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 1ufUxB-0006Nb-QO for guix-patches@gnu.org; Fri, 25 Jul 2025 22:48:05 -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=qtS5Ro3rjd1cUFD4VCVJO7FSWajCQ2afbL/j0eCdpPk=; b=qAPXTSObnvo6LTw8WRcFBSaj6nVmrUtKmZ8PcH0kgFUmHyfbu9QjFsAn81JXlKNoalTy67wTBnn9nA+uOl3nRqH7TOpED+tSRPUq4IGiTVS6vrF30Gzs6AZPYj9b2VfqjScv2CsyQFP+gylh0YZNSXVwMoYsFuT1Chw2Lt9f6Qeufgq3AoLB4WNge5JXUHfZM1Tr41aeUGotk105YosXvSlTFAd3Mf1aPmWMiVfiZZXX7dH74lxPpfgHaOffSyq0r9LdybrDqk33nl6GkklV7bfuudUi6QOPgaAEXkr9ATPyjMvOvvV5oysfOWeXQai5a9bTWB8SbjCXumPFW4DEUA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ufUxB-0008QK-H8 for guix-patches@gnu.org; Fri, 25 Jul 2025 22:48:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79099] [PATCH 29/34] gnu/packages/t*.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:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 79099 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 79099@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 79099-submit@debbugs.gnu.org id=B79099.175349807832314 (code B ref 79099); Sat, 26 Jul 2025 02:48:05 +0000 Received: (at 79099) by debbugs.gnu.org; 26 Jul 2025 02:47:58 +0000 Received: from localhost ([127.0.0.1]:38236 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ufUx0-0008Om-DZ for submit@debbugs.gnu.org; Fri, 25 Jul 2025 22:47:58 -0400 Received: from 2.mo562.mail-out.ovh.net ([178.33.252.217]:52247) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ufUwo-0008Nl-5N for 79099@debbugs.gnu.org; Fri, 25 Jul 2025 22:47:51 -0400 Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net [51.68.80.175]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4bpprB2Pyhz1yn3; Sat, 26 Jul 2025 02:40:26 +0000 (UTC) Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net. [127.0.0.1]) by director1.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79099@debbugs.gnu.org>; Sat, 26 Jul 2025 02:40:26 +0000 (UTC) Received: from mta11.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.54.159]) by director1.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bpprB0SsSz5wGM; Sat, 26 Jul 2025 02:40:26 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.9]) by mta11.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 9BCD99A3176; Sat, 26 Jul 2025 02:40:25 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-108S002dd89b294-44c4-4946-8623-d3042013147a, 7BFD41D65738CBEA4850BE66907D66307393418F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sat, 26 Jul 2025 04:39:35 +0200 Message-ID: <20250726023951.11862-29-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: 4619004369807401698 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdekhedvfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeehvddtffdvudduleeuhfffudefheelfeefveeuhfejveelleekheekleejieevveenucffohhmrghinhepghhithhhuhgsrdgtohhmpdhgihhthhhusghushgvrhgtohhnthgvnhhtrdgtohhmnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledtleelseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=qtS5Ro3rjd1cUFD4VCVJO7FSWajCQ2afbL/j0eCdpPk=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1753497626; v=1; b=yCHXn4lU+GoNNr+yv9xzIvhU8p2ttPM1IAnmWVxImRgi4FRwyVUmBc4BRgvPceKXUHb0X1Q4 gxICrJ4pHMJCyvUApdsv+tJV2HWShhtthKWg9hq4NJ41qk1H5ZmzMmtdyinawQN1MmP3/oMtWFl mn/1Mkji4F7AeSbQjaIIOqwFrvd4JEIVxl+neO5vn/DSCGmuxaV467WIBEn3SkR14HuswIup8D4 sDw/MZ0st6lrbrVg7mk587anRvwxiIdVQra1/JlH3wkGBBKmktAxjhviLuPwO9I+p61m9YpcR3H je84FXTquDMudE+MlAdyJ6Q41z4W1aNMmlOhNt1rO9+nQ== 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 "t*.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/task-management.scm | 4 ++-- gnu/packages/tcl.scm | 2 +- gnu/packages/telegram.scm | 14 ++++++------- gnu/packages/telephony.scm | 6 +++--- gnu/packages/terminals.scm | 8 +++---- gnu/packages/tex.scm | 5 +++-- gnu/packages/texinfo.scm | 2 +- gnu/packages/text-editors.scm | 4 ++-- gnu/packages/textutils.scm | 2 +- gnu/packages/time.scm | 4 ++-- gnu/packages/tls.scm | 2 +- gnu/packages/tmux.scm | 4 ++-- gnu/packages/tor-browsers.scm | 2 +- gnu/packages/toys.scm | 8 +++---- gnu/packages/tree-sitter.scm | 36 ++++++++++++++++---------------- 15 files changed, 52 insertions(+), 51 deletions(-) diff --git a/gnu/packages/task-management.scm b/gnu/packages/task-management.scm index 4e6b8d147a7..d4968b09e9c 100644 --- a/gnu/packages/task-management.scm +++ b/gnu/packages/task-management.scm @@ -82,7 +82,7 @@ (define-public clikan (package (name "clikan") (version - (git-version "0.2.1" revision commit)) + (make-git-version "0.2.1" revision commit)) (source (origin (method git-fetch) @@ -307,7 +307,7 @@ (define-public worklog (revision "1")) (package (name "worklog") - (version (git-version "2.1" revision commit)) + (version (make-git-version "2.1" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm index c2cdbd8a03f..6eb0a0f82b1 100644 --- a/gnu/packages/tcl.scm +++ b/gnu/packages/tcl.scm @@ -492,7 +492,7 @@ (define-public go-github.com-nsf-gothic (revision "0")) (package (name "go-github.com-nsf-gothic") - (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/telegram.scm b/gnu/packages/telegram.scm index 1c9b0de6b29..310e4eec60b 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -98,7 +98,7 @@ (define libyuv-for-telegram-desktop (commit commit))) (file-name (git-file-name "libyuv-for-telegram-desktop" - (git-version "0" revision commit))) + (make-git-version "0" revision commit))) (sha256 (base32 "1fsvc0f8mckrdzys8lnlnbw6676mjamm6p3ghr2h9liqfa83s6wg"))))) @@ -283,7 +283,7 @@ (define-public webrtc-for-telegram-desktop (package (name "webrtc-for-telegram-desktop") (version - (git-version "0" revision commit)) + (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -374,7 +374,7 @@ (define-public rlottie-for-telegram-desktop (hidden-package (package (name "rlottie-for-telegram-desktop") - (version (git-version "0.0.1" revision commit)) + (version (make-git-version "0.0.1" revision commit)) (source (origin (method git-fetch) @@ -623,7 +623,7 @@ (define-public tl-parser (package (name "tl-parser") (version - (git-version "0" revision commit)) + (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -669,7 +669,7 @@ (define-public tgl (package (name "tgl") (version - (git-version "2.0.1" revision commit)) + (make-git-version "2.0.1" revision commit)) (source (origin (method git-fetch) @@ -742,7 +742,7 @@ (define-public telegram-cli (package (name "telegram-cli") (version - (git-version "1.3.1" revision commit)) + (make-git-version "1.3.1" revision commit)) (source (origin (method git-fetch) @@ -881,7 +881,7 @@ (define-public tgs2png (revision "0")) (package (name "tgs2png") - (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/telephony.scm b/gnu/packages/telephony.scm index c833bcc0cc2..feb1778ed52 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -555,7 +555,7 @@ (define find-python-interpreter-cmake-modules (url "https://github.com/Krzmbrzl/FindPythonInterpreter") (commit commit))) (file-name (git-file-name "find-python-interpreter" - (git-version "0" revision commit))) + (make-git-version "0" revision commit))) (sha256 (base32 "1ryhda2yqgrhnwndfg52mscdsclg1ivv746hvalcay5m1wy2h5bm"))))) @@ -876,7 +876,7 @@ (define-public pjproject-jami (name "pjproject-jami") ;; The version is taken from ;; . - (version (git-version "2.13.1" revision commit)) + (version (make-git-version "2.13.1" revision commit)) (source (origin (inherit (package-source pjproject)) ;; The Jami development team regularly issues patches to @@ -1065,7 +1065,7 @@ (define-public xgoldmon (commit "f2d5372acee4e492f31f6ba8b850cfb48fbbe478")) (package (name "xgoldmon") - (version (git-version "1.0" revision commit)) + (version (make-git-version "1.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 0579ddb22af..f23b7c1034a 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -272,7 +272,7 @@ (define-public libtsm (revision "1")) (package (name "libtsm") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -312,7 +312,7 @@ (define-public kmscon (revision "1")) (package (name "kmscon") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) ;; The freedesktop repository is no longer maintained. @@ -558,7 +558,7 @@ (define-public beep (revision "0")) (package (name "beep") - (version (git-version "1.4.12" revision commit)) + (version (make-git-version "1.4.12" revision commit)) (source (origin (method git-fetch) @@ -969,7 +969,7 @@ (define-public xiate (revision "0")) (package (name "xiate") - (version (git-version "22.12" revision commit)) + (version (make-git-version "22.12" revision commit)) (source (origin (method git-fetch) (file-name (git-file-name name version)) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index b9a3c2222b8..13182d7f75b 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -77569,7 +77569,7 @@ (define-public teximpatient (revision "0")) (package (name "teximpatient") - (version (git-version "2.4" revision commit)) + (version (make-git-version "2.4" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -77606,7 +77606,8 @@ (define-public teximpatient (substitute* "eplain.tex" (("timestamp.*%") (string-append "timestamp{" - ,version "}")))))))) + ,(package-version + this-package) "}")))))))) (native-inputs (list autoconf automake diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index ea7b54b51d7..c53ed382c70 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -326,7 +326,7 @@ (define-public pinfo (package (name "pinfo") ;; Latest tag is completely broken and does not build. - (version (git-version "0.6.13" revision commit)) + (version (make-git-version "0.6.13" revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 5658da981f5..3d6c1e5f8b6 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -236,7 +236,7 @@ (define-public lem (revision "8")) (package (name "lem") - (version (git-version "2.2.0" revision commit)) + (version (make-git-version "2.2.0" revision commit)) (source (origin (method git-fetch) @@ -887,7 +887,7 @@ (define-public l3afpad (revision "0")) (package (name "l3afpad") - (version (git-version "0.8.18.1.11" revision commit)) + (version (make-git-version "0.8.18.1.11" revision commit)) (source (origin (method git-fetch) (file-name (git-file-name name version)) diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index a54a7636102..98173f0f3f8 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -1175,7 +1175,7 @@ (define-public html2text (revision "1")) (package (name "html2text") - (version (git-version "2.0.1_pre" revision commit)) + (version (make-git-version "2.0.1_pre" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm index 66f9ef412ca..1f6b32967cb 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm @@ -124,7 +124,7 @@ (define-public pps-tools (revision "1")) (package (name "pps-tools") - (version (git-version "1.0.3" revision commit)) + (version (make-git-version "1.0.3" revision commit)) (source (origin (method git-fetch) @@ -679,7 +679,7 @@ (define-public rdate (revision "1")) (package (name "rdate") - (version (git-version "1.4" revision commit)) + (version (make-git-version "1.4" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 63beb09ef42..c991ae0f475 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -1135,7 +1135,7 @@ (define-public go-github-com-certifi-gocertifi (revision "1")) (package (name "go-github-com-certifi-gocertifi") - (version (git-version "2018.01.18" revision commit)) + (version (make-git-version "2018.01.18" revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/tmux.scm b/gnu/packages/tmux.scm index ebd957c4ee9..e19071a2d4e 100644 --- a/gnu/packages/tmux.scm +++ b/gnu/packages/tmux.scm @@ -283,7 +283,7 @@ (define-public tmux-plugin-resurrect (revision "0")) (package (name "tmux-plugin-resurrect") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -333,7 +333,7 @@ (define-public tmux-plugin-continuum (revision "0")) (package (name "tmux-plugin-continuum") - (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/tor-browsers.scm b/gnu/packages/tor-browsers.scm index fbcd9f933a7..c74c121de43 100644 --- a/gnu/packages/tor-browsers.scm +++ b/gnu/packages/tor-browsers.scm @@ -96,7 +96,7 @@ (define firefox-locales (revision "0")) (package (name "firefox-locales") - (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/toys.scm b/gnu/packages/toys.scm index aee0848d460..fc543495b36 100644 --- a/gnu/packages/toys.scm +++ b/gnu/packages/toys.scm @@ -68,7 +68,7 @@ (define-public cbonsai (revision "1")) (package (name "cbonsai") - (version (git-version "1.3.1" revision commit)) + (version (make-git-version "1.3.1" revision commit)) (source (origin (method git-fetch) @@ -91,7 +91,7 @@ (define-public cbonsai (add-after 'install 'install-doc (lambda _ (let ((doc (format #f "~a/share/doc/~a-~a" #$output - #$name #$version))) + #$name #$(package-version this-package)))) (install-file "README.md" doc))))))) (native-inputs (list pkg-config scdoc)) @@ -108,7 +108,7 @@ (define-public cxxmatrix (revision "0")) (package (name "cxxmatrix") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -264,7 +264,7 @@ (define-public fortunes-jkirchartz (revision "1")) (package (name "fortunes-jkirchartz") - (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/tree-sitter.scm b/gnu/packages/tree-sitter.scm index e09f3dc1710..c1f04cee517 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -326,7 +326,7 @@ (define-public tree-sitter-javascript (tree-sitter-grammar "javascript" "JavaScript(JSX)" "0vp7z57scpbcvyxpya06lnpz9f5kjdb66wjlkrp684xwjjgq1wxd" - (git-version "0.20.0" revision commit) + (make-git-version "0.20.0" revision commit) #:commit commit #:get-cleanup-snippet (lambda (grammar-directories) @@ -358,7 +358,7 @@ (define-public tree-sitter-bibtex (tree-sitter-grammar "bibtex" "Bibtex" "0m7f3dkqbmy8x1bhl11m8f4p6n76wfvh99rp46zrqv39355nw1y2" - (git-version "0.1.0" revision commit) + (make-git-version "0.1.0" revision commit) #:repository-url "https://github.com/latex-lsp/tree-sitter-bibtex" #:commit commit #:license license:expat))) @@ -404,7 +404,7 @@ (define-public tree-sitter-elixir (tree-sitter-grammar "elixir" "Elixir" "1i0c0xki3sv24649p0ws7xs2jagbwg7z7baz1960239bj94nl487" - (git-version "0.19.0" revision commit) + (make-git-version "0.19.0" revision commit) #:article "an" #:repository-url "https://github.com/elixir-lang/tree-sitter-elixir" #:commit commit @@ -429,7 +429,7 @@ (define-public tree-sitter-blueprint (tree-sitter-grammar "blueprint" "Blueprint" "0pdjka1sdw9dwilw3vjl3k3cn7pcyv7m57cmxqibashg316dygxm" - (git-version "0.0.0" revision commit) ; Upstream has not tagged any releases + (make-git-version "0.0.0" revision commit) ; Upstream has not tagged any releases #:repository-url "https://github.com/huanie/tree-sitter-blueprint" #:commit commit #:license license:expat))) @@ -455,7 +455,7 @@ (define-public tree-sitter-erlang (tree-sitter-grammar "erlang" "Erlang" "1h0c9qc6i0kz5a0yq68xp623f84g4mc8hcp00khdbf7y7z7b9izc" - (git-version version revision commit) + (make-git-version version revision commit) #:repository-url "https://github.com/WhatsApp/tree-sitter-erlang" #:commit commit))) @@ -487,7 +487,7 @@ (define-public tree-sitter-haskell (tree-sitter-grammar "haskell" "Haskell" "1hg19af1n510bndf5k5iri7dzb48xb527vispv1aapki4mvr98gx" - (git-version "0.14.0" revision commit) + (make-git-version "0.14.0" revision commit) #:commit commit))) (define-public tree-sitter-hcl @@ -541,7 +541,7 @@ (define-public tree-sitter-php (tree-sitter-grammar "php" "PHP" "02yc5b3qps8ghsmy4b5m5kldyr5pnqz9yw663v13pnz92r84k14g" - (git-version "0.19.0" revision commit) + (make-git-version "0.19.0" revision commit) #:commit commit))) (define-public tree-sitter-prisma @@ -565,7 +565,7 @@ (define-public tree-sitter-r (tree-sitter-grammar "r" "R" "1n7yxi2wf9xj8snw0b85a5w40vhf7x1pwirnwfk78ilr6hhz4ix9" - (git-version "0.0.1" revision commit) + (make-git-version "0.0.1" revision commit) #:commit commit))) (define-public tree-sitter-ron @@ -583,7 +583,7 @@ (define-public tree-sitter-ruby (tree-sitter-grammar "ruby" "Ruby" "1pqr24bj68lgi1w2cblr8asfby681l3032jrppq4n9x5zm23fi6n" - (git-version "0.19.0" revision commit) + (make-git-version "0.19.0" revision commit) #:commit commit))) (define-public tree-sitter-rust @@ -599,7 +599,7 @@ (define-public tree-sitter-ungrammar (tree-sitter-grammar "ungrammar" "Ungrammar" "09bbml1v1m6a9s9y9q1p2264ghf3fhb6kca1vj3qm19yq87xrnvy" - (git-version "0.0.2" revision commit) + (make-git-version "0.0.2" revision commit) #:commit commit #:repository-url "https://github.com/tree-sitter-grammars/tree-sitter-ungrammar" #:article "an"))) @@ -651,7 +651,7 @@ (define-public tree-sitter-matlab (tree-sitter-grammar "matlab" "Matlab" "04ffhfnznskkcp91fbnv8jy3wkb9cd8ifwrkrdwcw74n1b2hq80c" - (git-version "1.0.2" revision commit) + (make-git-version "1.0.2" revision commit) #:repository-url "https://github.com/acristoffers/tree-sitter-matlab" #:commit commit #:license license:expat))) @@ -663,7 +663,7 @@ (define-public tree-sitter-meson (tree-sitter-grammar "meson" "Meson" "1rn7r76h65d41354czyccm59d1j9nzybcrjvjh934lpr59qrw61m" - (git-version "1.2" revision commit) + (make-git-version "1.2" revision commit) #:repository-url "https://github.com/Decodetalkers/tree-sitter-meson" #:commit commit #:license license:expat))) @@ -684,7 +684,7 @@ (define-public tree-sitter-org (tree-sitter-grammar "org" "Org" "0h9krbaq9j6ijf86sg0w221s0zbpbx5f7m1l0whzjahbrqpnqgxl" - (git-version "1.3.1" revision commit) + (make-git-version "1.3.1" revision commit) #:repository-url "https://github.com/milisims/tree-sitter-org" #:commit commit))) @@ -695,7 +695,7 @@ (define-public tree-sitter-scheme (tree-sitter-grammar "scheme" "Scheme (R5RS, R6RS)" "1pvxckza1kdfwqs78ka3lbwldrwkgymb31f5x1fq5vyawg60wxk8" - (git-version "0.2.0" revision commit) + (make-git-version "0.2.0" revision commit) #:repository-url "https://github.com/6cdh/tree-sitter-scheme" #:commit commit))) @@ -713,7 +713,7 @@ (define-public tree-sitter-racket (tree-sitter-grammar "racket" "Racket" "06gwn3i7swhkvbkgxjlljdjgvx8y1afafbqmpwya70r9z635593h" - (git-version "0.1.0" revision commit) + (make-git-version "0.1.0" revision commit) #:repository-url "https://github.com/6cdh/tree-sitter-racket" #:commit commit))) @@ -724,7 +724,7 @@ (define-public tree-sitter-plantuml (tree-sitter-grammar "plantuml" "PlantUML" "0swqq4blhlvvgrvsb0h4cjl3pnfmmdpfd5r5kg9rpdwk0sn98x3a" - (git-version "1.0.0" revision commit) + (make-git-version "1.0.0" revision commit) #:repository-url "https://github.com/Decodetalkers/tree_sitter_plantuml" #:commit commit #:get-cleanup-snippet @@ -785,7 +785,7 @@ (define-public tree-sitter-verilog (tree-sitter-grammar "verilog" "Verilog" "0j5iycqm5dmvzy7dssm8km1djhr7hnfgk26zyzcxanhrwwq3wi4k" - (git-version version revision commit) + (make-git-version version revision commit) #:commit commit #:get-cleanup-snippet (lambda _ @@ -801,7 +801,7 @@ (define-public tree-sitter-vhdl (tree-sitter-grammar "vhdl" "VHDL" "0gz2b0qg1jzi2q6wgj6k6g35kmni3pqglq4f5kblkxx909463n8a" - (git-version version revision commit) + (make-git-version version revision commit) #:repository-url "https://github.com/alemuller/tree-sitter-vhdl" #:commit commit #:get-cleanup-snippet From patchwork Sat Jul 26 02:39:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43300 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 7EA6F27BC4B; Sat, 26 Jul 2025 03:51:30 +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 AF1D327BC49 for ; Sat, 26 Jul 2025 03:51:29 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufV0J-0007Oc-60; Fri, 25 Jul 2025 22:51:19 -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 1ufUxF-00051B-Rc for guix-patches@gnu.org; Fri, 25 Jul 2025 22:48:16 -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 1ufUxF-0006Np-5Y for guix-patches@gnu.org; Fri, 25 Jul 2025 22:48:09 -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=MwAeiNnd4iMGr9FNVD+qe9mSPV3QaQ3V7RVP+o6lAVE=; b=v0KFG8axaWwrTPpeQpjCeSpKfCUfslBlSN3QUQAbcL/6jhfjqVOTDgs5dF0tSB0zufcfcfqAXNsfkrNIxTWphkKaPNOVH5FLwPRFikteE0a6LYJecCA9xL/JSj8gnMGYGWwGNNmAeGtPnSJk/lPAs02QoX2bidUu8sO2TTqW/HnDcG469ULs07BajEm3jSwyfRRaW5BnrSTvEx4/itS6oBNm2sDHx8hgqpfNdLHN5YPlWAsAaApx+W2hulwM9k8NoX3j3WpkuGzXB0+ae96shxpQ0hiQK3KQXgTZtG+ektBLoUVf9RnXUOM8oN4TipuYX1tjY2B1HLnZhnpMKOn1Uw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ufUxE-0008RA-T1 for guix-patches@gnu.org; Fri, 25 Jul 2025 22:48:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79099] [PATCH 30/34] gnu/packages/v*.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:08 +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.175349808732415 (code B ref 79099); Sat, 26 Jul 2025 02:48:08 +0000 Received: (at 79099) by debbugs.gnu.org; 26 Jul 2025 02:48:07 +0000 Received: from localhost ([127.0.0.1]:38248 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ufUxC-0008QX-43 for submit@debbugs.gnu.org; Fri, 25 Jul 2025 22:48:07 -0400 Received: from 8.mo562.mail-out.ovh.net ([46.105.60.65]:55861) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ufUwv-0008OG-4b for 79099@debbugs.gnu.org; Fri, 25 Jul 2025 22:47:56 -0400 Received: from director3.derp.mail-out.ovh.net (director3.derp.mail-out.ovh.net [152.228.215.222]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4bpprC1Y6jz2c2Z; Sat, 26 Jul 2025 02:40:27 +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:27 +0000 (UTC) Received: from mta6.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.178.122]) by director3.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bpprB75Djz5xQH; Sat, 26 Jul 2025 02:40:26 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.10]) by mta6.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id AFD5A8E318E; Sat, 26 Jul 2025 02:40:26 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-101G004c514283d-f239-49ce-bbfb-2a558325ab1d, 7BFD41D65738CBEA4850BE66907D66307393418F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sat, 26 Jul 2025 04:39:36 +0200 Message-ID: <20250726023951.11862-30-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: 4619285843551183586 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdekhedvfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdffheegkefhkefggfelheffteeigfegiedtudetkeffhfekheevjeefjeeltdeinecuffhomhgrihhnpehgihhthhhusgdrtghomhenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeeltdelleesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeivdgmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=MwAeiNnd4iMGr9FNVD+qe9mSPV3QaQ3V7RVP+o6lAVE=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1753497627; v=1; b=YhIF2vyOvMyXOc0nB1Rc9CVAzbOf9IQINnMTax2Wno+IpmGvgNoA5OPsbrwdXWr/WcgWIWUx CE6dazhoXxcKLGfhAQlXl654HQrNdiLm+eaAxtAkI65Pee/kRmhfHf+jJkjAwN3Th4U+Ti6Ttkq 8b8Tl/wy+1V0UZyvePdH/54UG6cC9gmo4aYFUNhmOe2C6Zwl+M68UYvnFDRcOKn2W2hajigWAOT W+xQPkl3SqtJq9PaxFuzCmu6VBnntGWH8nXqw99xEbLO+P7N8QwMwZuWohbgVLtMaBMB3mYto+W MtSQbHYGx0gVwVtG790yXMdUkpHs9F/Y2T7CiUJwvoQdw== 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 "v*.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/version-control.scm | 10 ++++----- gnu/packages/video.scm | 18 +++++++-------- gnu/packages/vim.scm | 38 ++++++++++++++++---------------- gnu/packages/vnc.scm | 2 +- gnu/packages/vpn.scm | 2 +- 5 files changed, 35 insertions(+), 35 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 06d042a519d..5e04af77020 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -906,7 +906,7 @@ (define-public gitless (revision "0")) (package (name "gitless") - (version (git-version "0.8.8" revision commit)) + (version (make-git-version "0.8.8" revision commit)) (source (origin (method git-fetch) @@ -1213,7 +1213,7 @@ (define-public xdiff (package (name "xdiff") ;; The base version is taken from the CMakeLists.txt file. - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1463,7 +1463,7 @@ (define-public git-issue (revision "0")) (package (name "git-issue") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1718,7 +1718,7 @@ (define-public cgit (package (name "cgit") ;; Update the ‘git-source’ input as well. - (version (git-version "1.2.3" rev commit)) + (version (make-git-version "1.2.3" rev commit)) (source (origin (method git-fetch) (uri (git-reference @@ -2892,7 +2892,7 @@ (define-public hg-commitsigs (revision "0")) (package (name "hg-commitsigs") - (version (git-version "0.1.0" revision changeset)) + (version (make-git-version "0.1.0" revision changeset)) (source (origin (method hg-fetch) (uri (hg-reference diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 4e0dcee4cf2..f549c3f3dd8 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -964,7 +964,7 @@ (define-public libx264 (revision "0")) (package (name "libx264") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -2407,7 +2407,7 @@ (define-public gpac (name "gpac") ;; Use a git snapshot of the master branch, as it fixes build issues ;; when using a recent ffmpeg release. - (version (git-version "2.4.0" revision commit)) + (version (make-git-version "2.4.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -3949,7 +3949,7 @@ (define-public twitchy (let ((commit "9beb36d80b16662414129693e74fa3a2fd97554e")) ; 3.4 has no tag (package (name "twitchy") - (version (git-version "3.4" "1" commit)) + (version (make-git-version "3.4" "1" commit)) (source (origin (method git-fetch) @@ -5228,7 +5228,7 @@ (define-public h264bitstream (revision "1")) (package (name "h264bitstream") - (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 @@ -5957,7 +5957,7 @@ (define-public subdl (revision "1")) (package (name "subdl") - (version (git-version "1.0.3" revision commit)) + (version (make-git-version "1.0.3" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -6055,7 +6055,7 @@ (define-public vidstab (revision "0")) (package (name "vidstab") - (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 @@ -6305,7 +6305,7 @@ (define-public wlstream (revision "1")) (package (name "wlstream") - (version (git-version "0.0" revision commit)) + (version (make-git-version "0.0" revision commit)) (source (origin (method git-fetch) @@ -6398,7 +6398,7 @@ (define-public theorafile (let ((commit "ea5fd6d34053ff72b0abe83fa4f2cd0771d92663")) (package (name "theorafile") - (version (git-version "0.0.0" "2" commit)) + (version (make-git-version "0.0.0" "2" commit)) (source (origin (method git-fetch) @@ -6873,7 +6873,7 @@ (define-public libcaption (revision "0")) (package (name "libcaption") - (version (git-version "0.7" revision commit)) + (version (make-git-version "0.7" revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index ccd950d9c91..0c37ee7fbcf 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -409,7 +409,7 @@ (define-public vim-scheme (revision "3")) (package (name "vim-scheme") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -485,7 +485,7 @@ (define-public vim-coqtail (revision "1")) (package (name "vim-coqtail") - (version (git-version "1.7.1" revision commit)) + (version (make-git-version "1.7.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -614,7 +614,7 @@ (define-public vim-airline-themes (revision "2")) (package (name "vim-airline-themes") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -675,7 +675,7 @@ (define-public vim-solarized (revision "1")) (package (name "vim-solarized") - (version (git-version "1.0.0beta1" revision commit)) + (version (make-git-version "1.0.0beta1" revision commit)) (source (origin (method git-fetch) @@ -775,7 +775,7 @@ (define-public neovim-packer (revision "0")) (package (name "neovim-packer") - (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 @@ -1120,7 +1120,7 @@ (define-public vim-dispatch (revision "1")) (package (name "vim-dispatch") - (version (git-version "1.8" revision commit)) + (version (make-git-version "1.8" revision commit)) (source (origin (method git-fetch) @@ -1153,7 +1153,7 @@ (define-public vim-gemini-vim (revision "1")) (package (name "vim-gemini-vim") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -1178,7 +1178,7 @@ (define-public vim-eunuch (revision "1")) (package (name "vim-eunuch") - (version (git-version "1.2" revision commit)) + (version (make-git-version "1.2" revision commit)) (source (origin (method git-fetch) @@ -1205,7 +1205,7 @@ (define-public vim-slime (revision "1")) (package (name "vim-slime") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -1233,7 +1233,7 @@ (define-public vim-vlime (revision "1")) (package (name "vim-vlime") - (version (git-version "0.4.0" revision commit)) + (version (make-git-version "0.4.0" revision commit)) (source (origin (method git-fetch) @@ -1286,7 +1286,7 @@ (define-public vim-paredit (revision "1")) (package (name "vim-paredit") - (version (git-version "0.9.11" revision commit)) + (version (make-git-version "0.9.11" revision commit)) (source (origin (method git-fetch) @@ -1421,7 +1421,7 @@ (define-public vim-gitgutter (revision "1")) (package (name "vim-gitgutter") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -1565,7 +1565,7 @@ (define-public vim-vader (commit "429b669e6158be3a9fc110799607c232e6ed8e29")) (package (name "vim-vader") - (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 @@ -1664,7 +1664,7 @@ (define-public vim-commentary (revision "1")) (package (name "vim-commentary") - (version (git-version "1.3" revision commit)) + (version (make-git-version "1.3" revision commit)) (source (origin (method git-fetch) @@ -1694,7 +1694,7 @@ (define-public vim-guile (revision "1")) (package (name "vim-guile") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -1722,7 +1722,7 @@ (define-public vim-dhall-vim (revision "1")) (package (name "vim-dhall-vim") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -1748,7 +1748,7 @@ (define-public vim-mundo (revision "1")) (package (name "vim-mundo") - (version (git-version "3.1.0" revision commit)) + (version (make-git-version "3.1.0" revision commit)) (source (origin (method git-fetch) @@ -1772,7 +1772,7 @@ (define-public vim-zig (revision "1")) (package (name "vim-zig") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (source (origin (method git-fetch) @@ -1798,7 +1798,7 @@ (define-public vim-plantuml-syntax (revision "1")) (package (name "vim-plantuml-syntax") - (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/vnc.scm b/gnu/packages/vnc.scm index c4051c76729..f8afcf15e95 100644 --- a/gnu/packages/vnc.scm +++ b/gnu/packages/vnc.scm @@ -596,7 +596,7 @@ (define-public x11vnc (revision "0")) (package (name "x11vnc") - (version (git-version "0.9.16" revision commit)) + (version (make-git-version "0.9.16" revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index ed067f0e021..fec663cf1f2 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -296,7 +296,7 @@ (define-public gp-saml-gui (revision "1")) (package (name "gp-saml-gui") - (version (git-version "0.0.0" revision commit)) + (version (make-git-version "0.0.0" revision commit)) (home-page "https://github.com/dlenski/gp-saml-gui") (source (origin (method git-fetch) From patchwork Sat Jul 26 02:39:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43297 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 00A6827BC4B; Sat, 26 Jul 2025 03:51:15 +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 1C9D927BC49 for ; Sat, 26 Jul 2025 03:51:15 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufUzq-00077z-1e; Fri, 25 Jul 2025 22:50:51 -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 1ufUxF-000518-RA for guix-patches@gnu.org; Fri, 25 Jul 2025 22:48:16 -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 1ufUxE-0006Nn-Hc for guix-patches@gnu.org; Fri, 25 Jul 2025 22:48:09 -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=gvusUpfuoDUd1efbOyc9BhcNBYhIM+nI5vsmqGHJryI=; b=nYgTZz34neX+PdSEBKeMUdXmBmqYe09YuGIEO0F4zUGvjngA3WN34uKTVNVEj5RdrTv4OCIDytOgOmbuMwY0ZP8kqbDriUPuXNrJi62/vK9L0c3k303GkzYs68u+N+D63HKEwhsbbNkmKUGD8KfPcVqe7LKY7PNsc1+Qu8nJE91KIWZCJb4k+MVZXp7cId4HmXpnvXx/8zJ9hA+JL0Z/bWqdcxGHTEEs3u77/aSrV8fPdSTYngaj4U2kwCmt6xF3SpXFGLNZbEYZWO27JnfyCwynaGVejVyI2WIFJYQd7dh8Oy4pWI8ny/sv5rzb+VDKdJWYq64WiUJKNozPeVJy9Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ufUxE-0008R1-Bd for guix-patches@gnu.org; Fri, 25 Jul 2025 22:48:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79099] [PATCH 31/34] gnu/packages/w*.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:08 +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.175349808632395 (code B ref 79099); Sat, 26 Jul 2025 02:48:08 +0000 Received: (at 79099) by debbugs.gnu.org; 26 Jul 2025 02:48:06 +0000 Received: from localhost ([127.0.0.1]:38244 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ufUxA-0008QC-Jh for submit@debbugs.gnu.org; Fri, 25 Jul 2025 22:48:05 -0400 Received: from 6.mo562.mail-out.ovh.net ([46.105.48.43]:58471) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ufUx0-0008Oe-1E for 79099@debbugs.gnu.org; Fri, 25 Jul 2025 22:47:56 -0400 Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net [51.68.80.175]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4bpprD18STz20yT; Sat, 26 Jul 2025 02:40:28 +0000 (UTC) Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net. [127.0.0.1]) by director1.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79099@debbugs.gnu.org>; Sat, 26 Jul 2025 02:40:27 +0000 (UTC) Received: from mta11.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.109.249.98]) by director1.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bpprC6SRGz5xTg; Sat, 26 Jul 2025 02:40:27 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.4]) by mta11.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 7E0769A3176; Sat, 26 Jul 2025 02:40:27 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-106R0068f6a52b5-2599-4069-9d30-6c7be7b23d7d, 7BFD41D65738CBEA4850BE66907D66307393418F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sat, 26 Jul 2025 04:39:37 +0200 Message-ID: <20250726023951.11862-31-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: 4619285843334914786 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdekhedvfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvheelieffheetvdelhfffffejfefgudfhteekveehieetudeiudfgkeeutdehjeenucffohhmrghinhepghhithhhuhgsrdgtohhmnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgepgeenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledtleelseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=gvusUpfuoDUd1efbOyc9BhcNBYhIM+nI5vsmqGHJryI=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1753497628; v=1; b=tVrPV5gaygJGe1KTA5yrR7dpN0hD3N58QVdNSUCD9Xy7uGDfkL/9/TVBnkCWO7xOsWmb7mL6 YWpeCx27Kk6bDFNwqbFAjKQ3xXEoOcDe/xH8Kc6IsSketvWiS4bsyFK8hoCBXNiNr0pd4+kvzqX +K9Gvut8rtEzi1QemNODmxxZOB/gGB+06syXYyi1dkVicniCJoPD8gAJJCnRRvm3cSZG5CSJof0 R8cNShlpSza4y3+KiwxS21u8WPvr1dpCv/VlZGNv+EIzRDu4gy87ZrFMI3ZPLTAMQ3jEOQ1UoGI rX1di9TEXTiHi8z+jMEYaDSpgu5rdV/hQNx9xpnIIAZDw== 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 "w*.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/web-browsers.scm | 6 +++--- gnu/packages/web.scm | 32 +++++++++++++++++--------------- gnu/packages/wm.scm | 22 +++++++++++----------- gnu/packages/wxwidgets.scm | 2 +- 4 files changed, 32 insertions(+), 30 deletions(-) diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index cf70505ac58..2d17fd4d14a 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -235,7 +235,7 @@ (define-public elinks (revision "2")) (package (name "elinks") - (version (git-version "0.18.0" revision commit)) + (version (make-git-version "0.18.0" revision commit)) (source (origin (method git-fetch) @@ -522,7 +522,7 @@ (define-public kristall (url "https://github.com/Alexhuszagh/BreezeStyleSheets") (commit "2d595a956f8a5f493aa51139a470b768a6d82cce"))) (file-name (git-file-name "breeze-stylesheet" - (git-version "0" revision commit))) + (make-git-version "0" revision commit))) (sha256 (base32 "1kvkxkisi3czldnb43ig60l55pi4a3m2a4ixp7krhpf9fc5wp294"))))))) @@ -1083,7 +1083,7 @@ (define-public leo (revision "1")) (package (name "leo") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 61c9ec63a5c..82630006e6a 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -726,7 +726,7 @@ (define-public nginx-accept-language-module (revision "1")) (package (name "nginx-accept-language-module") - (version (git-version "0.0.0" ;upstream has no version number + (version (make-git-version "0.0.0" ;upstream has no version number revision commit)) (source (origin @@ -1243,7 +1243,7 @@ (define-public fcgiwrap (revision "1")) (package (name "fcgiwrap") - (version (git-version "1.1.0" revision commit)) + (version (make-git-version "1.1.0" revision commit)) (source (origin (method git-fetch) @@ -1693,7 +1693,7 @@ (define-public rapidjson (revision "1")) (package (name "rapidjson") - (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 @@ -1893,7 +1893,7 @@ (define-public wasm3 (let ((commit "139076a98b8321b67f850a844f558b5e91b5ac83")) (package (name "wasm3") - (version (git-version "0.5.0" "1" commit)) + (version (make-git-version "0.5.0" "1" commit)) (source (origin (method git-fetch) @@ -5839,7 +5839,7 @@ (define-public pup (commit "681d7bb639334bf485476f5872c5bdab10931f9a")) (package (name "pup") - (version (git-version "0.4.0" revision commit)) + (version (make-git-version "0.4.0" revision commit)) (source (origin (method git-fetch) @@ -6660,7 +6660,7 @@ (define-public surfraw (revision "0")) (package (name "surfraw") - (version (git-version "2.3.0" revision commit)) + (version (make-git-version "2.3.0" revision commit)) (source (origin (method git-fetch) @@ -7241,7 +7241,7 @@ (define-public http-parser (revision "1")) (package (name "http-parser") - (version (git-version "2.9.4" revision commit)) + (version (make-git-version "2.9.4" revision commit)) (home-page "https://github.com/nodejs/http-parser") (source (origin @@ -7446,7 +7446,7 @@ (define-public nntpit (revision "0")) (package (name "nntpit") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -8559,7 +8559,7 @@ (define-public gophernicus (revision "0")) (package (name "gophernicus") - (version (git-version "3.1.1" revision commit)) + (version (make-git-version "3.1.1" revision commit)) (source (origin (method git-fetch) @@ -8583,11 +8583,13 @@ (define-public gophernicus (lambda _ (substitute* "Makefile.in" (("^(VERSION += ).*" _ prefix) - (string-append prefix #$version "\n"))) + (string-append prefix + #$(package-version this-package) "\n"))) ;; This is done in the release.sh script. (substitute* "README.md" (("^(This release: Version )DEVEL\\b.*" _ prefix) - (string-append prefix #$version "\n")) + (string-append prefix + #$(package-version this-package) "\n")) (("^NOTE: The master branch is rolling Development\\b.*") "")))) (replace 'configure @@ -8692,7 +8694,7 @@ (define-public monsterid (revision "0")) (package (name "monsterid") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -8721,7 +8723,7 @@ (define-public cat-avatar-generator (revision "1")) (package (name "cat-avatar-generator") - (version (git-version "1" revision commit)) + (version (make-git-version "1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -9733,7 +9735,7 @@ (define-public quark (commit "c6a9055e5a30be570e30da8d216c39662c3a3f99")) (package (name "quark") - (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 @@ -9770,7 +9772,7 @@ (define-public go-webring (revision "0")) (package (name "go-webring") - (version (git-version "20220426" revision commit)) + (version (make-git-version "20220426" revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index a660798e858..2a609c345e6 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -342,7 +342,7 @@ (define-public hypridle (revision "1")) (package (name "hypridle") - (version (git-version "0.1.6" revision commit)) + (version (make-git-version "0.1.6" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -2381,7 +2381,7 @@ (define-public shaderbg (revision "0")) (package (name "shaderbg") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -2695,7 +2695,7 @@ (define-public wlopm (revision "0")) (package (name "wlopm") - (version (git-version "1.0.0" revision commit)) + (version (make-git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -2913,7 +2913,7 @@ (define stumpwm-contrib (revision "7")) (package (name "stumpwm-contrib") - (version (git-version "0.0.1" revision commit)) ;no upstream release + (version (make-git-version "0.0.1" revision commit)) ;no upstream release (source (origin (method git-fetch) @@ -2960,7 +2960,7 @@ (define-public sbcl-stumpwm-pamixer (revision "1")) (package (name "sbcl-stumpwm-pamixer") - (version (git-version "0.1.1" revision commit)) + (version (make-git-version "0.1.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -3516,7 +3516,7 @@ (define-public xinitrc-xsession (revision "0")) (package (name "xinitrc-xsession") - (version (git-version "1" revision commit)) + (version (make-git-version "1" revision commit)) (source (origin (method git-fetch) @@ -4149,7 +4149,7 @@ (define-public grimblast (revision "1")) (package (name "grimblast") - (version (git-version "0.1" revision commit)) + (version (make-git-version "0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -4258,7 +4258,7 @@ (define-public wld (revision "1")) (package (name "wld") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -4291,7 +4291,7 @@ (define-public swc (revision "1")) (package (name "swc") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -4337,7 +4337,7 @@ (define-public velox (revision "1")) (package (name "velox") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -4403,7 +4403,7 @@ (define-public wsbg (package (inherit swaybg) (name "wsbg") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm index c961c29536b..909144790bc 100644 --- a/gnu/packages/wxwidgets.scm +++ b/gnu/packages/wxwidgets.scm @@ -259,7 +259,7 @@ (define-public prusa-wxwidgets (package (inherit wxwidgets-sans-egl) (name "prusa-wxwidgets") - (version (git-version "3.2.0" revision commit)) + (version (make-git-version "3.2.0" revision commit)) (home-page "https://github.com/prusa3d/wxWidgets") (source (origin From patchwork Sat Jul 26 02:39:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43287 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 B224227BC4B; Sat, 26 Jul 2025 03:43:12 +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 CCFA827BC49 for ; Sat, 26 Jul 2025 03:43:11 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufUsP-0001q7-CY; Fri, 25 Jul 2025 22:43:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ufUsM-0001ll-VW for guix-patches@gnu.org; Fri, 25 Jul 2025 22:43:06 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ufUsM-0005kt-M6 for guix-patches@gnu.org; Fri, 25 Jul 2025 22:43:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=DD0eLg/XvKOAht8q78X4XNJ2mZ/xu6uPdnkx7d3Q2+M=; b=m7hC30FpB4IC93/v2ziV0DwZHYvQjrcY3lf0BP9djWYEbj1Z7Fj3NwFYPsd/egMxE0uLePMDJ7SoDOcD8zIrV0tk7uaizvHSzEEDwwlw/8yyLdqhRTG6gZWEzMyHow9VejKRh/9Y2GfaBNSHcH8Cc5a3VFyDnFMhp+0/eccOt4kno2fR+NXR9Lk3CuooABeqjzuTqmBVK1uuH0323InVjMInEF42Gda6vUAAk+l8M0jfbi8BOuYEjg7htdNZDNcC9w21/2+1GHo1FMFE7sJr897f4Pq2YMB9TvGrQdLrxIeIJIZSCC6t2pDYjNjrnV1PfHc4wnD97f0UKklCYdyVsw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ufUsM-000829-CM for guix-patches@gnu.org; Fri, 25 Jul 2025 22:43:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79099] [PATCH 32/34] gnu/packages/x*.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:06 +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.175349774130690 (code B ref 79099); Sat, 26 Jul 2025 02:43:06 +0000 Received: (at 79099) by debbugs.gnu.org; 26 Jul 2025 02:42:21 +0000 Received: from localhost ([127.0.0.1]:38176 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ufUrb-0007yj-Kl for submit@debbugs.gnu.org; Fri, 25 Jul 2025 22:42:20 -0400 Received: from 4.mo563.mail-out.ovh.net ([46.105.53.192]:38851) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ufUpq-0007jR-82 for 79099@debbugs.gnu.org; Fri, 25 Jul 2025 22:40:48 -0400 Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net [51.68.80.175]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4bpprD6P1lz5xPh; Sat, 26 Jul 2025 02:40:28 +0000 (UTC) Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net. [127.0.0.1]) by director1.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <79099@debbugs.gnu.org>; Sat, 26 Jul 2025 02:40:28 +0000 (UTC) Received: from mta3.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.0.145]) by director1.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bpprD45Wwz5wGM; Sat, 26 Jul 2025 02:40:28 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.9]) by mta3.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 29DFF94313E; Sat, 26 Jul 2025 02:40:28 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-98R00214345302-bd00-4302-a4e8-9f3358d1851f, 7BFD41D65738CBEA4850BE66907D66307393418F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sat, 26 Jul 2025 04:39:38 +0200 Message-ID: <20250726023951.11862-32-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: 4619567321007252194 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdekhedvfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelgeevuefhudekgefhleehudfgfeekvdfgffejffekkefggeehveeluedtudelueenucffohhmrghinhepfhhrvggvuggvshhkthhophdrohhrghenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeeltdelleesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeifegmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=DD0eLg/XvKOAht8q78X4XNJ2mZ/xu6uPdnkx7d3Q2+M=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1753497629; v=1; b=tBmBN8zm8ENpN0EJiljUgXVy/h5BTizlwG1onjTD+EvgQolEgrksuGsoDUR4cUZggDI92QAi /zoHiYz6xWSWiV6jCupbtR9NUH4aadWlRozIVuX9Ay+rVEv8WkfVTr5SYOf8IgVZIK0YBnRpXU8 uAZ4QJsZrUDgdSYzjm5Ts3QLBZeO5tufWEhZNyVLL2N50hnVyxGKnUV2I7XhDc3cVbEWUcf9ms6 jo3MRl7TSc8vjTX6pKr5B5j2B0IoBx113s8VUjC/aNcC5S0YfxAPBaRHk9RByVacE/NAi3ujaVf xoq7/rGwQdpsEYJ6ELb06j5TqrtQ9MEkcRbM0TLAmelOA== 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 "x*.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/xdisorg.scm | 10 +++++----- gnu/packages/xiph.scm | 2 +- gnu/packages/xml.scm | 2 +- gnu/packages/xorg.scm | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index c396cf7c992..bc7fec7432e 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -506,7 +506,7 @@ (define-public bigbagkbdtrixxkb (revision "0")) (package (name "bigbagkbdtrixxkb") - (version (git-version "0" revision commit)) + (version (make-git-version "0" revision commit)) (source (origin (method git-fetch) @@ -587,7 +587,7 @@ (define-public xkblayout (commit "c0851b0f4bc9bc1a07240605baac8e50abe63fa8")) (package (name "xkblayout") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (home-page "https://gitlab.freedesktop.org/whot/xkblayout") (source (origin @@ -2116,7 +2116,7 @@ (define-public xsel (revision "1")) (package (name "xsel") - (version (git-version "1.2.0" revision commit)) + (version (make-git-version "1.2.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -2749,7 +2749,7 @@ (define-public xss-lock (commit "1e158fb20108058dbd62bd51d8e8c003c0a48717")) (package (name "xss-lock") - (version (git-version version revision commit)) + (version (make-git-version version revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -4296,7 +4296,7 @@ (define-public xforms (commit "2c1a9f151baf50887a517280645ec23379fb96f8")) (package (name "xforms") - (version (git-version "1.3.0" revision commit)) + (version (make-git-version "1.3.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm index d58665f6c34..bb13456ecd5 100644 --- a/gnu/packages/xiph.scm +++ b/gnu/packages/xiph.scm @@ -556,7 +556,7 @@ (define-public rnnoise (revision "0")) (package (name "rnnoise") - (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/xml.scm b/gnu/packages/xml.scm index 0d1992eb209..f33cf3663bf 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -1985,7 +1985,7 @@ (define-public python-untangle (package (name "python-untangle") ;; PyPI currently offers some untagged 1.1.1 version. - (version (git-version "1.1.1" revision commit)) + (version (make-git-version "1.1.1" revision commit)) (source (origin (method git-fetch) ;no tests in pypi archive diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 6f202c2d7da..929ef560c13 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2846,7 +2846,7 @@ (define-public xf86-video-ati (revision "1")) (package (name "xf86-video-ati") - (version (git-version "19.1.0" revision commit)) + (version (make-git-version "19.1.0" revision commit)) (source (origin (method git-fetch) @@ -3064,7 +3064,7 @@ (define-public xf86-video-intel (revision "18")) (package (name "xf86-video-intel") - (version (git-version "2.99.917" revision commit)) + (version (make-git-version "2.99.917" revision commit)) (source (origin ;; there's no current tarball From patchwork Sat Jul 26 02:39:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43290 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 65B3627BC4F; Sat, 26 Jul 2025 03:43:19 +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 EAC4627BC4A for ; Sat, 26 Jul 2025 03:43:16 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufUsT-0001zn-Ma; Fri, 25 Jul 2025 22:43:13 -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 1ufUsP-0001qP-E8 for guix-patches@gnu.org; Fri, 25 Jul 2025 22:43:09 -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 1ufUsP-0005ll-4t for guix-patches@gnu.org; Fri, 25 Jul 2025 22:43:09 -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=3gdxZJdNfFh2c2rq4X+wxNGDDOee00WG4raLhc1wULA=; b=Mya9UzyfqD/7zYeasWRQ0iEtC4LwVlTu3+Jqqm3tbinBsTbaS7oXUklFOY7IPf8ozzt+IqVhPk4S3o7ytsTx8H7HleFC07sSn1d9lahoN0oEZbDc/LCfHiy84QwJU95f30UqYwyNn6DgmSkp5tXTZ52qOfQIObL36m6wLhoYKO2mXHrKFI+yLXMq+yXq/A7AKSswlHrS89os61UeVMpR5cND/MbjxlleVAoqayBVt+KTbOpUQ9Gu00fkeqRUS1V/qb1wIRB1OVWJAY2hEinGx1C2wl12InuXYvgIt3KkvSykQ4HDbi0HCwwl3Z5PNy7nxGnrehFJUdBGBlp0i4Rffg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ufUsO-00082b-Oh for guix-patches@gnu.org; Fri, 25 Jul 2025 22:43:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79099] [PATCH 33/34] gnu/packages/z*.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:08 +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.175349775130749 (code B ref 79099); Sat, 26 Jul 2025 02:43:08 +0000 Received: (at 79099) by debbugs.gnu.org; 26 Jul 2025 02:42:31 +0000 Received: from localhost ([127.0.0.1]:38182 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ufUrk-0007zn-Sz for submit@debbugs.gnu.org; Fri, 25 Jul 2025 22:42:31 -0400 Received: from 2.mo563.mail-out.ovh.net ([46.105.33.33]:49677) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ufUpq-0007jj-HR for 79099@debbugs.gnu.org; Fri, 25 Jul 2025 22:40:53 -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 4bpprF4YTCz5xbf; Sat, 26 Jul 2025 02:40:29 +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:29 +0000 (UTC) Received: from mta7.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.109.254.116]) by director2.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bpprF3bMYz1xpf; Sat, 26 Jul 2025 02:40:29 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.10]) by mta7.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 2E9B6B8315C; Sat, 26 Jul 2025 02:40:29 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-105G006ebeb6b68-3ce2-452f-aea8-0745afdc183d, 7BFD41D65738CBEA4850BE66907D66307393418F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sat, 26 Jul 2025 04:39:39 +0200 Message-ID: <20250726023951.11862-33-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: 4619848793469543138 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdekhedvfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelffejteeutefhfeekfffffedvudekjeekgfeludeitdfhkeevhfeivdfhffeggeenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggeenucevlhhushhtvghrufhiiigvpeegnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeeltdelleesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeifegmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=3gdxZJdNfFh2c2rq4X+wxNGDDOee00WG4raLhc1wULA=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1753497629; v=1; b=SROGB6zwZdXFCVxs8e0Byz3l7wA7hHu7wj/nNeKIwCX1Wpv/Zi572k4k1a8iNbWL6Ku6Elel ZXZxkmOxdQahXqxjuTmlA371NSPHFq1Dg5kmyD5yjLUbSQDhoLQlZ4VPzoZXMNOL28geCwdvVpo gvT9LhUQ1DKEvFKGDeY/xK9GpTzTwKFHv/cpeqQKcokrp4bwUoQsh4YRuIWNCdAsEPBsWjbuCKN 44R2rMRkaeEE92m3JrSdF5L5Xb5aPGoy1x0W0Rld79sZYXN5jbrpzQIuotM5Euv21uDz3Puwpms 6QvNHnDLQOCq3Eiwcwv6Bevgk5LMaltJ1uRjIfXXt2Fzw== 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 "z*.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/zig-xyz.scm | 12 ++-- gnu/packages/zig.scm | 130 +++++++++++++++++++-------------------- 2 files changed, 71 insertions(+), 71 deletions(-) diff --git a/gnu/packages/zig-xyz.scm b/gnu/packages/zig-xyz.scm index e24c8f519f2..93943cb6cd2 100644 --- a/gnu/packages/zig-xyz.scm +++ b/gnu/packages/zig-xyz.scm @@ -258,7 +258,7 @@ (define-public zig-lsp-codegen (revision "0")) (package (name "zig-lsp-codegen") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -283,7 +283,7 @@ (define-public zig-diffz (revision "0")) (package (name "zig-diffz") - (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 @@ -308,7 +308,7 @@ (define-public zig-diffz-for-zig-zls-0.14 (package (inherit zig-diffz) (name "zig-diffz") - (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 @@ -324,7 +324,7 @@ (define-public zig-known-folders (revision "0")) (package (name "zig-known-folders") - (version (git-version "0.7.0" revision commit)) + (version (make-git-version "0.7.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -349,7 +349,7 @@ (define-public zig-known-folders-for-zig-0.14 (package (inherit base) (name "zig-known-folders") - (version (git-version "0.7.0" revision commit)) + (version (make-git-version "0.7.0" revision commit)) (source (origin (method git-fetch) @@ -482,7 +482,7 @@ (define-public zig-zigimg (revision "0")) (package (name "zig-zigimg") - (version (git-version "0.1.0" revision commit)) + (version (make-git-version "0.1.0" revision commit)) (source (origin (method git-fetch) diff --git a/gnu/packages/zig.scm b/gnu/packages/zig.scm index 6b3f66095c7..0c535622a72 100644 --- a/gnu/packages/zig.scm +++ b/gnu/packages/zig.scm @@ -326,7 +326,7 @@ (define zig-0.10.0-538-source (let ((commit "bf316e550671cc71eb498b3cf799493627bb0fdc") (revision "538")) (zig-source - (git-version "0.10.0" revision commit) + (make-git-version "0.10.0" revision commit) commit "1dchc2bp842jlw0byssqzindv8cigpqcj2hk3752667jrrww13vv"))) (define zig-0.10.0-539-patch @@ -356,7 +356,7 @@ (define zig-0.10.0-610 (package (inherit base) (name "zig") - (version (git-version "0.10.0" revision commit)) + (version (make-git-version "0.10.0" revision commit)) (source (zig-source version commit "08pm3f4hh6djl3szhqgm7fa3qisdl2xh9jrp18m0z7bk2vd0bzw7")) @@ -430,7 +430,7 @@ (define zig-0.10.0-675 (package (inherit base) (name "zig") - (version (git-version "0.10.0" revision commit)) + (version (make-git-version "0.10.0" revision commit)) (source (origin (inherit (zig-source @@ -482,7 +482,7 @@ (define zig-0.10.0-722 (package (inherit base) (name "zig") - (version (git-version "0.10.0" revision commit)) + (version (make-git-version "0.10.0" revision commit)) (source (zig-source version commit "0829wymcwph71zlwql6v7i7j9gr1m96acyp2xsr69vq2h98wmlap")) @@ -514,7 +514,7 @@ (define zig-0.10.0-747 (package (inherit base) (name "zig") - (version (git-version "0.10.0" revision commit)) + (version (make-git-version "0.10.0" revision commit)) (source (origin (inherit (zig-source @@ -548,7 +548,7 @@ (define zig-0.10.0-748 (package (inherit base) (name "zig") - (version (git-version "0.10.0" revision commit)) + (version (make-git-version "0.10.0" revision commit)) (source (zig-source version commit "1iv1wjgj0nfbb19sp3zw4d8hmrhkah4cmklzxm8c32zsg673kv3i")) @@ -576,7 +576,7 @@ (define zig-0.10.0-851 (package (inherit base) (name "zig") - (version (git-version "0.10.0" revision commit)) + (version (make-git-version "0.10.0" revision commit)) (source (zig-source version commit "026q8igib5a2wiqdxispijph7isx8g1m0p6xgclikrmwpkpr7wb8")) @@ -597,7 +597,7 @@ (define zig-0.10.0-853 (package (inherit base) (name "zig") - (version (git-version "0.10.0" revision commit)) + (version (make-git-version "0.10.0" revision commit)) (source (zig-source version commit "18lqcf3vg6yi70hk6nzyv8mzw7rlhybawspk5z9s281bqv210v5s")) @@ -620,7 +620,7 @@ (define zig-0.10.0-961 (package (inherit base) (name "zig") - (version (git-version "0.10.0" revision commit)) + (version (make-git-version "0.10.0" revision commit)) (source (zig-source version commit "0f0n2bkygj8zxri275nisia3pdv2s4fikgnsnmag42bs747zn8bz")) @@ -637,7 +637,7 @@ (define zig-0.10.0-962 (package (inherit base) (name "zig") - (version (git-version "0.10.0" revision commit)) + (version (make-git-version "0.10.0" revision commit)) (source (zig-source version commit "1yywzmxr6nwhdix5x9k5nrxa4n1nc8x8v1gqgyvwdhz47x9vw8b0")) @@ -654,7 +654,7 @@ (define zig-0.10.0-1027 (package (inherit base) (name "zig") - (version (git-version "0.10.0" revision commit)) + (version (make-git-version "0.10.0" revision commit)) (source (zig-source version commit "0w19qlzb2la5bnjalmv7n05m08lhz4x8c53hf34aqw66kagw47kj")) @@ -672,7 +672,7 @@ (define zig-0.10.0-1073 (package (inherit base) (name "zig") - (version (git-version "0.10.0" revision commit)) + (version (make-git-version "0.10.0" revision commit)) (source (zig-source version commit "1mgvi3m2aph10c1ij9b4k6xs3jbp8hbswqgdnzxdi5y0ak7h1pd4")) @@ -696,7 +696,7 @@ (define zig-0.10.0-1497 (package (inherit base) (name "zig") - (version (git-version "0.10.0" revision commit)) + (version (make-git-version "0.10.0" revision commit)) (source (zig-source version commit "0ja2555h41kibkxyyjpzrp5rradm3bknxhaspzz3brcbc6xvac21")) @@ -710,7 +710,7 @@ (define zig-0.10.0-1505-source (let ((commit "fe4ea31f7e9e1c8caea6a1df107b91e8ea1a7b8a") (revision "1505")) (zig-source - (git-version "0.10.0" revision commit) + (make-git-version "0.10.0" revision commit) commit "0q91hz824l867dlzz885i4mlkjdr0v5nfk3drsnvkvz2q52r0ffx"))) (define zig-0.10.0-1506 @@ -720,7 +720,7 @@ (define zig-0.10.0-1506 (package (inherit base) (name "zig") - (version (git-version "0.10.0" revision commit)) + (version (make-git-version "0.10.0" revision commit)) (source (zig-source version commit "17qbwknv33xi8908f1kdapvvj331bmibvvjhsza04j3siq3rpbz7")) @@ -747,7 +747,7 @@ (define zig-0.10.0-1637-source (let ((commit "4e6f21e2cb2c557b5c019f4acf445665a26edcba") (revision "1637")) (zig-source - (git-version "0.10.0" revision commit) + (make-git-version "0.10.0" revision commit) commit "1nd55j2c0br7rqx9fj6bkjyymkf1k6ms2m9f7byrc1ahggdyxrpv"))) (define zig-0.10.0-1638 @@ -757,7 +757,7 @@ (define zig-0.10.0-1638 (package (inherit base) (name "zig") - (version (git-version "0.10.0" revision commit)) + (version (make-git-version "0.10.0" revision commit)) (source (origin (inherit (zig-source @@ -790,7 +790,7 @@ (define zig-0.10.0-1657 (package (inherit base) (name "zig") - (version (git-version "0.10.0" revision commit)) + (version (make-git-version "0.10.0" revision commit)) (source (zig-source version commit "0nv16z8fm1ihszlwvdncnza0pgykj1ca87pf1w8nr8prqhsc7kj7")) @@ -807,7 +807,7 @@ (define zig-0.10.0-1681 (package (inherit base) (name "zig") - (version (git-version "0.10.0" revision commit)) + (version (make-git-version "0.10.0" revision commit)) (source (zig-source version commit "0kg1wnxxhjgd8fszbch039ngck1spyjvb1l0z2ja40ihnk5bxnsz")) @@ -824,7 +824,7 @@ (define zig-0.10.0-1712 (package (inherit base) (name "zig") - (version (git-version "0.10.0" revision commit)) + (version (make-git-version "0.10.0" revision commit)) (source (zig-source version commit "08znnqyacjkdls4dhx6mis6yi6za0zv4abi2q3xl2304yjczm288")) @@ -841,7 +841,7 @@ (define zig-0.10.0-1713 (package (inherit base) (name "zig") - (version (git-version "0.10.0" revision commit)) + (version (make-git-version "0.10.0" revision commit)) (source (zig-source version commit "1rbyqwd7iqbgwnws6rqr2d5bxxdh4z6phbg23hzm9i1xlxka6y6v")) @@ -858,7 +858,7 @@ (define zig-0.10.0-1888 (package (inherit base) (name "zig") - (version (git-version "0.10.0" revision commit)) + (version (make-git-version "0.10.0" revision commit)) (source (zig-source version commit "0kxgjzzqqknqimi0a0c75blgr2ic550nchbag4mv1yfrhr5y0x27")) @@ -875,7 +875,7 @@ (define zig-0.10.0-1891 (package (inherit base) (name "zig") - (version (git-version "0.10.0" revision commit)) + (version (make-git-version "0.10.0" revision commit)) (source (zig-source version commit "15qjgbmygk05p86wqm170lxmalq2mr9f81slf8svb7akkmx5qls2")) @@ -892,7 +892,7 @@ (define zig-0.10.0-2558 (package (inherit base) (name "zig") - (version (git-version "0.10.0" revision commit)) + (version (make-git-version "0.10.0" revision commit)) (source (zig-source version commit "0q9583w919gvi91wbp529q54ijr8pldj8s0p2yapkbniadxxil7y")) @@ -913,7 +913,7 @@ (define zig-0.10.0-2565-source (let ((commit "856a9c2e3120d9ffa1166eed13641600230946da") (revision "2565")) (zig-source - (git-version "0.10.0" revision commit) + (make-git-version "0.10.0" revision commit) commit "00wqqckiyl6c3zcvgqxssnnv4ajip872ghrgv4mfrc8sllnhkdwa"))) (define zig-0.10.0-2566 @@ -923,7 +923,7 @@ (define zig-0.10.0-2566 (package (inherit base) (name "zig") - (version (git-version "0.10.0" revision commit)) + (version (make-git-version "0.10.0" revision commit)) (source (zig-source version commit "1vy36ksv7jdxdkspi0jvmfz2xwvbc26x3rqns51wk3a39ngx1g2f")) @@ -948,7 +948,7 @@ (define zig-0.10.0-2571 (package (inherit base) (name "zig") - (version (git-version "0.10.0" revision commit)) + (version (make-git-version "0.10.0" revision commit)) (source (zig-source version commit "0hak2yydzjjn61lpbmmvkvykc1imgb92qkn90p4wi4fw9nfsqq0v")) @@ -962,7 +962,7 @@ (define zig-0.10.0-2796-source (let ((commit "42ee364e7b698822a69cba4cd2bda17868657e05") (revision "2796")) (zig-source - (git-version "0.10" revision commit) + (make-git-version "0.10" revision commit) commit "0jd9q7bk6vsvjfma8d8iic7r9hc7j6xkz1ghw2vpra5q20fl86ba"))) (define zig-0.10.0-2797 @@ -972,7 +972,7 @@ (define zig-0.10.0-2797 (package (inherit base) (name "zig") - (version (git-version "0.10.0" revision commit)) + (version (make-git-version "0.10.0" revision commit)) (source (zig-source version commit "0av4qw7a41d9jmdmyachhisq98c3vjw1dqln1lgy1y3jxjsdf27h")) @@ -995,7 +995,7 @@ (define zig-0.10.0-2824-source (let ((commit "8d88dcdc61c61e3410138f4402482131f5074a80") (revision "2824")) (zig-source - (git-version "0.10" revision commit) + (make-git-version "0.10" revision commit) commit "0xyhr98hyyb9b3c3d2lv6hxysaq1k1kmw9gynci0z9wm1y82rir8"))) (define zig-0.10.0-2838 @@ -1005,7 +1005,7 @@ (define zig-0.10.0-2838 (package (inherit base) (name "zig") - (version (git-version "0.10.0" revision commit)) + (version (make-git-version "0.10.0" revision commit)) (source (zig-source version commit "0hhz1hijg5hnw41s4p4p15gllpql5hn9my6a3d80jxv8nmd367q1")) @@ -1038,7 +1038,7 @@ (define zig-0.10.0-3660 (package (inherit base) (name "zig") - (version (git-version "0.10.0" revision commit)) + (version (make-git-version "0.10.0" revision commit)) (source (zig-source version commit "0dhcdi6008qqvy3ws2hhmj51wr213whbyghh7n9arai3zyg6y65g")) @@ -1055,7 +1055,7 @@ (define zig-0.10.0-3726 (package (inherit base) (name "zig") - (version (git-version "0.10.0" revision commit)) + (version (make-git-version "0.10.0" revision commit)) (source (zig-source version commit "148dhnzhm52lcwhvpwnnvpkpd3g6i1xh2vsac858agqr0slsd7g9")) @@ -1072,7 +1072,7 @@ (define zig-0.10.0-3728 (package (inherit base) (name "zig") - (version (git-version "0.10.0" revision commit)) + (version (make-git-version "0.10.0" revision commit)) (source (zig-source version commit "13vff9hqp83xhz0fab9wcwsf56hcz4sg3rwn1vziq85wkr9scj4b")) @@ -1089,7 +1089,7 @@ (define zig-0.10.0-3807 (package (inherit base) (name "zig") - (version (git-version "0.10.0" revision commit)) + (version (make-git-version "0.10.0" revision commit)) (source (zig-source version commit "069w7d67imdn4qgdk7acddsfwl4dhs9nzna5k4h0cza2cl0xi0ic")) @@ -1106,7 +1106,7 @@ (define zig-0.10.0-3813 (package (inherit base) (name "zig") - (version (git-version "0.10.0" revision commit)) + (version (make-git-version "0.10.0" revision commit)) (source (zig-source version commit "0dmi1d8jg7y7zgi8xyq53g4g39ba4hnigyj491a5fj8xnkxqfrrb")) @@ -1123,7 +1123,7 @@ (define zig-0.10.0-3980 (package (inherit base) (name "zig") - (version (git-version "0.10.0" revision commit)) + (version (make-git-version "0.10.0" revision commit)) (source (zig-source version commit "0h76x1ak28dv5y60r4m4y524kwmf43ridwvsx3ahfql63jwxn0m3")) @@ -1140,7 +1140,7 @@ (define zig-0.10.0-3985 (package (inherit base) (name "zig") - (version (git-version "0.10.0" revision commit)) + (version (make-git-version "0.10.0" revision commit)) (source (zig-source version commit "0w412aka8wjkkwyssqg8nvzb7qwaa29ywzwhg11bbwkpqyig36r4")) @@ -1245,7 +1245,7 @@ (define zig-0.11.0-149 (package (inherit base) (name "zig") - (version (git-version "0.11.0" revision commit)) + (version (make-git-version "0.11.0" revision commit)) (source (zig-source version commit "1kb245d4wfs1dyv7ccw3xiawasggpln9qxfqwlp4gkdg50l1qyzw")) @@ -1269,7 +1269,7 @@ (define zig-0.11.0-384 (package (inherit base) (name "zig") - (version (git-version "0.11.0" revision commit)) + (version (make-git-version "0.11.0" revision commit)) (source (zig-source version commit "0ybql8l4mg8i79n353rc7gbx88kqgd371xrlvpmy69mxdffh5bas")) @@ -1286,7 +1286,7 @@ (define zig-0.11.0-494 (package (inherit base) (name "zig") - (version (git-version "0.11.0" revision commit)) + (version (make-git-version "0.11.0" revision commit)) (source (zig-source version commit "04jb7la7ang0mip9qbrx57j1ls2n29svqafschxbh5j23pf74dql")) @@ -1310,7 +1310,7 @@ (define zig-0.11.0-587 (package (inherit base) (name "zig") - (version (git-version "0.11.0" revision commit)) + (version (make-git-version "0.11.0" revision commit)) (source (zig-source version commit "16v6yrbwg1pc888fp3cmdbk2wyz0nm8xp66a14fi3akxyavsmkxm")) @@ -1327,7 +1327,7 @@ (define zig-0.11.0-631 (package (inherit base) (name "zig") - (version (git-version "0.11.0" revision commit)) + (version (make-git-version "0.11.0" revision commit)) (source (zig-source version commit "19j3gbdsjsp602n2c1lp3i96yay94acsiasyzns8hs3v1sc952rp")) @@ -1344,7 +1344,7 @@ (define zig-0.11.0-638 (package (inherit base) (name "zig") - (version (git-version "0.11.0" revision commit)) + (version (make-git-version "0.11.0" revision commit)) (source (zig-source version commit "13620a6hlcaklmnxax4g3f4irddr9d15646s6bgn6ymwf6m4w4g0")) @@ -1361,7 +1361,7 @@ (define zig-0.11.0-702 (package (inherit base) (name "zig") - (version (git-version "0.11.0" revision commit)) + (version (make-git-version "0.11.0" revision commit)) (source (zig-source version commit "049fpdgkarp834amymw0clvsk6g20742d3940la60na03rc4vy5x")) @@ -1384,7 +1384,7 @@ (define zig-0.11.0-761 (package (inherit base) (name "zig") - (version (git-version "0.11.0" revision commit)) + (version (make-git-version "0.11.0" revision commit)) (source (zig-source version commit "0d503vq76vl7m9fcmyqwx5nljy04fvjf06wfr7q7n5ircw5wjp0s")) @@ -1401,7 +1401,7 @@ (define zig-0.11.0-1967 (package (inherit base) (name "zig") - (version (git-version "0.11.0" revision commit)) + (version (make-git-version "0.11.0" revision commit)) (source (zig-source version commit "0bah98h9rdaynwxlq4ibr925hmk69kwbrkgid2dgsksf6krb6sms")) @@ -1418,7 +1418,7 @@ (define zig-0.11.0-3245 (package (inherit base) (name "zig") - (version (git-version "0.11.0" revision commit)) + (version (make-git-version "0.11.0" revision commit)) (source (zig-source version commit "0a4pnilfc528zl9ycwsi8kaqbq6q4bw3l1cpv50fpacsxgnsfjp3")) @@ -1435,7 +1435,7 @@ (define zig-0.11.0-3344 (package (inherit base) (name "zig") - (version (git-version "0.11.0" revision commit)) + (version (make-git-version "0.11.0" revision commit)) (source (zig-source version commit "1vymn6qffmkhkl3rnp8zrxa1vwg8ayg5r2z3qz9bpfc6r2sb6ddq")) @@ -1458,7 +1458,7 @@ (define zig-0.11.0-3501 (package (inherit base) (name "zig") - (version (git-version "0.11.0" revision commit)) + (version (make-git-version "0.11.0" revision commit)) (source (zig-source version commit "0gwfnsjc3avx51cr5cwancms8s14hkrhqvk926cz3phgnn4jmpz0")) @@ -1475,7 +1475,7 @@ (define zig-0.11.0-3503 (package (inherit base) (name "zig") - (version (git-version "0.11.0" revision commit)) + (version (make-git-version "0.11.0" revision commit)) (source (zig-source version commit "09j6svmrlk9ybkz308vbdqqx87yc20yfj7jk59vj451478x4fcnb")) @@ -1492,7 +1492,7 @@ (define zig-0.11.0-3506 (package (inherit base) (name "zig") - (version (git-version "0.11.0" revision commit)) + (version (make-git-version "0.11.0" revision commit)) (source (zig-source version commit "1k5qd1pf563wi4hk4qs29sxph38n7jd4ic5w7qw80pi3aq9c9vbx")) @@ -1509,7 +1509,7 @@ (define zig-0.11.0-3604 (package (inherit base) (name "zig") - (version (git-version "0.11.0" revision commit)) + (version (make-git-version "0.11.0" revision commit)) (source (zig-source version commit "1yl91rpqsnlf38hg77phpl5hy7ds0cg57agr23hjhy50z4vdj3m4")) @@ -1580,7 +1580,7 @@ (define zig-0.12.0-109 (package (inherit base) (name "zig") - (version (git-version "0.12.0" revision commit)) + (version (make-git-version "0.12.0" revision commit)) (source (zig-source version commit "1zy19w93wrd7dfdih8hfk9h3brkgaspaa60ipcmf08hlx6z2f0bz")) @@ -1651,7 +1651,7 @@ (define zig-0.13.0-286 (package (inherit base) (name "zig") - (version (git-version "0.13.0" revision commit)) + (version (make-git-version "0.13.0" revision commit)) (source (zig-source version commit "1rnpv4lwc2jxz5yymrb4hlfy4iii48bn94rjpr3vll8yyydinpnb")) @@ -1668,7 +1668,7 @@ (define zig-0.13.0-503 (package (inherit base) (name "zig") - (version (git-version "0.13.0" revision commit)) + (version (make-git-version "0.13.0" revision commit)) (source (zig-source version commit "1i2baqav7qxv7ll94win6xfsm45dpzrwkwpayzrdll1aq9k4ywvb")) @@ -1685,7 +1685,7 @@ (define zig-0.13.0-1323 (package (inherit base) (name "zig") - (version (git-version "0.13.0" revision commit)) + (version (make-git-version "0.13.0" revision commit)) (source (zig-source version commit "1kh4iy7mk86s7fpqgrp5i2m1a3d8vhz5plmhkglzykdr3calqqhi")) @@ -1702,7 +1702,7 @@ (define zig-0.13.0-1528 (package (inherit base) (name "zig") - (version (git-version "0.13.0" revision commit)) + (version (make-git-version "0.13.0" revision commit)) (source (zig-source version commit "1a7q20wbadjqj0xmajq6f3kk9mlkz9wqgvw4zm62r5bn1xzcs5kd")) @@ -1719,7 +1719,7 @@ (define zig-0.13.0-1951 (package (inherit base) (name "zig") - (version (git-version "0.13.0" revision commit)) + (version (make-git-version "0.13.0" revision commit)) (source (zig-source version commit "094yxy3db6sjvcni4jl1d6nf46hlarhw6hnxhcw7vwq4qaj9w9xq")) @@ -1752,7 +1752,7 @@ (define zig-0.13.0-1952 (package (inherit base) (name "zig") - (version (git-version "0.13.0" revision commit)) + (version (make-git-version "0.13.0" revision commit)) (source (zig-source version commit "1ypwd8is0zmnq042qzya34jks1sfkk1grdi1asymbqnmp0c3p4m7")) @@ -1769,7 +1769,7 @@ (define zig-0.13.0-2795 (package (inherit base) (name "zig") - (version (git-version "0.13.0" revision commit)) + (version (make-git-version "0.13.0" revision commit)) (source (zig-source version commit "11v7d6f34h9mayn00la5898h34xw335rh0fp9jk1gyxvd49k92ip")) @@ -1786,7 +1786,7 @@ (define zig-0.13.0-2899 (package (inherit base) (name "zig") - (version (git-version "0.13.0" revision commit)) + (version (make-git-version "0.13.0" revision commit)) (source (zig-source version commit "13kiyr9v7p2vyqyqb5ry178d7lsd1hmkhsw5p3hal7fndy8yyrph")) @@ -1803,7 +1803,7 @@ (define zig-0.13.0-2924 (package (inherit base) (name "zig") - (version (git-version "0.13.0" revision commit)) + (version (make-git-version "0.13.0" revision commit)) (source (zig-source version commit "1ksq4yr21y28x3m0mz9vn3c30pfrcvl3av5kc9zjxyip7r9as9xp")) @@ -1820,7 +1820,7 @@ (define zig-0.13.0-2925 (package (inherit base) (name "zig") - (version (git-version "0.13.0" revision commit)) + (version (make-git-version "0.13.0" revision commit)) (source (zig-source version commit "19nxizmi0l70750kpn9fa0bdsz0arifjvrlms0zm0y7g8pzyqzvs")) @@ -1837,7 +1837,7 @@ (define zig-0.13.0-3252 (package (inherit base) (name "zig") - (version (git-version "0.13.0" revision commit)) + (version (make-git-version "0.13.0" revision commit)) (source (zig-source version commit "1hf9fvk2cm5n6ryg00w95sk50n96j5sgdnxh1bwmwcva0lib000y")) From patchwork Sat Jul 26 02:39:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43289 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 7405E27BC4D; Sat, 26 Jul 2025 03:43:17 +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 D545B27BC4B for ; Sat, 26 Jul 2025 03:43:16 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufUsR-0001sV-Bx; Fri, 25 Jul 2025 22:43:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ufUsO-0001oO-Ig 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 1ufUsO-0005lY-AC for guix-patches@gnu.org; Fri, 25 Jul 2025 22:43:08 -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=9Z0P3Nwa9DDoZqkGJlySx5+uZ1CHHHkp5pPD1HNOr3I=; b=NXScAzDzy1skNLWhmywOUO2K8pPhFn+8O6Kog+tHzBNLbFgyDG6dz0FV2OTSwdLW0wfGjkS899w8smNbGev8iH6ZVcv3X/HCRC1+XhguGlgeSz5UI+F9RdEkydUA4K4oweJxb2RijnWYiCxvQ3BlCeOHJpbGbIP8wWD6NHmvzutYUtVC05Xxe5JFxRiRCRKWf5ZAXI1MRMZwULg9mkoNp2ycU/JIHQECIe3ctxdustw0gmClir+lpn8K10fGLK0hQAb7JtjRiFpBHLAhGyuwiAoMl5llftEuG7jpHJb34o3dikgHJavWCMLCa6ay8vI3wqqRqVStJfjbrNKmqiQBOA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ufUsO-00082T-1n for guix-patches@gnu.org; Fri, 25 Jul 2025 22:43:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79099] [PATCH 34/34] gnu: ufoai: Use git-file-name. 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.175349774830737 (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]:38180 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ufUrj-0007za-V2 for submit@debbugs.gnu.org; Fri, 25 Jul 2025 22:42:28 -0400 Received: from 7.mo563.mail-out.ovh.net ([46.105.59.58]:48271) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ufUpr-0007kv-Fn for 79099@debbugs.gnu.org; Fri, 25 Jul 2025 22:40:50 -0400 Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net [79.137.60.37]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4bpprG3fYJz5wr2; Sat, 26 Jul 2025 02:40:30 +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:30 +0000 (UTC) Received: from mta3.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.43.5]) by director4.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bpprG2NcMz1xx9; Sat, 26 Jul 2025 02:40:30 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.5]) by mta3.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 0295F94313E; Sat, 26 Jul 2025 02:40:29 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-101G00477eca328-2816-4795-af2a-cec1cab464ba, 7BFD41D65738CBEA4850BE66907D66307393418F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sat, 26 Jul 2025 04:39:40 +0200 Message-ID: <20250726023951.11862-34-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: 4620130267982979810 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdekhedvfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvfffhveegveelfefgfffgtdeuhffhuddtgeffveduheevudehgfegledvffetueenucffohhmrghinhepshhfrdhnvghtnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejledtleelseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehieefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=9Z0P3Nwa9DDoZqkGJlySx5+uZ1CHHHkp5pPD1HNOr3I=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1753497630; v=1; b=smZ08rrZmcln5SkW6WuMIjv1eb/w596pSg4D6e2ips4XX0/tCUGPEwmXWI8+5pQwJEqCG/Ck zhKxXkMdYuauFho6ctASAF9Q97o+g18A290KMneyo45HYZZly3t75w9hnj777ya4J+ZkqLSParw ul040soXTU3+KhUwX040d/7l3xr1iaenMTacgW0hBSQOQhoY8UKC/24x8zFBRBry+HqUiJlzkMm 8rnCTmIPpTbAE9SiUB4wjJouuPN/wG1wVesmk/FQwEdLCVn2/nmTKq4oIwDjk3YbI2AjHSyQ3cX QEuEYWlSmv/GNcIy0YxRbk3UaV8WzN5a8ec1TFQE08BAA== 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 "*.scm" -exec sed -i 's/(git-version "/(make-git-version "/g' {} + This find requires a little more caution, that's why it's separated from the other commit. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index f43c85bc789..7245767565d 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3482,14 +3482,14 @@ (define-public tetzle (define %ufoai-commit "a542a87a891f96b1ab2c44d35b2f6f16859a5019") (define %ufoai-revision "0") -(define %ufoai-version (git-version "2.6.0_dev" %ufoai-revision %ufoai-commit)) +(define %ufoai-version (make-git-version "2.6.0_dev" %ufoai-revision %ufoai-commit)) (define ufoai-source (origin (method git-fetch) (uri (git-reference (url "git://git.code.sf.net/p/ufoai/code") ;HTTPS fails mid-clone (commit %ufoai-commit))) - (file-name (string-append "ufoai-" %ufoai-version "-checkout")) + (file-name (git-file-name "ufoai" %ufoai-version)) (sha256 (base32 "024s7b9rcg7iw8i2p72gwnvabk23ljlq0nldws0y4b6hpwzyn1wz"))