[PATCH 00/34] git-version rewrite

  • Open
  • quality assurance status badge
Details
2 participants
  • Nicolas Graves
  • Simon Tournier
Owner
unassigned
Submitted by
Nicolas Graves
Severity
normal

Debbugs page

N
N
Nicolas Graves wrote on 25 Jul 19:36 -0700
(address . guix-patches@gnu.org)(name . Nicolas Graves)(address . ngraves@ngraves.fr)
20250726023730.10578-1-ngraves@ngraves.fr
*** BLURB HERE ***

Nicolas Graves (34):
gnu: packages: Use git-file-name.
gnu: uxn: Use git-file-name.
gnu: sbcl-cl-xmlspam: Use git-file-name.
POC git-version
gnu: orthanc-postgresql: Set version with vc-version.
gnu: orthanc-mysql: Set version with vc-version.
gnu: gemmlowp-for-tensorflow: Set version with vc-version.
gnu: t-todo-manager: Set version with vc-version.
gnu: emacs-company-box: Set version without git-version.
gnu/packages/a*.scm: Use make-git-version.
gnu/packages/b*.scm: Use make-git-version.
gnu/packages/c*.scm: Use make-git-version.
gnu/packages/d*.scm: Use make-git-version.
gnu/packages/e*.scm: Use make-git-version.
gnu/packages/f*.scm: Use make-git-version.
gnu/packages/g*.scm: Use make-git-version.
gnu/packages/h*.scm: Use make-git-version.
gnu/packages/i*.scm: Use make-git-version.
gnu/packages/j*.scm: Use make-git-version.
gnu/packages/k*.scm: Use make-git-version.
gnu/packages/l*.scm: Use make-git-version.
gnu/packages/m*.scm: Use make-git-version.
gnu/packages/n*.scm: Use make-git-version.
gnu/packages/o*.scm: Use make-git-version.
gnu/packages/p*.scm: Use make-git-version.
gnu/packages/q*.scm: Use make-git-version.
gnu/packages/r*.scm: Use make-git-version.
gnu/packages/s*.scm: Use make-git-version.
gnu/packages/t*.scm: Use make-git-version.
gnu/packages/v*.scm: Use make-git-version.
gnu/packages/w*.scm: Use make-git-version.
gnu/packages/x*.scm: Use make-git-version.
gnu/packages/z*.scm: Use make-git-version.
gnu: ufoai: Use git-file-name.

gnu/packages/accessibility.scm | 2 +-
gnu/packages/admin.scm | 22 +-
gnu/packages/agda.scm | 4 +-
gnu/packages/aidc.scm | 2 +-
gnu/packages/algebra.scm | 7 +-
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 | 40 +-
gnu/packages/autotools.scm | 2 +-
gnu/packages/axoloti.scm | 2 +-
gnu/packages/benchmark.scm | 4 +-
gnu/packages/bioconductor.scm | 12 +-
gnu/packages/bioinformatics.scm | 294 +++---
gnu/packages/bittorrent.scm | 2 +-
gnu/packages/boost.scm | 4 +-
gnu/packages/bootloaders.scm | 8 +-
gnu/packages/bqn.scm | 4 +-
gnu/packages/browser-extensions.scm | 4 +-
gnu/packages/build-tools.scm | 10 +-
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 +-
gnu/packages/darwin.scm | 6 +-
gnu/packages/databases.scm | 4 +-
gnu/packages/datastructures.scm | 5 +-
gnu/packages/debian.scm | 2 +-
gnu/packages/debug.scm | 10 +-
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 +-
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 | 1017 +++++++++----------
gnu/packages/emacs.scm | 4 +-
gnu/packages/embedded.scm | 20 +-
gnu/packages/emulators.scm | 41 +-
gnu/packages/engineering.scm | 48 +-
gnu/packages/erlang.scm | 2 +-
gnu/packages/esolangs.scm | 2 +-
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 | 36 +-
gnu/packages/fontutils.scm | 2 +-
gnu/packages/fpga.scm | 14 +-
gnu/packages/freedesktop.scm | 14 +-
gnu/packages/game-development.scm | 19 +-
gnu/packages/games.scm | 60 +-
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 | 14 +-
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/graph.scm | 2 +-
gnu/packages/graphics.scm | 31 +-
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 | 10 +-
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 +-
gnu/packages/idris.scm | 10 +-
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 +-
gnu/packages/jami.scm | 4 +-
gnu/packages/java.scm | 14 +-
gnu/packages/javascript.scm | 2 +-
gnu/packages/julia-xyz.scm | 10 +-
gnu/packages/julia.scm | 2 +-
gnu/packages/kde-pim.scm | 2 +-
gnu/packages/kde-plasma.scm | 2 +-
gnu/packages/kde-utils.scm | 14 +-
gnu/packages/kodi.scm | 10 +-
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 | 38 +-
gnu/packages/lisp-check.scm | 60 +-
gnu/packages/lisp-xyz.scm | 1416 +++++++++++++--------------
gnu/packages/lisp.scm | 6 +-
gnu/packages/logging.scm | 2 +-
gnu/packages/lua.scm | 2 +-
gnu/packages/luanti.scm | 10 +-
gnu/packages/machine-learning.scm | 46 +-
gnu/packages/mail.scm | 20 +-
gnu/packages/maths.scm | 44 +-
gnu/packages/matrix.scm | 2 +-
gnu/packages/medical.scm | 4 +-
gnu/packages/messaging.scm | 19 +-
gnu/packages/monitoring.scm | 4 +-
gnu/packages/mp3.scm | 2 +-
gnu/packages/multiprecision.scm | 2 +-
gnu/packages/music.scm | 82 +-
gnu/packages/networking.scm | 14 +-
gnu/packages/node-xyz.scm | 4 +-
gnu/packages/nutrition.scm | 2 +-
gnu/packages/ocaml.scm | 18 +-
gnu/packages/ocr.scm | 2 +-
gnu/packages/opencog.scm | 12 +-
gnu/packages/package-management.scm | 14 +-
gnu/packages/parallel.scm | 13 +-
gnu/packages/pascal.scm | 2 +-
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/pumpio.scm | 2 +-
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 +-
gnu/packages/qt.scm | 22 +-
gnu/packages/radio.scm | 40 +-
gnu/packages/raspberry-pi.scm | 8 +-
gnu/packages/rdf.scm | 2 +-
gnu/packages/robotics.scm | 8 +-
gnu/packages/ruby-xyz.scm | 42 +-
gnu/packages/rust.scm | 2 +-
gnu/packages/scanner.scm | 2 +-
gnu/packages/scheme.scm | 16 +-
gnu/packages/sdl.scm | 2 +-
gnu/packages/search.scm | 2 +-
gnu/packages/selinux.scm | 2 +-
gnu/packages/serialization.scm | 4 +-
gnu/packages/shells.scm | 8 +-
gnu/packages/shellutils.scm | 6 +-
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 | 6 +-
gnu/packages/syncthing.scm | 2 +-
gnu/packages/syndication.scm | 2 +-
gnu/packages/task-management.scm | 6 +-
gnu/packages/tcl.scm | 2 +-
gnu/packages/telegram.scm | 14 +-
gnu/packages/telephony.scm | 6 +-
gnu/packages/terminals.scm | 10 +-
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 +-
gnu/packages/version-control.scm | 14 +-
gnu/packages/video.scm | 18 +-
gnu/packages/vim.scm | 58 +-
gnu/packages/vnc.scm | 2 +-
gnu/packages/vpn.scm | 2 +-
gnu/packages/vulkan.scm | 2 +-
gnu/packages/web-browsers.scm | 6 +-
gnu/packages/web.scm | 32 +-
gnu/packages/wm.scm | 28 +-
gnu/packages/wxwidgets.scm | 2 +-
gnu/packages/xdisorg.scm | 14 +-
gnu/packages/xiph.scm | 2 +-
gnu/packages/xml.scm | 2 +-
gnu/packages/xorg.scm | 4 +-
gnu/packages/zig-xyz.scm | 12 +-
gnu/packages/zig.scm | 130 +--
gnu/packages/zile.scm | 2 +-
guix/git-download.scm | 30 +-
guix/packages.scm | 51 +-
222 files changed, 2657 insertions(+), 2554 deletions(-)

--
2.50.1
N
N
Nicolas Graves wrote on 25 Jul 19:39 -0700
[PATCH 14/34] gnu/packages/e*.scm: Use make-git-version.
(address . 79099@debbugs.gnu.org)(name . Nicolas Graves)(address . ngraves@ngraves.fr)
20250726023951.11862-14-ngraves@ngraves.fr
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(-)

Toggle diff (547 lines)
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
This message was truncated. Download the full message here.
N
N
Nicolas Graves wrote on 25 Jul 19:39 -0700
[PATCH 21/34] gnu/packages/l*.scm: Use make-git-version.
(address . 79099@debbugs.gnu.org)(name . Nicolas Graves)(address . ngraves@ngraves.fr)
20250726023951.11862-21-ngraves@ngraves.fr
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(-)

Toggle diff (550 lines)
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-ver
This message was truncated. Download the full message here.
N
N
Nicolas Graves wrote on 25 Jul 19:39 -0700
[PATCH 02/34] gnu: uxn: Use git-file-name.
(address . 79099@debbugs.gnu.org)(name . Nicolas Graves)(address . ngraves@ngraves.fr)
20250726023951.11862-2-ngraves@ngraves.fr
* gnu/packages/emulators.scm (uxn)[source]<file-name>: Set it
using git-file-name.
---
gnu/packages/emulators.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (15 lines)
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"))))
--
2.50.1
N
N
Nicolas Graves wrote on 25 Jul 19:39 -0700
[PATCH 07/34] gnu: gemmlowp-for-tensorflow: Set version with vc-version.
(address . 79099@debbugs.gnu.org)(name . Nicolas Graves)(address . ngraves@ngraves.fr)
20250726023951.11862-7-ngraves@ngraves.fr
* 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(-)

Toggle diff (15 lines)
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/"
--
2.50.1
N
N
Nicolas Graves wrote on 25 Jul 19:39 -0700
[PATCH 03/34] gnu: sbcl-cl-xmlspam: Use git-file-name.
(address . 79099@debbugs.gnu.org)(name . Nicolas Graves)(address . ngraves@ngraves.fr)
20250726023951.11862-3-ngraves@ngraves.fr
* gnu/packages/emulators.scm (sbcl-cl-xmlspam)[source]<file-name>: Set
it using git-file-name.
---
gnu/packages/lisp-xyz.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (15 lines)
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"))))
--
2.50.1
N
N
Nicolas Graves wrote on 25 Jul 19:39 -0700
[PATCH 08/34] gnu: t-todo-manager: Set version with vc-version.
(address . 79099@debbugs.gnu.org)(name . Nicolas Graves)(address . ngraves@ngraves.fr)
20250726023951.11862-8-ngraves@ngraves.fr
* 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(-)

Toggle diff (15 lines)
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)
--
2.50.1
N
N
Nicolas Graves wrote on 25 Jul 19:39 -0700
[PATCH 01/34] gnu: packages: Use git-file-name.
(address . 79099@debbugs.gnu.org)(name . Nicolas Graves)(address . ngraves@ngraves.fr)
20250726023951.11862-1-ngraves@ngraves.fr
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(-)

Toggle diff (296 lines)
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
This message was truncated. Download the full message here.
N
N
Nicolas Graves wrote on 25 Jul 19:39 -0700
[PATCH 13/34] gnu/packages/d*.scm: Use make-git-version.
(address . 79099@debbugs.gnu.org)(name . Nicolas Graves)(address . ngraves@ngraves.fr)
20250726023951.11862-13-ngraves@ngraves.fr
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(-)

Toggle diff (366 lines)
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)
--
2.50.1
N
N
Nicolas Graves wrote on 25 Jul 19:39 -0700
[PATCH 05/34] gnu: orthanc-postgresql: Set version with vc-version.
(address . 79099@debbugs.gnu.org)(name . Nicolas Graves)(address . ngraves@ngraves.fr)
20250726023951.11862-5-ngraves@ngraves.fr
* gnu/packages/medical.scm (orthanc-postgresql)[version]: Set it
using vc-version.
---
gnu/packages/medical.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (15 lines)
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)
--
2.50.1
N
N
Nicolas Graves wrote on 25 Jul 19:39 -0700
[PATCH 04/34] POC git-version
(address . 79099@debbugs.gnu.org)(name . Nicolas Graves)(address . ngraves@ngraves.fr)
20250726023951.11862-4-ngraves@ngraves.fr
---
guix/git-download.scm | 30 +++++++++++++++++++++----
guix/packages.scm | 51 ++++++++++++++++++++++++++++++++++++++-----
2 files changed, 72 insertions(+), 9 deletions(-)

Toggle diff (153 lines)
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 <http://www.gnu.org/licenses/>.
(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
+ (($ <git-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*
+ 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: <https://issues.guix.gnu.org/52694>.
@@ -614,7 +623,8 @@ (define-record-type* <package>
package?
this-package
(name package-name) ; string
- (version package-version) ; string
+ (version %package-version ; <git-version> instance or string
+ (sanitize warn-unexpected-package-version))
(source package-source) ; <origin> instance
(build-system package-build-system) ; <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>
+ 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)
+ (($ <git-version> 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 <git-version> instances and strings.")))
+ value)
--
2.50.1
N
N
Nicolas Graves wrote on 25 Jul 19:39 -0700
[PATCH 12/34] gnu/packages/c*.scm: Use make-git-version.
(address . 79099@debbugs.gnu.org)(name . Nicolas Graves)(address . ngraves@ngraves.fr)
20250726023951.11862-12-ngraves@ngraves.fr
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(-)

Toggle diff (513 lines)
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))
+
This message was truncated. Download the full message here.
N
N
Nicolas Graves wrote on 25 Jul 19:39 -0700
[PATCH 06/34] gnu: orthanc-mysql: Set version with vc-version.
(address . 79099@debbugs.gnu.org)(name . Nicolas Graves)(address . ngraves@ngraves.fr)
20250726023951.11862-6-ngraves@ngraves.fr
* gnu/packages/medical.scm (orthanc-mysql)[version]: Set it using
vc-version.
---
gnu/packages/medical.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (15 lines)
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)
--
2.50.1
N
N
Nicolas Graves wrote on 25 Jul 19:39 -0700
[PATCH 09/34] gnu: emacs-company-box: Set version without git-version.
(address . 79099@debbugs.gnu.org)(name . Nicolas Graves)(address . ngraves@ngraves.fr)
20250726023951.11862-9-ngraves@ngraves.fr
* 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(-)

Toggle diff (15 lines)
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))
--
2.50.1
N
N
Nicolas Graves wrote on 25 Jul 19:39 -0700
[PATCH 17/34] gnu/packages/h*.scm: Use make-git-version.
(address . 79099@debbugs.gnu.org)(name . Nicolas Graves)(address . ngraves@ngraves.fr)
20250726023951.11862-17-ngraves@ngraves.fr
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(-)

Toggle diff (135 lines)
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.
--
2.50.1
N
N
Nicolas Graves wrote on 25 Jul 19:39 -0700
[PATCH 10/34] gnu/packages/a*.scm: Use make-git-version.
(address . 79099@debbugs.gnu.org)(name . Nicolas Graves)(address . ngraves@ngraves.fr)
20250726023951.11862-10-ngraves@ngraves.fr
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(-)

Toggle diff (509 lines)
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
This message was truncated. Download the full message here.
N
N
Nicolas Graves wrote on 25 Jul 19:39 -0700
[PATCH 15/34] gnu/packages/f*.scm: Use make-git-version.
(address . 79099@debbugs.gnu.org)(name . Nicolas Graves)(address . ngraves@ngraves.fr)
20250726023951.11862-15-ngraves@ngraves.fr
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(-)

Toggle diff (478 lines)
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)
--
2.50.1
N
N
Nicolas Graves wrote on 25 Jul 19:39 -0700
[PATCH 19/34] gnu/packages/j*.scm: Use make-git-version.
(address . 79099@debbugs.gnu.org)(name . Nicolas Graves)(address . ngraves@ngraves.fr)
20250726023951.11862-19-ngraves@ngraves.fr
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(-)

Toggle diff (95 lines)
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)
--
2.50.1
N
N
Nicolas Graves wrote on 25 Jul 19:39 -0700
[PATCH 20/34] gnu/packages/k*.scm: Use make-git-version.
(address . 79099@debbugs.gnu.org)(name . Nicolas Graves)(address . ngraves@ngraves.fr)
20250726023951.11862-20-ngraves@ngraves.fr
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(-)

Toggle diff (95 lines)
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
--
2.50.1
N
N
Nicolas Graves wrote on 25 Jul 19:39 -0700
[PATCH 23/34] gnu/packages/n*.scm: Use make-git-version.
(address . 79099@debbugs.gnu.org)(name . Nicolas Graves)(address . ngraves@ngraves.fr)
20250726023951.11862-23-ngraves@ngraves.fr
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(-)

Toggle diff (104 lines)
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)
--
2.50.1
N
N
Nicolas Graves wrote on 25 Jul 19:39 -0700
[PATCH 26/34] gnu/packages/q*.scm: Use make-git-version.
(address . 79099@debbugs.gnu.org)(name . Nicolas Graves)(address . ngraves@ngraves.fr)
20250726023951.11862-26-ngraves@ngraves.fr
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(-)

Toggle diff (105 lines)
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
--
2.50.1
N
N
Nicolas Graves wrote on 25 Jul 19:39 -0700
[PATCH 16/34] gnu/packages/g*.scm: Use make-git-version.
(address . 79099@debbugs.gnu.org)(name . Nicolas Graves)(address . ngraves@ngraves.fr)
20250726023951.11862-16-ngraves@ngraves.fr
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(-)

Toggle diff (501 lines)
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
This message was truncated. Download the full message here.
N
N
Nicolas Graves wrote on 25 Jul 19:39 -0700
[PATCH 18/34] gnu/packages/i*.scm: Use make-git-version.
(address . 79099@debbugs.gnu.org)(name . Nicolas Graves)(address . ngraves@ngraves.fr)
20250726023951.11862-18-ngraves@ngraves.fr
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(-)

Toggle diff (190 lines)
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)
--
2.50.1
N
N
Nicolas Graves wrote on 25 Jul 19:39 -0700
[PATCH 32/34] gnu/packages/x*.scm: Use make-git-version.
(address . 79099@debbugs.gnu.org)(name . Nicolas Graves)(address . ngraves@ngraves.fr)
20250726023951.11862-32-ngraves@ngraves.fr
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(-)

Toggle diff (99 lines)
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
--
2.50.1
N
N
Nicolas Graves wrote on 25 Jul 19:39 -0700
[PATCH 11/34] gnu/packages/b*.scm: Use make-git-version.
(address . 79099@debbugs.gnu.org)(name . Nicolas Graves)(address . ngraves@ngraves.fr)
20250726023951.11862-11-ngraves@ngraves.fr
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(-)

Toggle diff (542 lines)
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
(met
This message was truncated. Download the full message here.
N
N
Nicolas Graves wrote on 25 Jul 19:39 -0700
[PATCH 34/34] gnu: ufoai: Use git-file-name.
(address . 79099@debbugs.gnu.org)(name . Nicolas Graves)(address . ngraves@ngraves.fr)
20250726023951.11862-34-ngraves@ngraves.fr
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(-)

Toggle diff (23 lines)
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"))
--
2.50.1
N
N
Nicolas Graves wrote on 25 Jul 19:39 -0700
[PATCH 33/34] gnu/packages/z*.scm: Use make-git-version.
(address . 79099@debbugs.gnu.org)(name . Nicolas Graves)(address . ngraves@ngraves.fr)
20250726023951.11862-33-ngraves@ngraves.fr
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(-)

Toggle diff (519 lines)
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))
(sou
This message was truncated. Download the full message here.
N
N
Nicolas Graves wrote on 25 Jul 19:39 -0700
[PATCH 24/34] gnu/packages/o*.scm: Use make-git-version.
(address . 79099@debbugs.gnu.org)(name . Nicolas Graves)(address . ngraves@ngraves.fr)
20250726023951.11862-24-ngraves@ngraves.fr
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(-)

Toggle diff (158 lines)
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
--
2.50.1
N
N
Nicolas Graves wrote on 25 Jul 19:39 -0700
[PATCH 22/34] gnu/packages/m*.scm: Use make-git-version.
(address . 79099@debbugs.gnu.org)(name . Nicolas Graves)(address . ngraves@ngraves.fr)
20250726023951.11862-22-ngraves@ngraves.fr
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(-)

Toggle diff (543 lines)
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/
This message was truncated. Download the full message here.
N
N
Nicolas Graves wrote on 25 Jul 19:39 -0700
[PATCH 25/34] gnu/packages/p*.scm: Use make-git-version.
(address . 79099@debbugs.gnu.org)(name . Nicolas Graves)(address . ngraves@ngraves.fr)
20250726023951.11862-25-ngraves@ngraves.fr
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(-)

Toggle diff (514 lines)
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
This message was truncated. Download the full message here.
N
N
Nicolas Graves wrote on 25 Jul 19:39 -0700
[PATCH 29/34] gnu/packages/t*.scm: Use make-git-version.
(address . 79099@debbugs.gnu.org)(name . Nicolas Graves)(address . ngraves@ngraves.fr)
20250726023951.11862-29-ngraves@ngraves.fr
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(-)

Toggle diff (501 lines)
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
;; <https://raw.githubusercontent.com/savoirfairelinux/pjproject/master/version.mak>.
- (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 commi
This message was truncated. Download the full message here.
N
N
Nicolas Graves wrote on 25 Jul 19:39 -0700
[PATCH 28/34] gnu/packages/s*.scm: Use make-git-version.
(address . 79099@debbugs.gnu.org)(name . Nicolas Graves)(address . ngraves@ngraves.fr)
20250726023951.11862-28-ngraves@ngraves.fr
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(-)

Toggle diff (518 lines)
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")
-
This message was truncated. Download the full message here.
N
N
Nicolas Graves wrote on 25 Jul 19:39 -0700
[PATCH 27/34] gnu/packages/r*.scm: Use make-git-version.
(address . 79099@debbugs.gnu.org)(name . Nicolas Graves)(address . ngraves@ngraves.fr)
20250726023951.11862-27-ngraves@ngraves.fr
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(-)

Toggle diff (440 lines)
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"))
--
2.50.1
N
N
Nicolas Graves wrote on 25 Jul 19:39 -0700
[PATCH 31/34] gnu/packages/w*.scm: Use make-git-version.
(address . 79099@debbugs.gnu.org)(name . Nicolas Graves)(address . ngraves@ngraves.fr)
20250726023951.11862-31-ngraves@ngraves.fr
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(-)

Toggle diff (286 lines)
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
--
2.50.1
N
N
Nicolas Graves wrote on 25 Jul 19:39 -0700
[PATCH 30/34] gnu/packages/v*.scm: Use make-git-version.
(address . 79099@debbugs.gnu.org)(name . Nicolas Graves)(address . ngraves@ngraves.fr)
20250726023951.11862-30-ngraves@ngraves.fr
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(-)

Toggle diff (337 lines)
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)
--
2.50.1
S
S
Simon Tournier wrote on 22 Aug 05:32 -0700
Re: [bug#79099] [PATCH 00/34] git-version rewrite
(name . Nicolas Graves)(address . ngraves@ngraves.fr)
87h5xzwn8i.fsf@gmail.com
Hi Nicolas,

On Sat, 26 Jul 2025 at 04:36, Nicolas Graves via Guix-patches via <guix-patches@gnu.org> wrote:

Toggle quote (12 lines)
> Nicolas Graves (34):
> gnu: packages: Use git-file-name.
> gnu: uxn: Use git-file-name.
> gnu: sbcl-cl-xmlspam: Use git-file-name.
> POC git-version
> gnu: orthanc-postgresql: Set version with vc-version.
> gnu: orthanc-mysql: Set version with vc-version.
> gnu: gemmlowp-for-tensorflow: Set version with vc-version.
> gnu: t-todo-manager: Set version with vc-version.
> gnu: emacs-company-box: Set version without git-version.
> gnu/packages/a*.scm: Use make-git-version.

[...]

Toggle quote (2 lines)
> gnu: ufoai: Use git-file-name.

I guess this issue is the counter-part of [1].

Therefore, how is it going on QA?

Cheers,
simon

N
N
Nicolas Graves wrote on 22 Aug 11:16 -0700
(name . Simon Tournier)(address . zimon.toutoune@gmail.com)
101682332.23642026.1755886575080.JavaMail.zimbra@ngraves.fr
Toggle quote (4 lines)
> I guess this issue is the counter-part of [1].

> Therefore, how is it going on QA?

The issue is that since the scope of changes is huge, both times I tried to evaluate that through QA resulted in a failure to merge, because while patches were processed, changes in the source code happened.

I tried asking for opening a branch on CI, which would be another way to check that there are no rebuilds (if no rebuilds are necessary compared to master). I can update the -dev branch, but not until Sunday afternoon at least. If you can rebase it (simply always select the upstream version, the worst case is a CLI warning) on master and create a branch, we can see / check if there are some unexpected rebuilds.

Cheers,
Nicolas

N
N
Nicolas Graves wrote on 22 Aug 11:46 -0700
(name . Simon Tournier)(address . zimon.toutoune@gmail.com)(name . Nicolas Graves via Guix-patches via)(address . guix-patches@gnu.org)
1918454289.23669690.1755888374003.JavaMail.zimbra@ngraves.fr
-----Original Message-----
From: Nicolas <ngraves@ngraves.fr>
To: Simon <zimon.toutoune@gmail.com>
Cc: Nicolas <guix-patches@gnu.org>; 79099 <79099@debbugs.gnu.org>
Date: Friday, 22 August 2025 8:16 PM CEST
Subject: Re: [bug#79099] [PATCH 00/34] git-version rewrite



Toggle quote (4 lines)
> I guess this issue is the counter-part of [1].

> Therefore, how is it going on QA?

The issue is that since the scope of changes is huge, both times I tried to evaluate that through QA resulted in a failure to merge, because while patches were processed, changes in the source code happened.

I tried asking for opening a branch on CI, which would be another way to check that there are no rebuilds (if no rebuilds are necessary compared to master). I can update the -dev branch, but not until Sunday afternoon at least. If you can rebase it (simply always select the upstream version, the worst case is a CLI warning) on master and create a branch, we can see / check if there are some unexpected rebuilds.

Cheers,
Nicolas

N
N
Nicolas Graves wrote on 22 Aug 11:46 -0700
(name . Simon Tournier)(address . zimon.toutoune@gmail.com)(address . 79099@debbugs.gnu.org)
1978416988.23669837.1755888418125.JavaMail.zimbra@ngraves.fr
-----Original Message-----
From: Simon <zimon.toutoune@gmail.com>
To: Nicolas <guix-patches@gnu.org>; 79099 <79099@debbugs.gnu.org>
Cc: Nicolas <ngraves@ngraves.fr>
Date: Friday, 22 August 2025 3:48 PM CEST
Subject: Re: [bug#79099] [PATCH 00/34] git-version rewrite


Hi Nicolas,

On Sat, 26 Jul 2025 at 04:36, Nicolas Graves via Guix-patches via <guix-patches@gnu.org> wrote:

Toggle quote (12 lines)
> Nicolas Graves (34):
> gnu: packages: Use git-file-name.
> gnu: uxn: Use git-file-name.
> gnu: sbcl-cl-xmlspam: Use git-file-name.
> POC git-version
> gnu: orthanc-postgresql: Set version with vc-version.
> gnu: orthanc-mysql: Set version with vc-version.
> gnu: gemmlowp-for-tensorflow: Set version with vc-version.
> gnu: t-todo-manager: Set version with vc-version.
> gnu: emacs-company-box: Set version without git-version.
> gnu/packages/a*.scm: Use make-git-version.

[...]

Toggle quote (2 lines)
> gnu: ufoai: Use git-file-name.

I guess this issue is the counter-part of [1].

Therefore, how is it going on QA?

Cheers,
simon

?
Your comment

Commenting via the web interface is currently disabled.

To comment on this conversation send an email to 79099@patchwise.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 79099
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch