diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm
index 356aaacbc83..b7bb0def2c9 100644
--- a/gnu/packages/language.scm
+++ b/gnu/packages/language.scm
@@ -401,7 +401,7 @@ (define-public liblouisutdml
         (revision "0"))
     (package
       (name "liblouisutdml")
-      (version (git-version "2.12.0" revision commit))
+      (version (make-git-version "2.12.0" revision commit))
       (source
        (origin
          (method git-fetch)
diff --git a/gnu/packages/lesstif.scm b/gnu/packages/lesstif.scm
index 01ca9a99fa2..1ba6cacd3a3 100644
--- a/gnu/packages/lesstif.scm
+++ b/gnu/packages/lesstif.scm
@@ -61,7 +61,7 @@ (define-public motif
         (revision "0"))
     (package
       (name "motif")
-      (version (git-version "2.3.8" revision commit))
+      (version (make-git-version "2.3.8" revision commit))
       (source
        (origin
          (method git-fetch)
diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm
index be9086d7cef..e2d2a49f7b8 100644
--- a/gnu/packages/libevent.scm
+++ b/gnu/packages/libevent.scm
@@ -197,7 +197,7 @@ (define-public libuv-julia
     (package
       (inherit libuv)
       (name "libuv-julia")
-      (version (git-version "2.0.0" revision commit))
+      (version (make-git-version "2.0.0" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm
index eb6dc9a844a..a95cc126c55 100644
--- a/gnu/packages/libusb.scm
+++ b/gnu/packages/libusb.scm
@@ -148,7 +148,7 @@ (define-public libusb4java
         (revision "1"))
     (package
       (name "libusb4java")
-      (version (git-version "1.3.1" revision commit))
+      (version (make-git-version "1.3.1" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index 9b84a5b3a9a..8b46078772d 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -66,7 +66,7 @@ (define-public bcunit
         (revision "0"))
     (package
       (name "bcunit")
-      (version (git-version "3.0.2" revision commit))
+      (version (make-git-version "3.0.2" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -917,7 +917,7 @@ (define-public msopenh264
         (revision "0"))
     (package
       (name "msopenh264")
-      (version (git-version "1.2.1" revision commit))
+      (version (make-git-version "1.2.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -945,7 +945,7 @@ (define-public mssilk
         (revision "0"))
     (package
       (name "mssilk")
-      (version (git-version "1.1.1" revision commit))
+      (version (make-git-version "1.1.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -973,7 +973,7 @@ (define-public mswebrtc
         (revision "0"))
     (package
       (name "mswebrtc")
-      (version (git-version "1.1.1" revision commit))
+      (version (make-git-version "1.1.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -1024,7 +1024,7 @@ (define-public msamr
         (revision "0"))
     (package
       (name "msamr")
-      (version (git-version "1.1.3" revision commit))
+      (version (make-git-version "1.1.3" revision commit))
       (source
        (origin
          (method git-fetch)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 8a6538a7ee4..50685139f78 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -2558,7 +2558,7 @@ (define-public bbswitch-module
   (let ((commit "19f60204596a6463b162fc7ca11f4946f5c20cea"))
     (package
       (name "bbswitch-module")
-      (version (git-version "0.8" "2" commit))
+      (version (make-git-version "0.8" "2" commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -2586,7 +2586,7 @@ (define-public bin-graph
         (revision "0"))
     (package
       (name "bin-graph")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -2619,7 +2619,7 @@ (define-public ddcci-driver-linux
         (commit "7f8f8e6c221a286d57a643c2909109a54e084eed"))
     (package
       (name "ddcci-driver-linux")
-      (version (git-version "0.4.5" revision commit))
+      (version (make-git-version "0.4.5" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -2730,7 +2730,7 @@ (define-public vendor-reset-linux-module
         (revision "0"))
     (package
       (name "vendor-reset-linux-module")
-      (version (git-version "0.1.0" revision commit))
+      (version (make-git-version "0.1.0" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -4661,7 +4661,7 @@ (define-public iotop-python
         (commit "a14256a3ff74eeee59493ac088561f1bafab85a7"))
     (package
       (name "iotop-python")
-      (version (git-version "0.6" revision commit))
+      (version (make-git-version "0.6" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -6533,7 +6533,7 @@ (define-public cpufrequtils
         (revision "1"))
     (package
       (name "cpufrequtils")
-      (version (git-version "008" revision commit ))
+      (version (make-git-version "008" revision commit ))
       (source
        (origin
          (method git-fetch)
@@ -6947,7 +6947,7 @@ (define-public blktrace
         (revision "1"))
     (package
       (name "blktrace")
-      (version (git-version "1.3.0" revision commit))
+      (version (make-git-version "1.3.0" revision commit))
       (home-page
         "https://git.kernel.org/pub/scm/linux/kernel/git/axboe/blktrace.git")
       (source (origin
@@ -7351,7 +7351,7 @@ (define-public compsize
         (revision "0"))
     (package
       (name "compsize")
-      (version (git-version "1.5" revision commit))
+      (version (make-git-version "1.5" revision commit))
       (home-page "https://github.com/kilobyte/compsize")
       (source (origin
                 (method git-fetch)
@@ -7555,7 +7555,7 @@ (define-public nbfc-linux
         (revision "0"))
     (package
       (name "nbfc-linux")
-      (version (git-version version revision commit))
+      (version (make-git-version version revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -8448,7 +8448,7 @@ (define-public mce-inject
         (commit "4cbe46321b4a81365ff3aafafe63967264dbfec5"))
     (package
       (name "mce-inject")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -9827,7 +9827,7 @@ (define-public cassini-headers
         (revision "0"))
     (package
       (name "cassini-headers")
-      (version (git-version "2.0.0"               ;per .spec file
+      (version (make-git-version "2.0.0"               ;per .spec file
                             revision commit))
       (home-page "https://github.com/HewlettPackard/shs-cassini-headers")
       (source (origin
@@ -9857,7 +9857,7 @@ (define-public cxi-driver
         (revision "0"))
     (package
       (name "cxi-driver")
-      (version (git-version "1.0.0"               ;per .spec file
+      (version (make-git-version "1.0.0"               ;per .spec file
                             revision commit))
       (home-page "https://github.com/HewlettPackard/shs-cxi-driver")
       (source
@@ -9887,7 +9887,7 @@ (define-public libcxi
         (revision "0"))
     (package
       (name "libcxi")
-      (version (git-version "1.0.1" revision commit))
+      (version (make-git-version "1.0.1" revision commit))
       (home-page "https://github.com/HewlettPackard/shs-libcxi")
       (source
        (origin
@@ -10437,7 +10437,7 @@ (define-public simpleini
         (revision "1"))
     (package
       (name "simpleini")
-      (version (git-version "4.22" revision commit))
+      (version (make-git-version "4.22" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -10713,7 +10713,7 @@ (define-public fakechroot
         (revision "0"))
     (package
       (name "fakechroot")
-      (version (git-version "2.20.1" revision commit))
+      (version (make-git-version "2.20.1" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -11011,7 +11011,7 @@ (define-public ell
         (revision "1"))
     (package
       (name "ell")
-      (version (git-version "0.77" revision commit))
+      (version (make-git-version "0.77" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -11357,7 +11357,7 @@ (define-public ttyebus-linux-module
         (commit "fe4332a2281cf79804ef4d8516aa848ca1c58d1f"))
     (package
       (name "ttyebus-linux-module")
-      (version (git-version "1.5" revision commit))
+      (version (make-git-version "1.5" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -11540,7 +11540,7 @@ (define-public renameat2
         (commit "5c5193f20142511a5fc7069a539f4e5aba0ea470"))
     (package
       (name "renameat2")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source (origin
                 (method url-fetch)
                 (uri (string-append "https://gist.githubusercontent.com/"
diff --git a/gnu/packages/lisp-check.scm b/gnu/packages/lisp-check.scm
index a41e905a8b3..6d2d8481aa1 100644
--- a/gnu/packages/lisp-check.scm
+++ b/gnu/packages/lisp-check.scm
@@ -42,7 +42,7 @@ (define-public sbcl-1am
   (let ((commit "8b1da94eca4613fd8a20bdf63f0e609e379b0ba5"))
     (package
       (name "sbcl-1am")
-      (version (git-version "0.0" "1" commit))
+      (version (make-git-version "0.0" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -73,7 +73,7 @@ (define-public sbcl-2am
         (revision "0"))
     (package
       (name "sbcl-2am")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
         (origin
           (method git-fetch)
@@ -106,7 +106,7 @@ (define-public sbcl-assertion-error
         (revision "1"))
     (package
       (name "sbcl-assertion-error")
-      (version (git-version "0.1.0" revision commit))
+      (version (make-git-version "0.1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -192,7 +192,7 @@ (define-public sbcl-check-it
   (let ((commit "b79c9103665be3976915b56b570038f03486e62f"))
     (package
       (name "sbcl-check-it")
-      (version (git-version "0.1.0" "1" commit))
+      (version (make-git-version "0.1.0" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -226,7 +226,7 @@ (define-public sbcl-checkl
         (revision "1"))
     (package
       (name "sbcl-checkl")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -267,7 +267,7 @@ (define-public sbcl-cl-mock
         (revision "0"))
     (package
       (name "sbcl-cl-mock")
-      (version (git-version "1.1.0" revision commit))
+      (version (make-git-version "1.1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -305,7 +305,7 @@ (define-public sbcl-cl-quickcheck
         (revision "1"))
     (package
       (name "sbcl-cl-quickcheck")
-      (version (git-version "0.0.4" revision commit))
+      (version (make-git-version "0.0.4" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -339,7 +339,7 @@ (define-public sbcl-clunit
         (revision "1"))
     (package
       (name "sbcl-clunit")
-      (version (git-version "0.2.3" revision commit))
+      (version (make-git-version "0.2.3" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -375,7 +375,7 @@ (define-public sbcl-clunit2
         (revision "1"))
     (package
       (name "sbcl-clunit2")
-      (version (git-version "0.7.0" revision commit))
+      (version (make-git-version "0.7.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -407,7 +407,7 @@ (define-public sbcl-confidence
         (revision "0"))
     (package
       (name "sbcl-confidence")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -444,7 +444,7 @@ (define-public sbcl-eos
         (revision "2"))
     (package
       (name "sbcl-eos")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -477,7 +477,7 @@ (define-public sbcl-fiasco
         (revision "2"))
     (package
       (name "sbcl-fiasco")
-      (version (git-version "0.0.1" revision commit))
+      (version (make-git-version "0.0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -582,7 +582,7 @@ (define-public sbcl-hu.dwim.stefil
   (let ((commit "414902c6f575818c39a8a156b8b61b1adfa73dad"))
     (package
       (name "sbcl-hu.dwim.stefil")
-      (version (git-version "0.0.0" "2" commit))
+      (version (make-git-version "0.0.0" "2" commit))
       (source
        (origin
          (method git-fetch)
@@ -618,7 +618,7 @@ (define-public sbcl-kaputt
         (revision "1"))
     (package
       (name "sbcl-kaputt")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -662,7 +662,7 @@ (define-public sbcl-lift
         (revision "3"))
     (package
       (name "sbcl-lift")
-      (version (git-version "1.7.1" revision commit))
+      (version (make-git-version "1.7.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -702,7 +702,7 @@ (define-public sbcl-lisp-unit
   (let ((commit "89653a232626b67400bf9a941f9b367da38d3815"))
     (package
       (name "sbcl-lisp-unit")
-      (version (git-version "0.0.0" "1" commit))
+      (version (make-git-version "0.0.0" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -737,7 +737,7 @@ (define-public sbcl-lisp-unit2
         (revision "0"))
     (package
       (name "sbcl-lisp-unit2")
-      (version (git-version "0.9.4" revision commit))
+      (version (make-git-version "0.9.4" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -770,7 +770,7 @@ (define-public sbcl-nst
         (revision "1"))
     (package
      (name "sbcl-nst")
-     (version (git-version "4.1.2" revision commit))
+     (version (make-git-version "4.1.2" revision commit))
      (source
       (origin
        (method git-fetch)
@@ -800,7 +800,7 @@ (define-public sbcl-parachute
         (revision "2"))
     (package
       (name "sbcl-parachute")
-      (version (git-version "1.5.0" revision commit))
+      (version (make-git-version "1.5.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -838,7 +838,7 @@ (define-public sbcl-prove
         (revision "2"))
     (package
       (name "sbcl-prove")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -879,7 +879,7 @@ (define-public sbcl-ptester
         (revision "1"))
     (package
       (name "sbcl-ptester")
-      (version (git-version "2.1.3" revision commit))
+      (version (make-git-version "2.1.3" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -917,7 +917,7 @@ (define-public sbcl-rove
         (revision "1"))
     (package
       (name "sbcl-rove")
-      (version (git-version "0.10.0" revision commit))
+      (version (make-git-version "0.10.0" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -949,7 +949,7 @@ (define-public sbcl-rt
         (revision "1"))
     (package
       (name "sbcl-rt")
-      (version (git-version "1990.12.19" revision commit))
+      (version (make-git-version "1990.12.19" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -986,7 +986,7 @@ (define-public sbcl-should-test
         (revision "0"))
     (package
       (name "sbcl-should-test")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -1044,7 +1044,7 @@ (define-public sbcl-stefil
         (revision "0"))
     (package
       (name "sbcl-stefil")
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -1087,7 +1087,7 @@ (define-public sbcl-trivial-coverage
         (revision "0"))
     (package
       (name "sbcl-trivial-coverage")
-      (version (git-version "0.0.4" revision commit))
+      (version (make-git-version "0.0.4" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -1118,7 +1118,7 @@ (define-public sbcl-try
         (revision "2"))
     (package
       (name "sbcl-try")
-      (version (git-version "0.0.1" revision commit))
+      (version (make-git-version "0.0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -1160,7 +1160,7 @@ (define-public sbcl-unit-test
         (revision "1"))
     (package
       (name "sbcl-unit-test")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -1190,7 +1190,7 @@ (define-public sbcl-xlunit
         (revision "1"))
     (package
       (name "sbcl-xlunit")
-      (version (git-version "0.6.3" revision commit))
+      (version (make-git-version "0.6.3" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -1237,7 +1237,7 @@ (define-public sbcl-lisp-critic
         (revision "1"))
     (package
       (name "sbcl-lisp-critic")
-      (version (git-version "1.1" revision commit))
+      (version (make-git-version "1.1" revision commit))
       (source
        (origin
          (method git-fetch)
diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index 30a7fb34af4..3649ae743cb 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -148,7 +148,7 @@ (define-public sbcl-3b-bmfont
         (revision "3"))
     (package
       (name "sbcl-3b-bmfont")
-      (version (git-version "0.0.1" revision commit))
+      (version (make-git-version "0.0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -189,7 +189,7 @@ (define sbcl-3b-bmfont/shinmera
   (let ((commit "58e529d24b7799d56b4b3f9c8a953b585d42c7d2")
         (revision "1"))
     (package (inherit sbcl-3b-bmfont)
-             (version (git-version "0.0.1" revision commit))
+             (version (make-git-version "0.0.1" revision commit))
              (source
               (origin
                 (method git-fetch)
@@ -205,7 +205,7 @@ (define-public sbcl-3bmd
         (revision "4"))
     (package
       (name "sbcl-3bmd")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -258,7 +258,7 @@ (define-public sbcl-3bz
         (revision "1"))
     (package
       (name "sbcl-3bz")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -296,7 +296,7 @@ (define-public sbcl-3d-math
         (revision "0"))
     (package
       (name "sbcl-3d-math")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -333,7 +333,7 @@ (define-public sbcl-3d-matrices
         (revision "2"))
     (package
       (name "sbcl-3d-matrices")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -370,7 +370,7 @@ (define-public sbcl-3d-quaternions
         (revision "0"))
     (package
       (name "sbcl-3d-quaternions")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -413,7 +413,7 @@ (define-public sbcl-3d-spaces
         (revision "0"))
     (package
       (name "sbcl-3d-spaces")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -450,7 +450,7 @@ (define-public sbcl-3d-transforms
         (revision "0"))
     (package
       (name "sbcl-3d-transforms")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -495,7 +495,7 @@ (define-public sbcl-3d-vectors
         (revision "2"))
     (package
       (name "sbcl-3d-vectors")
-      (version (git-version "3.1.0" revision commit))
+      (version (make-git-version "3.1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -532,7 +532,7 @@ (define-public sbcl-40ants-asdf-system
         (revision "0"))
     (package
       (name "sbcl-40ants-asdf-system")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -562,7 +562,7 @@ (define-public sbcl-40ants-doc
         (revision "0"))
     (package
       (name "sbcl-40ants-doc")
-      (version (git-version "0.1.0" revision commit))
+      (version (make-git-version "0.1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -645,7 +645,7 @@ (define-public sbcl-40ants-plantuml
         (revision "0"))
     (package
       (name "sbcl-40ants-plantuml")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -688,7 +688,7 @@ (define-public sbcl-abstract-classes
         (revision "1"))
     (package
       (name "sbcl-abstract-classes")
-      (version (git-version "1.7.0" revision commit))
+      (version (make-git-version "1.7.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -721,7 +721,7 @@ (define-public sbcl-access
         (revision "1"))
     (package
       (name "sbcl-access")
-      (version (git-version "1.6.0" revision commit))
+      (version (make-git-version "1.6.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -757,7 +757,7 @@ (define-public sbcl-acclimation
   (let ((commit "4d51150902568fcd59335f4cc4cfa022df6116a5"))
     (package
       (name "sbcl-acclimation")
-      (version (git-version "0.0.0" "1" commit))
+      (version (make-git-version "0.0.0" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -790,7 +790,7 @@ (define-public sbcl-ecclesia
   (let ((commit "605debb6f28f120243da66c281274011e292ce46"))
     (package
       (name "sbcl-ecclesia")
-      (version (git-version "0.0.0" "0" commit))
+      (version (make-git-version "0.0.0" "0" commit))
       (source
        (origin
          (method git-fetch)
@@ -820,7 +820,7 @@ (define-public sbcl-acl-compat
   (let ((commit "cac1d6920998ddcbee8310a873414732e707d8e5"))
     (package
       (name "sbcl-acl-compat")
-      (version (git-version "0.1.1" "1" commit))
+      (version (make-git-version "0.1.1" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -891,7 +891,7 @@ (define-public sbcl-agnostic-lizard
         (revision "2"))
     (package
       (name "sbcl-agnostic-lizard")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -923,7 +923,7 @@ (define-public sbcl-agutil
   (let ((commit "df188d754d472da9faa1601a48f1f37bb7b34d68"))
     (package
       (name "sbcl-agutil")
-      (version (git-version "0.0.1" "1" commit))
+      (version (make-git-version "0.0.1" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -1011,7 +1011,7 @@ (define-public sbcl-alexandria
         (revision "0"))
     (package
       (name "sbcl-alexandria")
-      (version (git-version "1.4" revision commit))
+      (version (make-git-version "1.4" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -1072,7 +1072,7 @@ (define-public sbcl-alexandria-plus
     (package
       (name "sbcl-alexandria-plus")
       ;; Version is stated in the ASD file.
-      (version (git-version "1.1.0" revision commit))
+      (version (make-git-version "1.1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -1110,7 +1110,7 @@ (define-public sbcl-alloy
         (revision "3"))
     (package
       (name "sbcl-alloy")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -1158,7 +1158,7 @@ (define-public sbcl-amb
         (revision "0"))
     (package
      (name "sbcl-amb")
-     (version (git-version "1.0.0" revision commit))
+     (version (make-git-version "1.0.0" revision commit))
      (source
        (origin
          (method git-fetch)
@@ -1229,7 +1229,7 @@ (define-public sbcl-antik-base
         (revision "1"))
     (package
       (name "sbcl-antik-base")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -1325,7 +1325,7 @@ (define-public sbcl-anypool
         (revision "1"))
     (package
       (name "sbcl-anypool")
-      (version (git-version "0.1.0" revision commit))
+      (version (make-git-version "0.1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -1362,7 +1362,7 @@ (define-public sbcl-april
         (revision "3"))
     (package
       (name "sbcl-april")
-      (version (git-version "1.0" revision commit))
+      (version (make-git-version "1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -1415,7 +1415,7 @@ (define-public sbcl-archive
         (revision "1"))
     (package
       (name "sbcl-archive")
-      (version (git-version "0.9" revision commit))
+      (version (make-git-version "0.9" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -1446,7 +1446,7 @@ (define-public sbcl-arnesi
         (revision "1"))
     (package
       (name "sbcl-arnesi")
-      (version (git-version "2.0.0" revision commit))
+      (version (make-git-version "2.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -1498,7 +1498,7 @@ (define-public sbcl-array-operations
         (revision "0"))
     (package
       (name "sbcl-array-operations")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -1531,7 +1531,7 @@ (define-public sbcl-array-utils
         (revision "0"))
     (package
       (name "sbcl-array-utils")
-      (version (git-version "1.2.0" revision commit))
+      (version (make-git-version "1.2.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -1570,7 +1570,7 @@ (define-public sbcl-arrow-macros
         (revision "0"))
     (package
       (name "sbcl-arrow-macros")
-      (version (git-version "0.2.7" revision commit))
+      (version (make-git-version "0.2.7" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -1600,7 +1600,7 @@ (define-public sbcl-arrows
         (revision "0"))
     (package
       (name "sbcl-arrows")
-      (version (git-version "0.2.0" revision commit))
+      (version (make-git-version "0.2.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -1674,7 +1674,7 @@ (define-public sbcl-asdf-finalizers
         (revision "1"))
     (package
       (name "sbcl-asdf-finalizers")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -1707,7 +1707,7 @@ (define-public sbcl-asd-generator
         (revision "0"))
     (package
       (name "sbcl-asd-generator")
-      (version (git-version "1.0" revision commit))
+      (version (make-git-version "1.0" revision commit))
       (source
         (origin
           (method git-fetch)
@@ -1740,7 +1740,7 @@ (define-public sbcl-asdf-system-connections
         (revision "1"))
     (package
       (name "sbcl-asdf-system-connections")
-      (version (git-version "0.8.4" revision commit))
+      (version (make-git-version "0.8.4" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -1770,7 +1770,7 @@ (define-public sbcl-aserve
         (revision "2"))
     (package
       (name "sbcl-aserve")
-      (version (git-version "1.2.50" revision commit))
+      (version (make-git-version "1.2.50" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -1829,7 +1829,7 @@ (define-public sbcl-asn1
     (package
       (name "sbcl-asn1")
       (build-system asdf-build-system/sbcl)
-      (version (git-version "0.1.0" revision commit))
+      (version (make-git-version "0.1.0" revision commit))
       (home-page "https://github.com/fukamachi/asn1")
       (source
        (origin
@@ -1861,7 +1861,7 @@ (define-public sbcl-assoc-utils
         (revision "1"))
     (package
       (name "sbcl-assoc-utils")
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -1894,7 +1894,7 @@ (define-public sbcl-atomichron
         (revision "0"))
     (package
       (name "sbcl-atomichron")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -1929,7 +1929,7 @@ (define-public sbcl-atomics
         (revision "2"))
     (package
       (name "sbcl-atomics")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -1966,7 +1966,7 @@ (define-public sbcl-authentic
         (revision "2"))
     (package
       (name "sbcl-authentic")
-      (version (git-version "0.1.2" revision commit))
+      (version (make-git-version "0.1.2" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -2001,7 +2001,7 @@ (define-public sbcl-babel
         (revision "3"))
     (package
       (name "sbcl-babel")
-      (version (git-version "0.5.0" revision commit))
+      (version (make-git-version "0.5.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -2035,7 +2035,7 @@ (define-public sbcl-binary-types
   (let ((commit "a17caf8890f11fdc56f6ea3a21260bf0fb9c589c"))
     (package
       (name "sbcl-binary-types")
-      (version (git-version "1.2" "2" commit))
+      (version (make-git-version "1.2" "2" commit))
       (source
        (origin
          (method git-fetch)
@@ -2065,7 +2065,7 @@ (define-public sbcl-binascii
         (revision "1"))
     (package
       (name "sbcl-binascii")
-      (version (git-version "1.0" revision commit))
+      (version (make-git-version "1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -2114,7 +2114,7 @@ (define-public sbcl-binding-arrows
         (revision "2"))
     (package
      (name "sbcl-binding-arrows")
-     (version (git-version "1.0.0" revision commit))
+     (version (make-git-version "1.0.0" revision commit))
      (source
       (origin
        (method git-fetch)
@@ -2153,7 +2153,7 @@ (define-public sbcl-binpack
         (revision "1"))
     (package
      (name "sbcl-binpack")
-     (version (git-version "0.0.1" revision commit))
+     (version (make-git-version "0.0.1" revision commit))
      (source
       (origin
        (method git-fetch)
@@ -2188,7 +2188,7 @@ (define-public sbcl-birch
         (revision "0"))
     (package
       (name "sbcl-birch")
-      (version (git-version "1.0.1" revision commit))
+      (version (make-git-version "1.0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -2222,7 +2222,7 @@ (define-public sbcl-bit-smasher
   (let ((commit "c2dcb3b5ec0e485484be681fe17c4e81e58790d9"))
     (package
       (name "sbcl-bit-smasher")
-      (version (git-version "1.0.2" "1" commit))
+      (version (make-git-version "1.0.2" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -2255,7 +2255,7 @@ (define-public sbcl-bknr-datastore
         (revision "1"))
     (package
       (name "sbcl-bknr-datastore")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -2315,7 +2315,7 @@ (define-public sbcl-blackbird
         (revision "1"))
     (package
       (name "sbcl-blackbird")
-      (version (git-version "0.5.2" revision commit))
+      (version (make-git-version "0.5.2" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -2349,7 +2349,7 @@ (define-public sbcl-bobbin
         (revision "0"))
     (package
       (name "sbcl-bobbin")
-      (version (git-version "1.0.1" revision commit))
+      (version (make-git-version "1.0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -2384,7 +2384,7 @@ (define-public sbcl-bodge-blobs-support
         (revision "1"))
     (package
      (name "sbcl-bodge-blobs-support")
-     (version (git-version "1.0.0" revision commit))
+     (version (make-git-version "1.0.0" revision commit))
      (source
       (origin
         (method git-fetch)
@@ -2417,7 +2417,7 @@ (define-public sbcl-bodge-math
         (revision "1"))
     (package
      (name "sbcl-bodge-math")
-     (version (git-version "1.0.0" revision commit))
+     (version (make-git-version "1.0.0" revision commit))
      (source
       (origin
        (method git-fetch)
@@ -2448,7 +2448,7 @@ (define-public sbcl-bodge-queue
         (revision "0"))
     (package
       (name "sbcl-bodge-queue")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -2478,7 +2478,7 @@ (define-public sbcl-bodge-utilities
         (revision "1"))
     (package
      (name "sbcl-bodge-utilities")
-     (version (git-version "1.0.0" revision commit))
+     (version (make-git-version "1.0.0" revision commit))
      (source
       (origin
        (method git-fetch)
@@ -2517,7 +2517,7 @@ (define-public sbcl-boost-json
         (revision "0"))
     (package
       (name "sbcl-boost-json")
-      (version (git-version "1.1" revision commit))
+      (version (make-git-version "1.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -2553,7 +2553,7 @@ (define-public sbcl-boost-lexer
         (revision "0"))
     (package
       (name "sbcl-boost-lexer")
-      (version (git-version "1.0" revision commit))
+      (version (make-git-version "1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -2584,7 +2584,7 @@ (define-public sbcl-boost-parse
         (revision "0"))
     (package
       (name "sbcl-boost-parse")
-      (version (git-version "1.0" revision commit))
+      (version (make-git-version "1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -2612,7 +2612,7 @@ (define-public sbcl-boost-re
         (revision "0"))
     (package
       (name "sbcl-boost-re")
-      (version (git-version "1.0" revision commit))
+      (version (make-git-version "1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -2643,7 +2643,7 @@ (define-public sbcl-bordeaux-fft
         (revision "0"))
     (package
       (name "sbcl-bordeaux-fft")
-      (version (git-version "1.0.1" revision commit))
+      (version (make-git-version "1.0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -2714,7 +2714,7 @@ (define-public sbcl-bst
         (revision "0"))
     (package
       (name "sbcl-bst")
-      (version (git-version "2.0" revision commit))
+      (version (make-git-version "2.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -2745,7 +2745,7 @@ (define-public sbcl-bt-semaphore
         (revision "0"))
     (package
       (name "sbcl-bt-semaphore")
-      (version (git-version "0.6.3" revision commit))
+      (version (make-git-version "0.6.3" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -2776,7 +2776,7 @@ (define-public sbcl-bubble-operator-upwards
         (revision "0"))
     (package
       (name "sbcl-bubble-operator-upwards")
-      (version (git-version "1.0" revision commit))
+      (version (make-git-version "1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -2811,7 +2811,7 @@ (define-public sbcl-burgled-batteries3
         (revision "2"))
     (package
       (name "sbcl-burgled-batteries3")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -2881,7 +2881,7 @@ (define-public sbcl-cache-while
         (revision "1"))
     (package
       (name "sbcl-cache-while")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -2913,7 +2913,7 @@ (define-public sbcl-cacle
         (revision "1"))
     (package
       (name "sbcl-cacle")
-      (version (git-version "1.0.1" revision commit))
+      (version (make-git-version "1.0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -2945,7 +2945,7 @@ (define-public sbcl-calispel
   (let ((commit "e9f2f9c1af97f4d7bb4c8ac25fb2a8f3e8fada7a"))
     (package
       (name "sbcl-calispel")
-      (version (git-version "0.1" "1" commit))
+      (version (make-git-version "0.1" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -3035,7 +3035,7 @@ (define-public sbcl-cambl
         (revision "1"))
     (package
       (name "sbcl-cambl")
-      (version (git-version "4.0.0" revision commit))
+      (version (make-git-version "4.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -3108,7 +3108,7 @@ (define-public sbcl-caveman
         (revision "2"))
     (package
       (name "sbcl-caveman")
-      (version (git-version "2.4.0" revision commit))
+      (version (make-git-version "2.4.0" revision commit))
       (home-page "https://8arrow.org/caveman/")
       (source
        (origin
@@ -3179,7 +3179,7 @@ (define-public sbcl-cblas
         (revision "1"))
     (package
       (name "sbcl-cblas")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -3222,7 +3222,7 @@ (define-public sbcl-cells
   (let ((commit "e8542b17fddd6340c1e237ce482a52327c8ead8e"))
     (package
       (name "sbcl-cells")
-      (version (git-version "3.0" "1" commit))
+      (version (make-git-version "3.0" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -3257,7 +3257,7 @@ (define-public sbcl-cephes
         (revision "0"))
     (package
       (name "sbcl-cephes")
-      (version (git-version "1.2" revision commit))
+      (version (make-git-version "1.2" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -3301,7 +3301,7 @@ (define-public sbcl-cepl
         (revision "1"))
     (package
      (name "sbcl-cepl")
-     (version (git-version "0.0.0" revision commit))
+     (version (make-git-version "0.0.0" revision commit))
      (source
       (origin
        (method git-fetch)
@@ -3386,7 +3386,7 @@ (define-public sbcl-cf
         (revision "0"))
     (package
       (name "sbcl-cf")
-      (version (git-version "1.1" revision commit))
+      (version (make-git-version "1.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -3415,7 +3415,7 @@ (define-public sbcl-cffi
         (revision "2"))
     (package
       (name "sbcl-cffi")
-      (version (git-version "0.24.1" revision commit))
+      (version (make-git-version "0.24.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -3479,7 +3479,7 @@ (define-public sbcl-cffi-c-ref
         (revision "0"))
     (package
       (name "sbcl-cffi-c-ref")
-      (version (git-version "1.0" revision commit))
+      (version (make-git-version "1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -3509,7 +3509,7 @@ (define-public sbcl-chanl
         (revision "1"))
     (package
       (name "sbcl-chanl")
-      (version (git-version "0.4.1" revision commit))
+      (version (make-git-version "0.4.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -3712,7 +3712,7 @@ (define-public sbcl-chipz
         (revision "2"))
     (package
       (name "sbcl-chipz")
-      (version (git-version version revision commit))
+      (version (make-git-version version revision commit))
       (source
        (origin
          (method git-fetch)
@@ -3751,7 +3751,7 @@ (define-public sbcl-chirp
         (revision "1"))
     (package
       (name "sbcl-chirp")
-      (version (git-version "0.2.0" revision commit))
+      (version (make-git-version "0.2.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -3795,7 +3795,7 @@ (define-public sbcl-chlorophyll
         (revision "1"))
     (package
       (name "sbcl-chlorophyll")
-      (version (git-version "0.0.1" revision commit))
+      (version (make-git-version "0.0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -3886,7 +3886,7 @@ (define-public sbcl-ciel
         (revision "0"))
     (package
       (name "sbcl-ciel")
-      (version (git-version "0.2.1" revision commit))
+      (version (make-git-version "0.2.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -3998,7 +3998,7 @@ (define-public sbcl-ciel-repl
         (revision "0"))
     (package
       (name "sbcl-ciel-repl")
-      (version (git-version "0.2.1" revision commit))
+      (version (make-git-version "0.2.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -4067,7 +4067,7 @@ (define-public sbcl-circular-streams
         (revision "1"))
     (package
      (name "sbcl-circular-streams")
-     (version (git-version "0.1.0" revision commit))
+     (version (make-git-version "0.1.0" revision commit))
      (source
       (origin
        (method git-fetch)
@@ -4104,7 +4104,7 @@ (define-public sbcl-cl-abnf
         (revision "1"))
     (package
      (name "sbcl-cl-abnf")
-     (version (git-version "0.0.0" revision commit))
+     (version (make-git-version "0.0.0" revision commit))
      (source
       (origin
         (method git-fetch)
@@ -4141,7 +4141,7 @@ (define-public sbcl-cl-algebraic-data-type
   (let ((commit "b2568428193a512d141d6b615772d50ceb5f9bca"))
     (package
       (name "sbcl-cl-algebraic-data-type")
-      (version (git-version "1.2.0" "1" commit))
+      (version (make-git-version "1.2.0" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -4176,7 +4176,7 @@ (define-public sbcl-cl-all
         (revision "0"))
     (package
       (name "sbcl-cl-all")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -4213,7 +4213,7 @@ (define-public sbcl-cl-ana
         (revision "2"))
     (package
       (name "sbcl-cl-ana")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -4289,7 +4289,7 @@ (define-public sbcl-cl-annot
         (revision "1"))
     (package
       (name "sbcl-cl-annot")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -4321,7 +4321,7 @@ (define-public sbcl-cl-ansi-text
   (let ((commit "8b129d83c7511b54cdd9d4123825a2d06349b25c"))
     (package
       (name "sbcl-cl-ansi-text")
-      (version (git-version "2.0.1" "1" commit))
+      (version (make-git-version "2.0.1" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -4358,7 +4358,7 @@ (define-public sbcl-cl-ascii-table
         (revision "1"))
     (package
       (name "sbcl-cl-ascii-table")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -4390,7 +4390,7 @@ (define-public sbcl-cl-async
         (revision "1"))
     (package
       (name "sbcl-cl-async")
-      (version (git-version "0.6.1" revision commit))
+      (version (make-git-version "0.6.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -4445,7 +4445,7 @@ (define-public sbcl-cl-async-future
         (revision "1"))
     (package
       (name "sbcl-cl-async-future")
-      (version (git-version "0.4.4.1" revision commit))
+      (version (make-git-version "0.4.4.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -4479,7 +4479,7 @@ (define libasyncprocess
         (revision "2"))
     (package
       (name "libasyncprocess")
-      (version (git-version "0.0.1" revision commit))
+      (version (make-git-version "0.0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -4550,7 +4550,7 @@ (define-public sbcl-cl-autowrap
     ;; no tagged branches
     (package
       (name "sbcl-cl-autowrap")
-      (version (git-version "1.0" revision commit))
+      (version (make-git-version "1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -4586,7 +4586,7 @@ (define-public sbcl-cl-base16
         (revision "0"))
     (package
       (name "sbcl-cl-base16")
-      (version (git-version "0.0" revision commit))
+      (version (make-git-version "0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -4630,7 +4630,7 @@ (define-public sbcl-cl-base32
         (revision "1"))
     (package
       (name "sbcl-cl-base32")
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -4661,7 +4661,7 @@ (define-public sbcl-cl-base58
         (revision "1"))
     (package
       (name "sbcl-cl-base58")
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -4704,7 +4704,7 @@ (define-public sbcl-cl-base64
   (let ((commit "577683b18fd880b82274d99fc96a18a710e3987a"))
     (package
       (name "sbcl-cl-base64")
-      (version (git-version "3.3.4" "1" commit))
+      (version (make-git-version "3.3.4" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -4744,7 +4744,7 @@ (define-public sbcl-cl-bnf
         (revision "0"))
     (package
       (name "sbcl-cl-bnf")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -4773,7 +4773,7 @@ (define-public sbcl-cl-cairo2
         (revision "1"))
     (package
       (name "sbcl-cl-cairo2")
-      (version (git-version "0.6" revision commit))
+      (version (make-git-version "0.6" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -4824,7 +4824,7 @@ (define-public sbcl-cl-cffi-gtk
         (revision "3"))
     (package
       (name "sbcl-cl-cffi-gtk")
-      (version (git-version "3.8.8" revision commit))
+      (version (make-git-version "3.8.8" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -4904,7 +4904,7 @@ (define-public sbcl-cl-change-case
         (revision "1"))
     (package
       (name "sbcl-cl-change-case")
-      (version (git-version "0.2.0" revision commit))
+      (version (make-git-version "0.2.0" revision commit))
       (home-page "https://github.com/rudolfochrist/cl-change-case")
       (source
        (origin
@@ -4938,7 +4938,7 @@ (define-public sbcl-cl-charms
         (revision "1"))
     (package
       (name "sbcl-cl-charms")
-      (version (git-version "0.2.0" revision commit))
+      (version (make-git-version "0.2.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -4981,7 +4981,7 @@ (define-public sbcl-cl-collider
         (revision "0"))
     (package
      (name "sbcl-cl-collider")
-     (version (git-version "2018.7.15" revision commit))
+     (version (make-git-version "2018.7.15" revision commit))
      (source
        (origin
          (method git-fetch)
@@ -5041,7 +5041,7 @@ (define-public sbcl-cl-colors
   (let ((commit "827410584553f5c717eec6182343b7605f707f75"))
     (package
       (name "sbcl-cl-colors")
-      (version (git-version "0.0.0" "1" commit))
+      (version (make-git-version "0.0.0" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -5122,7 +5122,7 @@ (define-public sbcl-cl-conspack
         (revision "2"))
     (package
      (name "sbcl-cl-conspack")
-     (version (git-version "0.0.0" revision commit))
+     (version (make-git-version "0.0.0" revision commit))
      (source
       (origin
        (method git-fetch)
@@ -5161,7 +5161,7 @@ (define-public sbcl-cl-cont
         (revision "1"))
     (package
       (name "sbcl-cl-cont")
-      (version (git-version "0.3.8" revision commit))
+      (version (make-git-version "0.3.8" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -5198,7 +5198,7 @@ (define-public sbcl-cl-containers
         (revision "4"))
     (package
       (name "sbcl-cl-containers")
-      (version (git-version "0.12.1" revision commit))
+      (version (make-git-version "0.12.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -5255,7 +5255,7 @@ (define-public sbcl-cl-cookie
     (package
       (name "sbcl-cl-cookie")
       (build-system asdf-build-system/sbcl)
-      (version (git-version "0.9.10" revision commit))
+      (version (make-git-version "0.9.10" revision commit))
       (home-page "https://github.com/fukamachi/cl-cookie")
       (source
        (origin
@@ -5293,7 +5293,7 @@ (define-public sbcl-cl-coroutine
         (revision "1"))
     (package
       (name "sbcl-cl-coroutine")
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -5369,7 +5369,7 @@ (define-public sbcl-cl-cron
         (revision "0"))
     (package
       (name "sbcl-cl-cron")
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -5399,7 +5399,7 @@ (define-public sbcl-cl-css
   (let ((commit "8fe654c8f0cf95b300718101cce4feb517f78e2f"))
     (package
       (name "sbcl-cl-css")
-      (version (git-version "0.1" "1" commit))
+      (version (make-git-version "0.1" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -5430,7 +5430,7 @@ (define-public sbcl-cl-csv
         (revision "2"))
     (package
       (name "sbcl-cl-csv")
-      (version (git-version "1.0.6" revision commit))
+      (version (make-git-version "1.0.6" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -5469,7 +5469,7 @@ (define-public sbcl-cl-data-structures
         (revision "2"))
     (package
       (name "sbcl-cl-data-structures")
-      (version (git-version "1.4.1" revision commit))
+      (version (make-git-version "1.4.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -5514,7 +5514,7 @@ (define-public sbcl-cl-debug
         (revision "1"))
     (package
      (name "sbcl-cl-debug")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
      (source
       (origin
        (method git-fetch)
@@ -5544,7 +5544,7 @@ (define-public sbcl-cl-dejavu
         (revision "1"))
     (package
       (name "sbcl-cl-dejavu")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -5574,7 +5574,7 @@ (define-public sbcl-cl-difflib
         (revision "0"))
     (package
       (name "sbcl-cl-difflib")
-      (version (git-version "0.2" revision commit))
+      (version (make-git-version "0.2" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -5608,7 +5608,7 @@ (define-public sbcl-cl-diskspace
         (revision "1"))
     (package
       (name "sbcl-cl-diskspace")
-      (version (git-version "0.3.1" revision commit))
+      (version (make-git-version "0.3.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -5653,7 +5653,7 @@ (define-public sbcl-cl-docutils
         (revision "1"))
     (package
       (name "sbcl-cl-docutils")
-      (version (git-version "0.1.1" revision commit))
+      (version (make-git-version "0.1.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -5697,7 +5697,7 @@ (define-public sbcl-cl-dot
         (revision "0"))
     (package
       (name "sbcl-cl-dot")
-      (version (git-version "0.9.0" revision commit))
+      (version (make-git-version "0.9.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -5726,7 +5726,7 @@ (define-public sbcl-cl-emb
         (revision "1"))
     (package
       (name "sbcl-cl-emb")
-      (version (git-version "0.4.3" revision commit))
+      (version (make-git-version "0.4.3" revision commit))
       (home-page "https://common-lisp.net/project/cl-emb/")
       (source
        (origin
@@ -5791,7 +5791,7 @@ (define-public sbcl-cl-ewkb
         (revision "0"))
     (package
       (name "sbcl-cl-ewkb")
-      (version (git-version "0.2" revision commit))
+      (version (make-git-version "0.2" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -5823,7 +5823,7 @@ (define-public sbcl-cl-fad
         (revision "1"))
     (package
       (name "sbcl-cl-fad")
-      (version (git-version "0.7.6" revision commit))
+      (version (make-git-version "0.7.6" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -5902,7 +5902,7 @@ (define-public sbcl-cl-fastcgi
         (revision "2"))
     (package
       (name "sbcl-cl-fastcgi")
-      (version (git-version "0.2" revision commit))
+      (version (make-git-version "0.2" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -5945,7 +5945,7 @@ (define-public sbcl-cl-flac
         (revision "0"))
     (package
       (name "sbcl-cl-flac")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -5992,7 +5992,7 @@ (define-public sbcl-cl-fond
         (revision "1"))
     (package
       (name "sbcl-cl-fond")
-      (version (git-version "1.1.0" revision commit))
+      (version (make-git-version "1.1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -6078,7 +6078,7 @@ (define-public sbcl-cl-freetype2
         (revision "1"))
     (package
       (name "sbcl-cl-freetype2")
-      (version (git-version "1.1" revision commit))
+      (version (make-git-version "1.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -6130,7 +6130,7 @@ (define-public sbcl-cl-ftp
         (revision "0"))
     (package
       (name "sbcl-cl-ftp")
-      (version (git-version "1.6.1" revision commit))
+      (version (make-git-version "1.6.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -6163,7 +6163,7 @@ (define-public sbcl-cl-gamepad
         (revision "3"))
     (package
       (name "sbcl-cl-gamepad")
-      (version (git-version "3.0.0" revision commit))
+      (version (make-git-version "3.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -6205,7 +6205,7 @@ (define-public sbcl-cl-geometry
   (let ((commit "24eddedc47b931cec27361752736ef0b54fc9984"))
     (package
       (name "sbcl-cl-geometry")
-      (version (git-version "0.0.3" "1" commit))
+      (version (make-git-version "0.0.3" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -6241,7 +6241,7 @@ (define-public sbcl-cl-glfw3
         (revision "1"))
     (package
       (name "sbcl-cl-glfw3")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -6284,7 +6284,7 @@ (define-public sbcl-cl-glib
         (revision "1"))
     (package
       (name "sbcl-cl-glib")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -6319,7 +6319,7 @@ (define-public sbcl-cl-gltf
         (revision "1"))
     (package
       (name "sbcl-cl-gltf")
-      (version (git-version "2.0.0" revision commit))
+      (version (make-git-version "2.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -6368,7 +6368,7 @@ (define-public sbcl-cl-gobject-introspection
         (revision "4"))
     (package
       (name "sbcl-cl-gobject-introspection")
-      (version (git-version "0.3" revision commit))
+      (version (make-git-version "0.3" revision commit))
       (home-page "https://github.com/andy128k/cl-gobject-introspection")
       (source
        (origin
@@ -6420,7 +6420,7 @@ (define-public sbcl-cl-gobject-introspection-wrapper
         (revision "1"))
     (package
       (name "sbcl-cl-gobject-introspection-wrapper")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -6455,7 +6455,7 @@ (define-public sbcl-cl-gopher
         (revision "3"))
     (package
       (name "sbcl-cl-gopher")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -6502,7 +6502,7 @@ (define-public sbcl-cl-graph
         (revision "2"))
     (package
       (name "sbcl-cl-graph")
-      (version (git-version "0.10.2" revision commit))
+      (version (make-git-version "0.10.2" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -6549,7 +6549,7 @@ (define-public sbcl-cl-grnm
         (revision "0"))
     (package
       (name "sbcl-cl-grnm")
-      (version (git-version "0.1.0" revision commit))
+      (version (make-git-version "0.1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -6625,7 +6625,7 @@ (define-public sbcl-cl-gss
         (revision "1"))
     (package
       (name "sbcl-cl-gss")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -6671,7 +6671,7 @@ (define-public sbcl-cl-gtk4
         (revision "2"))
     (package
       (name "sbcl-cl-gtk4")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -6708,7 +6708,7 @@ (define-public sbcl-cl-hamt
   (let ((commit "7a99eaaca1f952029def9ad5a2b80a612a712208"))
     (package
       (name "sbcl-cl-hamt")
-      (version (git-version "0.0.0" "1" commit))
+      (version (make-git-version "0.0.0" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -6772,7 +6772,7 @@ (define-public sbcl-cl-hooks
     (package
       (name "sbcl-cl-hooks")
       (build-system asdf-build-system/sbcl)
-      (version (git-version "0.2.1" revision commit))
+      (version (make-git-version "0.2.1" revision commit))
       (home-page "https://github.com/scymtym/architecture.hooks")
       (source
        (origin
@@ -6832,7 +6832,7 @@ (define-public sbcl-cl-html-diff
         (revision "0"))
     (package
       (name "sbcl-cl-html-diff")
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -6864,7 +6864,7 @@ (define-public sbcl-cl-html5-parser
         (revision "1"))
     (package
       (name "sbcl-cl-html5-parser")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -6896,7 +6896,7 @@ (define-public sbcl-cl-https-everywhere
   (let ((commit "cbcc73b985a5b1c0ce0d4ec38bc982a0538d4bd8"))
     (package
       (name "sbcl-cl-https-everywhere")
-      (version (git-version "0.0.0" "1" commit))
+      (version (make-git-version "0.0.0" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -6977,7 +6977,7 @@ (define-public sbcl-cl-i18n
         (revision "3"))
     (package
       (name "sbcl-cl-i18n")
-      (version (git-version "0.5.5" revision commit))
+      (version (make-git-version "0.5.5" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -7008,7 +7008,7 @@ (define-public sbcl-cl-iconv
         (revision "0"))
     (package
       (name "sbcl-cl-iconv")
-      (version (git-version "0.3" revision commit))
+      (version (make-git-version "0.3" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -7048,7 +7048,7 @@ (define-public sbcl-cl-indentify
   (let ((commit "eb770f434defa4cd41d84bca822428dfd0dbac53"))
     (package
       (name "sbcl-cl-indentify")
-      (version (git-version "0.1" "1" commit))
+      (version (make-git-version "0.1" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -7082,7 +7082,7 @@ (define-public sbcl-cl-inflector
         (revision "1"))
     (package
       (name "sbcl-cl-inflector")
-      (version (git-version "0.2" revision commit))
+      (version (make-git-version "0.2" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -7116,7 +7116,7 @@ (define-public sbcl-cl-ini
         (revision "0"))
     (package
       (name "sbcl-cl-ini")
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -7147,7 +7147,7 @@ (define-public sbcl-cl-inotify
         (revision "0"))
     (package
       (name "sbcl-cl-inotify")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -7183,7 +7183,7 @@ (define-public sbcl-cl-interpol
         (revision "1"))
     (package
       (name "sbcl-cl-interpol")
-      (version (git-version "0.2.7" revision commit))
+      (version (make-git-version "0.2.7" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -7220,7 +7220,7 @@ (define-public sbcl-cl-ipfs-api2
         (revision "0"))
     (package
       (name "sbcl-cl-ipfs-api2")
-      (version (git-version "0.51" revision commit))
+      (version (make-git-version "0.51" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -7256,7 +7256,7 @@ (define-public sbcl-cl-irc
         (revision "0"))
     (package
       (name "sbcl-cl-irc")
-      (version (git-version "0.9.2" revision commit))
+      (version (make-git-version "0.9.2" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -7304,7 +7304,7 @@ (define-public sbcl-cl-isaac
         (revision "0"))
     (package
       (name "sbcl-cl-isaac")
-      (version (git-version "1.0.7" revision commit))
+      (version (make-git-version "1.0.7" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -7334,7 +7334,7 @@ (define-public sbcl-cl-jpeg
         (revision "1"))
     (package
       (name "sbcl-cl-jpeg")
-      (version (git-version "2.8" revision commit))
+      (version (make-git-version "2.8" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -7394,7 +7394,7 @@ (define-public sbcl-cl-json-pointer
         (revision "0"))
     (package
       (name "sbcl-cl-json-pointer")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -7435,7 +7435,7 @@ (define-public sbcl-cl-ledger
         (revision "1"))
     (package
       (name "sbcl-cl-ledger")
-      (version (git-version "4.0.0" revision commit))
+      (version (make-git-version "4.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -7480,7 +7480,7 @@ (define-public sbcl-cl-lex
         (revision "1"))
     (package
       (name "sbcl-cl-lex")
-      (version (git-version "1.1.3" revision commit))
+      (version (make-git-version "1.1.3" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -7512,7 +7512,7 @@ (define-public sbcl-cl-liballegro
         (revision "1"))
     (package
       (name "sbcl-cl-liballegro")
-      (version (git-version "0.2.15" revision commit))
+      (version (make-git-version "0.2.15" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -7557,7 +7557,7 @@ (define-public sbcl-cl-libsvm-format
         (revision "0"))
     (package
       (name "sbcl-cl-libsvm-format")
-      (version (git-version "0.1.0" revision commit))
+      (version (make-git-version "0.1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -7591,7 +7591,7 @@ (define-public sbcl-cl-libuv
         (revision "1"))
     (package
       (name "sbcl-cl-libuv")
-      (version (git-version "0.1.6" revision commit))
+      (version (make-git-version "0.1.6" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -7637,7 +7637,7 @@ (define-public sbcl-cl-libxml2
   (let ((commit "8d03110c532c1a3fe15503fdfefe82f60669e4bd"))
     (package
       (name "sbcl-cl-libxml2")
-      (version (git-version "0.3.4" "1" commit))
+      (version (make-git-version "0.3.4" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -7725,7 +7725,7 @@ (define-public sbcl-cl-libyaml
         (revision "1"))
     (package
       (name "sbcl-cl-libyaml")
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -7770,7 +7770,7 @@ (define-public sbcl-cl-locale
         (revision "1"))
     (package
       (name "sbcl-cl-locale")
-      (version (git-version "0.1.1" revision commit))
+      (version (make-git-version "0.1.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -7846,7 +7846,7 @@ (define-public sbcl-cl-markdown
         (revision "0"))
     (package
       (name "sbcl-cl-markdown")
-      (version (git-version "0.10.6" revision commit))
+      (version (make-git-version "0.10.6" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -7890,7 +7890,7 @@ (define-public sbcl-cl-markless
         (revision "1"))
     (package
       (name "sbcl-cl-markless")
-      (version (git-version "1.1.0" revision commit))
+      (version (make-git-version "1.1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -7938,7 +7938,7 @@ (define-public sbcl-cl-markup
   (let ((commit "e0eb7debf4bdff98d1f49d0f811321a6a637b390"))
     (package
       (name "sbcl-cl-markup")
-      (version (git-version "0.1" "1" commit))
+      (version (make-git-version "0.1" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -7975,7 +7975,7 @@ (define-public sbcl-cl-mathstats
         (revision "1"))
     (package
       (name "sbcl-cl-mathstats")
-      (version (git-version "0.8.2" revision commit))
+      (version (make-git-version "0.8.2" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -8007,7 +8007,7 @@ (define-public sbcl-cl-messagepack
         (revision "0"))
     (package
       (name "sbcl-cl-messagepack")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -8041,7 +8041,7 @@ (define-public sbcl-cl-mime
     (package
       (name "sbcl-cl-mime")
       ;; One commit says "update to cl-mime-0.5.3", even though the .asd is at 0.5.1.
-      (version (git-version "0.5.3" revision commit))
+      (version (make-git-version "0.5.3" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -8076,7 +8076,7 @@ (define-public sbcl-cl-mimeparse
         (revision "0"))
     (package
       (name "sbcl-cl-mimeparse")
-      (version (git-version "0.0.1" revision commit))
+      (version (make-git-version "0.0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -8114,7 +8114,7 @@ (define-public sbcl-cl-mixed
         (revision "0"))
     (package
       (name "sbcl-cl-mixed")
-      (version (git-version "2.1.0" revision commit))
+      (version (make-git-version "2.1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -8194,7 +8194,7 @@ (define-public sbcl-cl-modio
         (revision "1"))
     (package
       (name "sbcl-cl-modio")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -8261,7 +8261,7 @@ (define-public sbcl-cl-mount-info
         (revision "1"))
     (package
      (name "sbcl-cl-mount-info")
-     (version (git-version "0.0.1" revision commit))
+     (version (make-git-version "0.0.1" revision commit))
      (source
       (origin
        (method git-fetch)
@@ -8292,7 +8292,7 @@ (define-public sbcl-cl-mpg123
         (revision "1"))
     (package
       (name "sbcl-cl-mpg123")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -8347,7 +8347,7 @@ (define-public sbcl-cl-murmurhash
         (revision "1"))
     (package
       (name "sbcl-cl-murmurhash")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (home-page "https://github.com/ruricolist/cl-murmurhash/")
       (source
        (origin
@@ -8409,7 +8409,7 @@ (define-public sbcl-cl-mysql
         (revision "1"))
     (package
       (name "sbcl-cl-mysql")
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -8454,7 +8454,7 @@ (define-public sbcl-cl-num-utils
         (revision "1"))
     (package
       (name "sbcl-cl-num-utils")
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -8530,7 +8530,7 @@ (define-public sbcl-cl-online-learning
         (revision "1"))
     (package
       (name "sbcl-cl-online-learning")
-      (version (git-version "0.5" revision commit))
+      (version (make-git-version "0.5" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -8565,7 +8565,7 @@ (define-public sbcl-cl-opengl
         (revision "1"))
     (package
       (name "sbcl-cl-opengl")
-      (version (git-version "0.1.0" revision commit))
+      (version (make-git-version "0.1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -8616,7 +8616,7 @@ (define-public sbcl-cl-out123
         (revision "2"))
     (package
       (name "sbcl-cl-out123")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -8666,7 +8666,7 @@ (define-public sbcl-cl-package-locks
         (revision "1"))
     (package
       (name "sbcl-cl-package-locks")
-      (version (git-version "0.0.2" revision commit))
+      (version (make-git-version "0.0.2" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -8698,7 +8698,7 @@ (define-public sbcl-cl-pango
         (revision "0"))
     (package
       (name "sbcl-cl-pango")
-      (version (git-version "0.5" revision commit))
+      (version (make-git-version "0.5" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -8750,7 +8750,7 @@ (define-public sbcl-cl-pass
         (revision "1"))
     (package
       (name "sbcl-cl-pass")
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -8782,7 +8782,7 @@ (define-public sbcl-cl-pcg
         (revision "1"))
     (package
       (name "sbcl-cl-pcg")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -8825,7 +8825,7 @@ (define-public sbcl-cl-pdf
         (revision "4"))
     (package
       (name "sbcl-cl-pdf")
-      (version (git-version "2.0.0" revision commit))
+      (version (make-git-version "2.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -8858,7 +8858,7 @@ (define-public sbcl-cl-permutation
         (revision "0"))
     (package
       (name "sbcl-cl-permutation")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -8896,7 +8896,7 @@ (define-public sbcl-cl-portaudio
         (revision "1"))
     (package
       (name "sbcl-cl-portaudio")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -8936,7 +8936,7 @@ (define-public sbcl-cl-posix-mqueue
         (revision "1"))
     (package
       (name "sbcl-cl-posix-mqueue")
-      (version (git-version "0.1.2" revision commit))
+      (version (make-git-version "0.1.2" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -9048,7 +9048,7 @@ (define-public sbcl-cl-prevalence
     (package
       (name "sbcl-cl-prevalence")
       (build-system asdf-build-system/sbcl)
-      (version (git-version "5" revision commit))
+      (version (make-git-version "5" revision commit))
       (home-page "https://github.com/40ants/cl-prevalence")
       (source
        (origin
@@ -9090,7 +9090,7 @@ (define-public sbcl-cl-progress-bar
   (let ((commit "9374170858663c8fe829e9fb5a29bd2cb48d95ae"))
     (package
       (name "sbcl-cl-progress-bar")
-      (version (git-version "0.0.0" "1" commit))
+      (version (make-git-version "0.0.0" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -9121,7 +9121,7 @@ (define-public sbcl-cl-project
         (revision "1"))
     (package
       (name "sbcl-cl-project")
-      (version (git-version "0.3.1" revision commit))
+      (version (make-git-version "0.3.1" revision commit))
       (home-page "https://github.com/fukamachi/cl-project")
       (source
        (origin
@@ -9189,7 +9189,7 @@ (define-public sbcl-cl-qprint
         (revision "1"))
     (package
       (name "sbcl-cl-qprint")
-      (version (git-version "0.9.0" revision commit))
+      (version (make-git-version "0.9.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -9281,7 +9281,7 @@ (define-public sbcl-cl-random
         (revision "1"))
     (package
       (name "sbcl-cl-random")
-      (version (git-version "0.0.1" revision commit))
+      (version (make-git-version "0.0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -9340,7 +9340,7 @@ (define-public sbcl-cl-random-forest
         (revision "1"))
     (package
       (name "sbcl-cl-random-forest")
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -9381,7 +9381,7 @@ (define-public sbcl-cl-raylib
         (revision "0"))
     (package
       (name "sbcl-cl-raylib")
-      (version (git-version "0.0.1" revision commit))
+      (version (make-git-version "0.0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -9466,7 +9466,7 @@ (define-public sbcl-cl-readline
         (revision "1"))
     (package
       (name "sbcl-cl-readline")
-      (version (git-version "0.1.2" revision commit))
+      (version (make-git-version "0.1.2" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -9512,7 +9512,7 @@ (define-public sbcl-cl-redis
         (revision "1"))
     (package
       (name "sbcl-cl-redis")
-      (version (git-version "2.3.8" revision commit))
+      (version (make-git-version "2.3.8" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -9567,7 +9567,7 @@ (define-public sbcl-cl-reexport
     (package
       (name "sbcl-cl-reexport")
       (build-system asdf-build-system/sbcl)
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (home-page "https://github.com/takagi/cl-reexport")
       (source
        (origin
@@ -9601,7 +9601,7 @@ (define-public sbcl-cl-rmath
         (revision "1"))
     (package
       (name "sbcl-cl-rmath")
-      (version (git-version "0.0.1" revision commit))
+      (version (make-git-version "0.0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -9646,7 +9646,7 @@ (define-public sbcl-cl-semver
         (revision "0"))
     (package
       (name "sbcl-cl-semver")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -9686,7 +9686,7 @@ (define-public sbcl-cl-setlocale
         (revision "0"))
     (package
       (name "sbcl-cl-setlocale")
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -9717,7 +9717,7 @@ (define-public sbcl-cl-slice
         (revision "1"))
     (package
       (name "sbcl-cl-slice")
-      (version (git-version "0.1.0" revision commit))
+      (version (make-git-version "0.1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -9749,7 +9749,7 @@ (define-public sbcl-cl-slug
         (revision "1"))
     (package
       (name "sbcl-cl-slug")
-      (version (git-version "0.4.1" revision commit))
+      (version (make-git-version "0.4.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -9782,7 +9782,7 @@ (define-public sbcl-cl-smtp
         (revision "0"))
     (package
       (name "sbcl-cl-smtp")
-      (version (git-version "20191031.1" revision commit))
+      (version (make-git-version "20191031.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -9815,7 +9815,7 @@ (define-public sbcl-cl-spark
         (revision "1"))
     (package
       (name "sbcl-cl-spark")
-      (version (git-version "0.1.13" revision commit))
+      (version (make-git-version "0.1.13" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -9845,7 +9845,7 @@ (define-public sbcl-cl-speedy-queue
         (revision "1"))
     (package
       (name "sbcl-cl-speedy-queue")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -9918,7 +9918,7 @@ (define-public sbcl-cl+ssl
         (revision "6"))
     (package
       (name "sbcl-cl+ssl")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -9992,7 +9992,7 @@ (define-public sbcl-cl-steamworks
         (revision "1"))
     (package
       (name "sbcl-cl-steamworks")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -10029,7 +10029,7 @@ (define-public sbcl-cl-store
         (revision "1"))
     (package
       (name "sbcl-cl-store")
-      (version (git-version "0.8.11" revision commit))
+      (version (make-git-version "0.8.11" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -10099,7 +10099,7 @@ (define-public sbcl-cl-strftime
   (let ((commit "21cb57f2595faa26d687893963f24ec41822b63c"))
     (package
       (name "sbcl-cl-strftime")
-      (version (git-version "0.0.0" "1" commit))
+      (version (make-git-version "0.0.0" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -10131,7 +10131,7 @@ (define-public sbcl-cl-string-match
         (changeset "5048480a61243e6f1b02884012c8f25cdbee6d97"))
     (package
       (name "sbcl-cl-string-match")
-      (version (git-version "0" revision changeset))
+      (version (make-git-version "0" revision changeset))
       (source
        (origin
          (method hg-fetch)
@@ -10185,7 +10185,7 @@ (define-public sbcl-cl-strings
         (commit "93ec4177fc51f403a9f1ef0a8933f36d917f2140"))
     (package
       (name "sbcl-cl-strings")
-      (version (git-version "0.0.1" revision commit))
+      (version (make-git-version "0.0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -10218,7 +10218,7 @@ (define-public sbcl-cl-svg
         (revision "1"))
     (package
       (name "sbcl-cl-svg")
-      (version (git-version "0.0.3" revision commit))
+      (version (make-git-version "0.0.3" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -10247,7 +10247,7 @@ (define-public sbcl-cl-sxml
         (revision "1"))
     (package
       (name "sbcl-cl-sxml")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -10315,7 +10315,7 @@ (define-public sbcl-cl-syslog
         (revision "0"))
     (package
       (name "sbcl-cl-syslog")
-      (version (git-version "0.2.4" revision commit))
+      (version (make-git-version "0.2.4" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -10353,7 +10353,7 @@ (define-public sbcl-cl-template
         (revision "0"))
     (package
      (name "sbcl-cl-template")
-     (version (git-version "0.0.1" revision commit))
+     (version (make-git-version "0.0.1" revision commit))
      (home-page "https://github.com/alpha123/cl-template")
      (source
       (origin
@@ -10383,7 +10383,7 @@ (define-public sbcl-cl-tga
         (revision "0"))
     (package
       (name "sbcl-cl-tga")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -10413,7 +10413,7 @@ (define-public sbcl-cl-tld
   (let ((commit "f5014da8d831fa9481d4181d4450f10a52850c75"))
     (package
       (name "sbcl-cl-tld")
-      (version (git-version "0.1" "2" commit))
+      (version (make-git-version "0.1" "2" commit))
       (source
        (origin
          (method git-fetch)
@@ -10442,7 +10442,7 @@ (define-public sbcl-cl-tls
         (revision "0"))
     (package
       (name "sbcl-cl-tls")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -10476,7 +10476,7 @@ (define-public sbcl-cl-typesetting
         (revision "1"))
     (package
       (name "sbcl-cl-typesetting")
-      (version (git-version "0.8.0" revision commit))
+      (version (make-git-version "0.8.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -10513,7 +10513,7 @@ (define-public sbcl-cl-uglify-js
         (revision "1"))
     (package
       (name "sbcl-cl-uglify-js")
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -10641,7 +10641,7 @@ (define-public sbcl-cl-unification
         (revision "1"))
     (package
       (name "sbcl-cl-unification")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -10683,7 +10683,7 @@ (define-public sbcl-cl-utilities
         (revision "1"))
     (package
       (name "sbcl-cl-utilities")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method url-fetch)
@@ -10796,7 +10796,7 @@ (define-public sbcl-cl-vorbis
         (revision "0"))
     (package
       (name "sbcl-cl-vorbis")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -10847,7 +10847,7 @@ (define-public sbcl-cl-wayland
         (revision "0"))
     (package
       (name "sbcl-cl-wayland")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -10949,7 +10949,7 @@ (define-public sbcl-cl-who
         (revision "3"))
     (package
       (name "sbcl-cl-who")
-      (version (git-version version revision commit))
+      (version (make-git-version version revision commit))
       (source
        (origin
          (method git-fetch)
@@ -10983,7 +10983,7 @@ (define-public sbcl-cl-xkb
         (revision "1"))
     (package
       (name "sbcl-cl-xkb")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -11039,7 +11039,7 @@ (define-public sbcl-cl-xmlspam
     (package
       (name "sbcl-cl-xmlspam")
       (build-system asdf-build-system/sbcl)
-      (version (git-version "0.0.0" "1" commit))
+      (version (make-git-version "0.0.0" "1" commit))
       (home-page "https://github.com/rogpeppe/cl-xmlspam")
       (source
        (origin
@@ -11110,7 +11110,7 @@ (define-public sbcl-cl-yaml
         (revision "1"))
     (package
       (name "sbcl-cl-yaml")
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -11145,7 +11145,7 @@ (define-public sbcl-cl-z85
         (revision "1"))
     (package
       (name "sbcl-cl-z85")
-      (version (git-version "1.0" revision commit))
+      (version (make-git-version "1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -11176,7 +11176,7 @@ (define-public sbcl-clache
   (let ((commit "112976729565e1035532389ca25090ae99badd07"))
     (package
       (name "sbcl-clache")
-      (version (git-version "0.2.1" "1" commit))
+      (version (make-git-version "0.2.1" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -11224,7 +11224,7 @@ (define-public sbcl-clack
         (revision "1"))
     (package
       (name "sbcl-clack")
-      (version (git-version "2.1.0" revision commit))
+      (version (make-git-version "2.1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -11271,7 +11271,7 @@ (define-public sbcl-clad
       (name "sbcl-clad")
       (version
        ;; There's no version, but there's a timestamp
-       (git-version "2023-01-21" revision commit))
+       (make-git-version "2023-01-21" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -11303,7 +11303,7 @@ (define-public sbcl-clamp
   (let ((commit "02b8f3953e5753cc61a719807c82f3795cd28fe1"))
     (package
       (name "sbcl-clamp")
-      (version (git-version "0.3" "1" commit))
+      (version (make-git-version "0.3" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -11386,7 +11386,7 @@ (define-public sbcl-classimp
         (revision "1"))
     (package
       (name "sbcl-classimp")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -11428,7 +11428,7 @@ (define-public sbcl-clavier
         (revision "1"))
     (package
       (name "sbcl-clavier")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -11463,7 +11463,7 @@ (define-public sbcl-claw
         (commit "3cd4a96fca95eb9e8d5d069426694669f81b2250"))
     (package
       (name "sbcl-claw")
-      (version (git-version "1.0" revision commit))
+      (version (make-git-version "1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -11528,7 +11528,7 @@ (define-public sbcl-claw-utils
     (package
       (name "sbcl-claw-utils")
       ;; version is not specified
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -11558,7 +11558,7 @@ (define-public sbcl-clawk
   (let ((commit "3a91634df686417114044a98c063cbe76bfac7b6"))
     (package
       (name "sbcl-clawk")
-      (version (git-version "4" "1" commit))
+      (version (make-git-version "4" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -11587,7 +11587,7 @@ (define-public sbcl-clesh
   (let ((commit "44e96e04a72e5bc006dc4eb02ce8962348dd4a11"))
     (package
       (name "sbcl-clesh")
-      (version (git-version "0.0.0" "1" commit))
+      (version (make-git-version "0.0.0" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -11619,7 +11619,7 @@ (define-public sbcl-clinenoise
         (revision "1"))
     (package
       (name "sbcl-clinenoise")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -11650,7 +11650,7 @@ (define-public sbcl-clingon
         (revision "1"))
     (package
       (name "sbcl-clingon")
-      (version (git-version "0.5.0" revision commit))
+      (version (make-git-version "0.5.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -11715,7 +11715,7 @@ (define-public sbcl-clip
         (revision "1"))
     (package
       (name "sbcl-clip")
-      (version (git-version "0.7.0" revision commit))
+      (version (make-git-version "0.7.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -11749,7 +11749,7 @@ (define-public sbcl-clml
         (revision "0"))
     (package
       (name "sbcl-clml")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -11789,7 +11789,7 @@ (define-public sbcl-clobber
         (revision "0"))
     (package
       (name "sbcl-clobber")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -11876,7 +11876,7 @@ (define-public sbcl-clop
     (package
       (name "sbcl-clop")
       ;; ASD file indicates 0.1.0, but changelog 1.0.1.
-      (version (git-version "1.0.1" revision commit))
+      (version (make-git-version "1.0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -11913,7 +11913,7 @@ (define-public sbcl-closer-mop
         (revision "3"))
     (package
       (name "sbcl-closer-mop")
-      (version (git-version  "1.0.0" revision commit))
+      (version (make-git-version  "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -11945,7 +11945,7 @@ (define-public sbcl-clostrum
         (revision "0"))
     (package
       (name "sbcl-clostrum")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -11976,7 +11976,7 @@ (define sbcl-closure-common
     (package
       (name "sbcl-closure-common")
       (build-system asdf-build-system/sbcl)
-      (version (git-version "20101006" revision commit))
+      (version (make-git-version "20101006" revision commit))
       (home-page "https://common-lisp.net/project/cxml/")
       (source
        (origin
@@ -12003,7 +12003,7 @@ (define-public sbcl-closure-template
         (revision "0"))
     (package
       (name "sbcl-closure-template")
-      (version (git-version "0.2.1" revision commit))
+      (version (make-git-version "0.2.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -12207,7 +12207,7 @@ (define-public sbcl-clss
         (commit "f62b849189c5d1be378f0bd3d403cda8d4fe310b"))
     (package
       (name "sbcl-clss")
-      (version (git-version "0.3.1" revision commit))
+      (version (make-git-version "0.3.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -12237,7 +12237,7 @@ (define-public sbcl-cluffer
   (let ((commit "4aad29c276a58a593064e79972ee4d77cae0af4a"))
     (package
       (name "sbcl-cluffer")
-      (version (git-version "0.0.0" "1" commit))
+      (version (make-git-version "0.0.0" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -12284,7 +12284,7 @@ (define-public sbcl-clump
   (let ((commit "1ea4dbac1cb86713acff9ae58727dd187d21048a"))
     (package
       (name "sbcl-clump")
-      (version (git-version "0.0.0" "1" commit))
+      (version (make-git-version "0.0.0" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -12324,7 +12324,7 @@ (define-public sbcl-cluster
         (revision "0"))
     (package
       (name "sbcl-cluster")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -12397,7 +12397,7 @@ (define-public sbcl-clx-truetype
         (revision "1"))
     (package
       (name "sbcl-clx-truetype")
-      (version (git-version "0.0.1" revision commit))
+      (version (make-git-version "0.0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -12439,7 +12439,7 @@ (define-public sbcl-clx-xembed
         (revision "1"))
     (package
       (name "sbcl-clx-xembed")
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (home-page "https://github.com/laynor/clx-xembed")
       (source
        (origin
@@ -12471,7 +12471,7 @@ (define-public sbcl-cmd
         (revision "8"))
     (package
       (name "sbcl-cmd")
-      (version (git-version "0.0.1" revision commit))
+      (version (make-git-version "0.0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -12555,7 +12555,7 @@ (define-public sbcl-coalton
         (revision "4"))
     (package
       (name "sbcl-coalton")
-      (version (git-version "0.0.1" revision commit))
+      (version (make-git-version "0.0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -12595,7 +12595,7 @@ (define-public sbcl-coleslaw
         (revision "0"))
     (package
       (name "sbcl-coleslaw")
-      (version (git-version "0.9.7" revision commit))
+      (version (make-git-version "0.9.7" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -12660,7 +12660,7 @@ (define-public sbcl-collectors
         (revision "2"))
     (package
       (name "sbcl-collectors")
-      (version (git-version "1.0" revision commit))
+      (version (make-git-version "1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -12692,7 +12692,7 @@ (define-public sbcl-colored
         (revision "1"))
     (package
       (name "sbcl-colored")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -12724,7 +12724,7 @@ (define-public sbcl-colorize
   (let ((commit "ea676b584e0899cec82f21a9e6871172fe3c0eb5"))
     (package
       (name "sbcl-colorize")
-      (version (git-version "0.0.0" "1" commit))
+      (version (make-git-version "0.0.0" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -12758,7 +12758,7 @@ (define-public sbcl-com.gigamonkeys.binary-data
         (revision "0"))
     (package
       (name "sbcl-com.gigamonkeys.binary-data")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -12832,7 +12832,7 @@ (define-public sbcl-command-line-arguments
         (revision "1"))
     (package
       (name "sbcl-command-line-arguments")
-      (version (git-version "2.0.0" revision commit))
+      (version (make-git-version "2.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -12864,7 +12864,7 @@ (define-public sbcl-common-lisp-jupyter
         (revision "0"))
     (package
       (name "sbcl-common-lisp-jupyter")
-      (version (git-version "1.0" revision commit))
+      (version (make-git-version "1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -12948,7 +12948,7 @@ (define-public sbcl-compiler-macro
         (revision "0"))
     (package
       (name "sbcl-compiler-macro")
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -13024,7 +13024,7 @@ (define-public sbcl-computable-reals
   (let ((commit "fdc73d75e79d0a4ce6d01c822c950ae2eb137d39"))
     (package
       (name "sbcl-computable-reals")
-      (version (git-version "1.1.0" "1" commit))
+      (version (make-git-version "1.1.0" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -13053,7 +13053,7 @@ (define-public sbcl-concrete-syntax-tree
         (revision "0"))
     (package
       (name "sbcl-concrete-syntax-tree")
-      (version (git-version "0.2.0" revision commit))
+      (version (make-git-version "0.2.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -13099,7 +13099,7 @@ (define-public sbcl-concurrent-hash-tables
         (revision "1"))
     (package
       (name "sbcl-concurrent-hash-tables")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -13163,7 +13163,7 @@ (define-public sbcl-conium
         (revision "1"))
     (package
       (name "sbcl-conium")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -13197,7 +13197,7 @@ (define-public sbcl-constantfold
         (revision "1"))
     (package
       (name "sbcl-constantfold")
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -13235,7 +13235,7 @@ (define-public sbcl-contextl
         (revision "2"))
     (package
       (name "sbcl-contextl")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -13270,7 +13270,7 @@ (define-public sbcl-core-gp
         (revision "1"))
     (package
       (name "sbcl-core-gp")
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -13303,7 +13303,7 @@ (define-public sbcl-croatoan
         (revision "2"))
     (package
       (name "sbcl-croatoan")
-      (version (git-version "0.3" revision commit))
+      (version (make-git-version "0.3" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -13344,7 +13344,7 @@ (define-public sbcl-crypto-shortcuts
         (revision "1"))
     (package
       (name "sbcl-crypto-shortcuts")
-      (version (git-version "2.0.0" revision commit))
+      (version (make-git-version "2.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -13408,7 +13408,7 @@ (define-public sbcl-ctype
   (let ((commit "6eb84dfbf1d41f251cc0c09f6e69a2b9415fd3d6"))
     (package
       (name "sbcl-ctype")
-      (version (git-version "0.0.0" "4" commit))
+      (version (make-git-version "0.0.0" "4" commit))
       (source
        (origin
          (method git-fetch)
@@ -13445,7 +13445,7 @@ (define-public sbcl-curry-compose-reader-macros
         (revision "0"))
     (package
       (name "sbcl-curry-compose-reader-macros")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -13480,7 +13480,7 @@ (define-public sbcl-custom-hash-table
   (let ((commit "f26983133940f5edf826ebbc8077acc04816ddfa"))
     (package
       (name "sbcl-custom-hash-table")
-      (version (git-version "0.3" "1" commit))
+      (version (make-git-version "0.3" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -13516,7 +13516,7 @@ (define-public sbcl-cxml
         (revision "1"))
     (package
       (name "sbcl-cxml")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -13548,7 +13548,7 @@ (define-public sbcl-cxml-rng
         (revision "1"))
     (package
       (name "sbcl-cxml-rng")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -13585,7 +13585,7 @@ (define-public sbcl-daemon
         (revision "1"))
     (package
       (name "sbcl-daemon")
-      (version (git-version "0.0.4" revision commit))
+      (version (make-git-version "0.0.4" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -13616,7 +13616,7 @@ (define-public sbcl-data-format-validation
         (revision "1"))
     (package
       (name "sbcl-data-format-validation")
-      (version (git-version "0.2.0" revision commit))
+      (version (make-git-version "0.2.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -13646,7 +13646,7 @@ (define-public sbcl-data-frame
         (revision "0"))
     (package
       (name "sbcl-data-frame")
-      (version (git-version "1.1.1" revision commit))
+      (version (make-git-version "1.1.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -13689,7 +13689,7 @@ (define-public sbcl-data-lens
         (revision "0"))
     (package
      (name "sbcl-data-lens")
-     (version (git-version "0.0.0" revision commit))
+     (version (make-git-version "0.0.0" revision commit))
      (source
        (origin
          (method git-fetch)
@@ -13724,7 +13724,7 @@ (define-public sbcl-data-sift
         (revision "1"))
     (package
       (name "sbcl-data-sift")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -13764,7 +13764,7 @@ (define-public sbcl-datafly
         (revision "1"))
     (package
       (name "sbcl-datafly")
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (home-page "https://github.com/fukamachi/datafly")
       (source
        (origin
@@ -13817,7 +13817,7 @@ (define-public sbcl-db3
         (revision "1"))
     (package
       (name "sbcl-db3")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -13846,7 +13846,7 @@ (define-public sbcl-dbi
         (revision "2"))
     (package
       (name "sbcl-dbi")
-      (version (git-version "0.9.5" revision commit))
+      (version (make-git-version "0.9.5" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -13892,7 +13892,7 @@ (define-public sbcl-dbus
         (revision "2"))
     (package
       (name "sbcl-dbus")
-      (version (git-version "20231105" revision commit))
+      (version (make-git-version "20231105" revision commit))
       (home-page "https://github.com/death/dbus")
       (source
        (origin
@@ -13960,7 +13960,7 @@ (define-public sbcl-deeds
         (commit "f5df54eac79b58a34030e0eb8acf3952c788410d"))
     (package
       (name "sbcl-deeds")
-      (version (git-version "1.1.1" revision commit))
+      (version (make-git-version "1.1.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -13991,7 +13991,7 @@ (define-public sbcl-definitions
   (let ((commit "1f4bd7a634a2299aea19cefb5da8041bbb27f2ec"))
     (package
       (name "sbcl-definitions")
-      (version (git-version "1.0.0" "1" commit))
+      (version (make-git-version "1.0.0" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -14093,7 +14093,7 @@ (define-public sbcl-defpackage-plus
         (commit "5492e27e0bdb7b75fa5177ea4388519dc7a75f11"))
     (package
       (name "sbcl-defpackage-plus")
-      (version (git-version "1.0" revision commit))
+      (version (make-git-version "1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -14126,7 +14126,7 @@ (define-public sbcl-defstar
   (let ((commit "132829dac9f84fa7202a0c5793aa6accb8d2662a"))
     (package
       (name "sbcl-defstar")
-      (version (git-version "1.0.0" "1" commit))
+      (version (make-git-version "1.0.0" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -14162,7 +14162,7 @@ (define-public sbcl-deploy
         (revision "2"))
     (package
       (name "sbcl-deploy")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -14196,7 +14196,7 @@ (define-public sbcl-depot
         (revision "1"))
     (package
       (name "sbcl-depot")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -14242,7 +14242,7 @@ (define-public sbcl-dexador
     (package
       (name "sbcl-dexador")
       (build-system asdf-build-system/sbcl)
-      (version (git-version "0.9.15" revision commit))
+      (version (make-git-version "0.9.15" revision commit))
       (home-page "https://github.com/fukamachi/dexador")
       (source
        (origin
@@ -14307,7 +14307,7 @@ (define-public sbcl-dfio
         (revision "0"))
     (package
       (name "sbcl-dfio")
-      (version (git-version "1.0.2" revision commit))
+      (version (make-git-version "1.0.2" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -14346,7 +14346,7 @@ (define-public sbcl-diff
         (revision "1"))
     (package
       (name "sbcl-diff")
-      (version (git-version "0.4" revision commit))
+      (version (make-git-version "0.4" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -14381,7 +14381,7 @@ (define-public sbcl-dissect
   (let ((commit "a70cabcd748cf7c041196efd711e2dcca2bbbb2c"))
     (package
       (name "sbcl-dissect")
-      (version (git-version "1.0.0" "2" commit))
+      (version (make-git-version "1.0.0" "2" commit))
       (source
        (origin
          (method git-fetch)
@@ -14417,7 +14417,7 @@ (define-public sbcl-distributions
         (revision "0"))
     (package
       (name "sbcl-distributions")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -14457,7 +14457,7 @@ (define-public sbcl-djula
         (revision "2"))
     (package
       (name "sbcl-djula")
-      (version (git-version "0.2.0" revision commit))
+      (version (make-git-version "0.2.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -14503,7 +14503,7 @@ (define-public sbcl-dns-client
         (revision "0"))
     (package
       (name "sbcl-dns-client")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -14538,7 +14538,7 @@ (define-public sbcl-do-urlencode
         (revision "1"))
     (package
       (name "sbcl-do-urlencode")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (home-page "https://github.com/drdo/do-urlencode")
       (source
        (origin
@@ -14568,7 +14568,7 @@ (define-public sbcl-documentation-utils
         (revision "0"))
     (package
       (name "sbcl-documentation-utils")
-      (version (git-version "1.2.0" revision commit))
+      (version (make-git-version "1.2.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -14603,7 +14603,7 @@ (define-public sbcl-documentation-utils-extensions
   (let ((commit "f67f8a05d583174662a594b79356b201c1d9d750"))
     (package
       (name "sbcl-documentation-utils-extensions")
-      (version (git-version "0.0.0" "1" commit))
+      (version (make-git-version "0.0.0" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -14714,7 +14714,7 @@ (define-public sbcl-draw-cons-tree
         (revision "0"))
     (package
       (name "sbcl-draw-cons-tree")
-      (version (git-version "1.0" revision commit))
+      (version (make-git-version "1.0" revision commit))
       ;; https://github.com/quicklisp/quicklisp-projects/issues/2149
       (source
        (origin
@@ -14779,7 +14779,7 @@ (define-public sbcl-duologue
         (revision "0"))
     (package
       (name "sbcl-duologue")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -14819,7 +14819,7 @@ (define-public sbcl-dynamic-classes
         (revision "0"))
     (package
       (name "sbcl-dynamic-classes")
-      (version (git-version "1.0.2" revision commit))
+      (version (make-git-version "1.0.2" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -14854,7 +14854,7 @@ (define-public sbcl-dynamic-mixins
   (let ((commit "7cc09bee7d68527f37406671fabe910e8235b746"))
     (package
       (name "sbcl-dynamic-mixins")
-      (version (git-version "0.0" "1" commit))
+      (version (make-git-version "0.0" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -14885,7 +14885,7 @@ (define-public sbcl-eager-future2
   (let ((commit "54df8effd9d9eccac917509590286b5ac5f9cb30"))
     (package
       (name "sbcl-eager-future2")
-      (version (git-version "0.0.0" "1" commit))
+      (version (make-git-version "0.0.0" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -14919,7 +14919,7 @@ (define-public sbcl-easy-routes
         (revision "0"))
     (package
       (name "sbcl-easy-routes")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -14970,7 +14970,7 @@ (define-public sbcl-eazy-gnuplot
         (revision "0"))
     (package
       (name "sbcl-eazy-gnuplot")
-      (version (git-version "0.2.0" revision commit))
+      (version (make-git-version "0.2.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -15017,7 +15017,7 @@ (define-public sbcl-eclector
         (revision "0"))
     (package
       (name "sbcl-eclector")
-      (version (git-version "0.10.0" revision commit))
+      (version (make-git-version "0.10.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -15062,7 +15062,7 @@ (define-public sbcl-enchant
   (let ((commit "6af162a7bf10541cbcfcfa6513894900329713fa"))
     (package
       (name "sbcl-enchant")
-      (version (git-version "0.0.0" "1" commit))
+      (version (make-git-version "0.0.0" "1" commit))
       (home-page "https://github.com/tlikonen/cl-enchant")
       (source
        (origin
@@ -15276,7 +15276,7 @@ (define-public sbcl-envy
 	(revision "2"))
     (package
       (name "sbcl-envy")
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (home-page "https://github.com/fukamachi/envy")
       (source
        (origin
@@ -15347,7 +15347,7 @@ (define-public sbcl-esrap
         (revision "4"))
     (package
       (name "sbcl-esrap")
-      (version (git-version "0.18" revision commit))
+      (version (make-git-version "0.18" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -15390,7 +15390,7 @@ (define-public sbcl-evaled-when
         (revision "0"))
     (package
       (name "sbcl-evaled-when")
-      (version (git-version "1.0" revision commit))
+      (version (make-git-version "1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -15426,7 +15426,7 @@ (define-public sbcl-event-emitter
         (revision "0"))
     (package
      (name "sbcl-event-emitter")
-     (version (git-version "0.0.1" revision commit))
+     (version (make-git-version "0.0.1" revision commit))
      (home-page "https://github.com/fukamachi/event-emitter")
      (source
       (origin
@@ -15456,7 +15456,7 @@ (define-public sbcl-eventbus
         (revision "1"))
     (package
       (name "sbcl-eventbus")
-      (version (git-version "0.1.0" revision commit))
+      (version (make-git-version "0.1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -15484,7 +15484,7 @@ (define-public sbcl-exit-hooks
   (let ((commit "78050f4f55c138fcea86a9d720928782021b6012"))
     (package
       (name "sbcl-exit-hooks")
-      (version (git-version "0.0.0" "1" commit))
+      (version (make-git-version "0.0.0" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -15517,7 +15517,7 @@ (define-public sbcl-exponential-backoff
   (let ((commit "8d9e8444d8b3184a524c12ce3449f91613ab714f"))
     (package
       (name "sbcl-exponential-backoff")
-      (version (git-version "0" "1" commit))
+      (version (make-git-version "0" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -15551,7 +15551,7 @@ (define-public sbcl-external-program
         (revision "1"))
     (package
       (name "sbcl-external-program")
-      (version (git-version "0.0.6" revision commit))
+      (version (make-git-version "0.0.6" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -15587,7 +15587,7 @@ (define-public sbcl-f2cl
         (revision "1"))
     (package
       (name "sbcl-f2cl")
-      (version (git-version "1.0" revision commit))
+      (version (make-git-version "1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -15661,7 +15661,7 @@ (define-public sbcl-fare-csv
         (revision "0"))
     (package
       (name "sbcl-fare-csv")
-      (version (git-version "1.0.4" revision commit))
+      (version (make-git-version "1.0.4" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -15732,7 +15732,7 @@ (define-public sbcl-fare-mop
         (revision "1"))
     (package
       (name "sbcl-fare-mop")
-      (version (git-version "1.0.1" revision commit))
+      (version (make-git-version "1.0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -15771,7 +15771,7 @@ (define-public sbcl-fare-quasiquote
     (package
       (name "sbcl-fare-quasiquote")
       (build-system asdf-build-system/sbcl)
-      (version (git-version "1.0.1" revision commit))
+      (version (make-git-version "1.0.1" revision commit))
       (home-page "https://gitlab.common-lisp.net/frideau/fare-quasiquote")
       (source
        (origin
@@ -15827,7 +15827,7 @@ (define-public sbcl-fare-utils
         (revision "1"))
     (package
       (name "sbcl-fare-utils")
-      (version (git-version "1.0.0.5" revision commit))
+      (version (make-git-version "1.0.0.5" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -15865,7 +15865,7 @@ (define-public sbcl-fast-generic-functions
         (revision "2"))
     (package
       (name "sbcl-fast-generic-functions")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -15904,7 +15904,7 @@ (define-public sbcl-fast-http
         (revision "2"))
     (package
       (name "sbcl-fast-http")
-      (version (git-version "0.2.0" revision commit))
+      (version (make-git-version "0.2.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -15942,7 +15942,7 @@ (define-public sbcl-fast-io
         (revision "3"))
     (package
      (name "sbcl-fast-io")
-     (version (git-version "1.0.0" revision commit))
+     (version (make-git-version "1.0.0" revision commit))
      (source
       (origin
        (method git-fetch)
@@ -15976,7 +15976,7 @@ (define-public sbcl-fast-websocket
         (revision "1"))
     (package
      (name "sbcl-fast-websocket")
-     (version (git-version "0.1" revision commit))
+     (version (make-git-version "0.1" revision commit))
      (home-page "https://github.com/fukamachi/fast-websocket")
      (source
       (origin
@@ -16019,7 +16019,7 @@ (define-public sbcl-feeder
         (revision "1"))
     (package
       (name "sbcl-feeder")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -16055,7 +16055,7 @@ (define-public sbcl-ffa
         (revision "1"))
     (package
       (name "sbcl-ffa")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -16086,7 +16086,7 @@ (define-public sbcl-file-attributes
   (let ((commit "bbde396438f37d676de9775239115410bec4da2d"))
     (package
       (name "sbcl-file-attributes")
-      (version (git-version "1.0.0" "2" commit))
+      (version (make-git-version "1.0.0" "2" commit))
       (source
        (origin
          (method git-fetch)
@@ -16117,7 +16117,7 @@ (define-public sbcl-file-finder
         (revision "0"))
     (package
       (name "sbcl-file-finder")
-      (version (git-version "0.2.0" revision commit))
+      (version (make-git-version "0.2.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -16153,7 +16153,7 @@ (define-public sbcl-file-notify
         (revision "0"))
     (package
       (name "sbcl-file-notify")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -16186,7 +16186,7 @@ (define-public sbcl-file-select
         (revision "1"))
     (package
       (name "sbcl-file-select")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -16222,7 +16222,7 @@ (define-public sbcl-filesystem-utils
         (revision "2"))
     (package
       (name "sbcl-filesystem-utils")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -16255,7 +16255,7 @@ (define-public sbcl-filtered-functions
   (let ((commit "130f69e7b9e1051bf569ef63364b09a3873f0ced"))
     (package
       (name "sbcl-filtered-functions")
-      (version (git-version "0.2.0" "1" commit))
+      (version (make-git-version "0.2.0" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -16291,7 +16291,7 @@ (define-public sbcl-find-port
     (package
       (name "sbcl-find-port")
       (build-system asdf-build-system/sbcl)
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (home-page "https://github.com/eudoxia0/find-port")
       (source
        (origin
@@ -16323,7 +16323,7 @@ (define-public sbcl-flamegraph
         (revision "1"))
     (package
       (name "sbcl-flamegraph")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -16353,7 +16353,7 @@ (define-public sbcl-flare
         (revision "1"))
     (package
       (name "sbcl-flare")
-      (version (git-version "1.1.0" revision commit))
+      (version (make-git-version "1.1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -16391,7 +16391,7 @@ (define-public sbcl-flexi-streams
         (revision "1"))
     (package
       (name "sbcl-flexi-streams")
-      (version (git-version "1.0.20" revision commit))
+      (version (make-git-version "1.0.20" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -16438,7 +16438,7 @@ (define-public sbcl-flexichain
         (revision "2"))
     (package
       (name "sbcl-flexichain")
-      (version (git-version "1.5.1" revision commit))
+      (version (make-git-version "1.5.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -16470,7 +16470,7 @@ (define-public sbcl-float-features
         (revision "2"))
     (package
       (name "sbcl-float-features")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -16506,7 +16506,7 @@ (define-public sbcl-flow
         (revision "1"))
     (package
       (name "sbcl-flow")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -16553,7 +16553,7 @@ (define-public sbcl-flute
         (revision "1"))
     (package
       (name "sbcl-flute")
-      (version (git-version "0.2-dev" revision commit))
+      (version (make-git-version "0.2-dev" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -16586,7 +16586,7 @@ (define-public sbcl-fn
         (revision "1"))
     (package
       (name "sbcl-fn")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -16621,7 +16621,7 @@ (define-public sbcl-fof
         (revision "1"))
     (package
       (name "sbcl-fof")
-      (version (git-version "0.2.0" revision commit))
+      (version (make-git-version "0.2.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -16678,7 +16678,7 @@ (define-public sbcl-font-discovery
         (revision "1"))
     (package
       (name "sbcl-font-discovery")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -16710,7 +16710,7 @@ (define-public sbcl-for
         (revision "1"))
     (package
       (name "sbcl-for")
-      (version (git-version "1.2.0" revision commit))
+      (version (make-git-version "1.2.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -16746,7 +16746,7 @@ (define-public sbcl-forge
         (revision "1"))
     (package
       (name "sbcl-forge")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -16787,7 +16787,7 @@ (define-public sbcl-form-fiddle
         (revision "0"))
     (package
       (name "sbcl-form-fiddle")
-      (version (git-version "1.1.0" revision commit))
+      (version (make-git-version "1.1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -16823,7 +16823,7 @@ (define-public sbcl-format-colors
         (revision "0"))
     (package
       (name "sbcl-format-colors")
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -16852,7 +16852,7 @@ (define-public sbcl-formgrep
         (revision "0"))
     (package
       (name "sbcl-formgrep")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -16966,7 +16966,7 @@ (define-public sbcl-funds
         (revision "2"))
     (package
       (name "sbcl-funds")
-      (version (git-version "1" revision commit))
+      (version (make-git-version "1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -16996,7 +16996,7 @@ (define-public sbcl-fuzzy-dates
         (revision "0"))
     (package
       (name "sbcl-fuzzy-dates")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -17031,7 +17031,7 @@ (define-public sbcl-fuzzy-match
         (revision "1"))
     (package
       (name "sbcl-fuzzy-match")
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -17062,7 +17062,7 @@ (define-public sbcl-fxml
   (let ((commit "a0e73bb48ef03adea94a55986cc27f522074c8e1"))
     (package
       (name "sbcl-fxml")
-      (version (git-version "0.0.0" "1" commit))
+      (version (make-git-version "0.0.0" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -17109,7 +17109,7 @@ (define-public sbcl-garbage-pools
         (revision "1"))
     (package
       (name "sbcl-garbage-pools")
-      (version (git-version "0.1.2" revision commit))
+      (version (make-git-version "0.1.2" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -17137,7 +17137,7 @@ (define-public sbcl-geco
         (revision "1"))
     (package
       (name "sbcl-geco")
-      (version (git-version "2.1.2" revision commit))
+      (version (make-git-version "2.1.2" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -17212,7 +17212,7 @@ (define-public sbcl-generic-comparability
         (revision "1"))
     (package
       (name "sbcl-generic-comparability")
-      (version (git-version "1.0.1" revision commit))
+      (version (make-git-version "1.0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -17248,7 +17248,7 @@ (define-public sbcl-genhash
         (revision "1"))
     (package
       (name "sbcl-genhash")
-      (version (git-version "1.7" revision commit))
+      (version (make-git-version "1.7" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -17276,7 +17276,7 @@ (define-public sbcl-germinal
         (revision "0"))
     (package
       (name "sbcl-germinal")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -17320,7 +17320,7 @@ (define-public sbcl-gettext
         (revision "1"))
     (package
       (name "sbcl-gettext")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -17352,7 +17352,7 @@ (define-public sbcl-glkit
   (let ((commit "0d8e7c5fed4231f2177afcf0f3ff66f196ed6a46"))
     (package
       (name "sbcl-glkit")
-      (version (git-version "0.0" "1" commit))
+      (version (make-git-version "0.0" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -17396,7 +17396,7 @@ (define-public sbcl-global-vars
         (revision "0"))
     (package
       (name "sbcl-global-vars")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (home-page "https://github.com/lmj/global-vars")
       (source
        (origin
@@ -17436,7 +17436,7 @@ (define-public sbcl-glop
         (revision "1"))
     (package
       (name "sbcl-glop")
-      (version (git-version "0.1.0" revision commit))
+      (version (make-git-version "0.1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -17503,7 +17503,7 @@ (define-public sbcl-glsl-packing
         (revision "1"))
     (package
       (name "sbcl-glsl-packing")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -17537,7 +17537,7 @@ (define-public sbcl-glsl-spec
         (revision "1"))
     (package
       (name "sbcl-glsl-spec")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -17571,7 +17571,7 @@ (define-public sbcl-glsl-toolkit
         (revision "2"))
     (package
       (name "sbcl-glsl-toolkit")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -17602,7 +17602,7 @@ (define-public sbcl-glyphs
   (let ((commit "1ff5714e8c1dca327bc604dfe3e3d1f4b7755373"))
     (package
       (name "sbcl-glyphs")
-      (version (git-version "0.0.0" "1" commit))
+      (version (make-git-version "0.0.0" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -17633,7 +17633,7 @@ (define-public sbcl-golden-utils
         (revision "4"))
     (package
       (name "sbcl-golden-utils")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (home-page "https://github.com/lisp-mirror/golden-utils")
       (source
        (origin
@@ -17666,7 +17666,7 @@ (define-public sbcl-graph
         (revision "0"))
     (package
       (name "sbcl-graph")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -17712,7 +17712,7 @@ (define-public sbcl-green-threads
         (revision "1"))
     (package
       (name "sbcl-green-threads")
-      (version (git-version "0.3" revision commit))
+      (version (make-git-version "0.3" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -17760,7 +17760,7 @@ (define-public sbcl-gsll
         (revision "1"))
     (package
       (name "sbcl-gsll")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -17854,7 +17854,7 @@ (define-public sbcl-gtype
         (revision "2"))
     (package
       (name "sbcl-gtype")
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -17898,7 +17898,7 @@ (define-public sbcl-harmony
         (revision "0"))
     (package
       (name "sbcl-harmony")
-      (version (git-version "2.0.0" revision commit))
+      (version (make-git-version "2.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -17935,7 +17935,7 @@ (define-public sbcl-hash-set
         (revision "0"))
     (package
       (name "sbcl-hash-set")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -17966,7 +17966,7 @@ (define-public sbcl-hdf5-cffi
         (revision "1"))
     (package
       (name "sbcl-hdf5-cffi")
-      (version (git-version "1.8.18" revision commit))
+      (version (make-git-version "1.8.18" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -18035,7 +18035,7 @@ (define-public sbcl-helambdap
         (revision "0"))
     (package
       (name "sbcl-helambdap")
-      (version (git-version "20220103" revision commit))
+      (version (make-git-version "20220103" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -18133,7 +18133,7 @@ (define-public sbcl-html-entities
   (let ((commit "4af018048e891f41d77e7d680ed3aeb639e1eedb"))
     (package
       (name "sbcl-html-entities")
-      (version (git-version "0.02" "1" commit))
+      (version (make-git-version "0.02" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -18205,7 +18205,7 @@ (define-public sbcl-http-body
         (revision "2"))
     (package
      (name "sbcl-http-body")
-     (version (git-version "0.1.0" revision commit))
+     (version (make-git-version "0.1.0" revision commit))
      (source
       (origin
        (method git-fetch)
@@ -18345,7 +18345,7 @@ (define-public sbcl-hu.dwim.defclass-star
       (name "sbcl-hu.dwim.defclass-star")
       ;; We used to set version from the date when it was a darcs repo, so we
       ;; keep the year so that package gets updated on previous installs.
-      (version (git-version "2021" "2" commit))
+      (version (make-git-version "2021" "2" commit))
       (source
        (origin
          (method git-fetch)
@@ -18395,7 +18395,7 @@ (define-public sbcl-hu.dwim.graphviz
         (revision "1"))
     (package
       (name "sbcl-hu.dwim.graphviz")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -18436,7 +18436,7 @@ (define-public sbcl-hunchenissr
         (revision "1"))
     (package
       (name "sbcl-hunchenissr")
-      (version (git-version "1" revision commit))
+      (version (make-git-version "1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -18475,7 +18475,7 @@ (define-public sbcl-hunchenissr-routes
         (revision "1"))
     (package
       (name "sbcl-hunchenissr-routes")
-      (version (git-version "0" revision commit))
+      (version (make-git-version "0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -18509,7 +18509,7 @@ (define-public sbcl-hunchensocket
         (revision "0"))
     (package
       (name "sbcl-hunchensocket")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -18551,7 +18551,7 @@ (define-public sbcl-hunchentoot
         (revision "1"))
     (package
       (name "sbcl-hunchentoot")
-      (version (git-version "1.3.0" revision commit))
+      (version (make-git-version "1.3.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -18599,7 +18599,7 @@ (define-public sbcl-hunchentoot-errors
         (revision "0"))
     (package
       (name "sbcl-hunchentoot-errors")
-      (version (git-version "0.0.1" revision commit))
+      (version (make-git-version "0.0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -18633,7 +18633,7 @@ (define-public sbcl-hypergeometrica
         (revision "0"))
     (package
       (name "sbcl-hypergeometrica")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -18712,7 +18712,7 @@ (define-public sbcl-ieee-floats
     (package
       (name "sbcl-ieee-floats")
       (build-system asdf-build-system/sbcl)
-      (version (git-version "20170924" revision commit))
+      (version (make-git-version "20170924" revision commit))
       (home-page "https://github.com/marijnh/ieee-floats/")
       (source
        (origin
@@ -18742,7 +18742,7 @@ (define-public sbcl-in-memory-streams
         (revision "1"))
     (package
       (name "sbcl-in-memory-streams")
-      (version (git-version "2.0" revision commit))
+      (version (make-git-version "2.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -18775,7 +18775,7 @@ (define-public sbcl-incless
         (revision "0"))
     (package
       (name "sbcl-incless")
-      (version (git-version "0.0.1" revision commit))
+      (version (make-git-version "0.0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -18810,7 +18810,7 @@ (define-public sbcl-inferior-shell
         (revision "1"))
     (package
       (name "sbcl-inferior-shell")
-      (version (git-version "2.0.5" revision commit))
+      (version (make-git-version "2.0.5" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -18844,7 +18844,7 @@ (define-public sbcl-infix-math
         (revision "0"))
     (package
       (name "sbcl-infix-math")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -18942,7 +18942,7 @@ (define-public sbcl-inquisitor
         (revision "0"))
     (package
       (name "sbcl-inquisitor")
-      (version (git-version "0.5" revision commit))
+      (version (make-git-version "0.5" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -18974,7 +18974,7 @@ (define-public sbcl-interface
         (revision "0"))
     (package
       (name "sbcl-interface")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -19007,7 +19007,7 @@ (define-public sbcl-introspect-environment
     (package
       (name "sbcl-introspect-environment")
       (build-system asdf-build-system/sbcl)
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (home-page "https://github.com/Bike/introspect-environment")
       (source
        (origin
@@ -19052,7 +19052,7 @@ (define-public sbcl-iolib
         (revision "0"))
     (package
       (name "sbcl-iolib")
-      (version (git-version "0.8.4" revision commit))
+      (version (make-git-version "0.8.4" revision commit))
       (home-page "https://github.com/sionescu/iolib")
       (source
        (origin
@@ -19148,7 +19148,7 @@ (define-public sbcl-issr-core
         (revision "1"))
     (package
       (name "sbcl-issr-core")
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -19224,7 +19224,7 @@ (define-public sbcl-ixf
         (revision "1"))
     (package
       (name "sbcl-ixf")
-      (version (git-version "0.1.0" revision commit))
+      (version (make-git-version "0.1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -19261,7 +19261,7 @@ (define-public sbcl-jonathan
         (revision "1"))
     (package
      (name "sbcl-jonathan")
-     (version (git-version "0.1.0" revision commit))
+     (version (make-git-version "0.1.0" revision commit))
      (source
       (origin
        (method git-fetch)
@@ -19296,7 +19296,7 @@ (define-public sbcl-jose
     (package
       (name "sbcl-jose")
       (build-system asdf-build-system/sbcl)
-      (version (git-version "0.1.0" revision commit))
+      (version (make-git-version "0.1.0" revision commit))
       (home-page "https://github.com/fukamachi/jose")
       (source
        (origin
@@ -19332,7 +19332,7 @@ (define-public sbcl-jpeg-turbo
         (revision "1"))
     (package
       (name "sbcl-jpeg-turbo")
-      (version (git-version "1.0" revision commit))
+      (version (make-git-version "1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -19455,7 +19455,7 @@ (define-public sbcl-json-streams
         (revision "1"))
     (package
       (name "sbcl-json-streams")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -19489,7 +19489,7 @@ (define-public sbcl-jsonrpc
         (revision "1"))
     (package
       (name "sbcl-jsonrpc")
-      (version (git-version "0.3.2" revision commit))
+      (version (make-git-version "0.3.2" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -19530,7 +19530,7 @@ (define-public sbcl-jsown
   (let ((commit "744c4407bef58dfa876d9da0b5c0205d869e7977"))
     (package
       (name "sbcl-jsown")
-      (version (git-version "1.0.1" "1" commit))
+      (version (make-git-version "1.0.1" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -19650,7 +19650,7 @@ (define-public sbcl-kdlcl
         (revision "0"))
     (package
       (name "sbcl-kdlcl")
-      (version (git-version "1.0" revision commit))
+      (version (make-git-version "1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -19680,7 +19680,7 @@ (define-public sbcl-kebab
         (revision "1"))
     (package
       (name "sbcl-kebab")
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (home-page "https://github.com/pocket7878/kebab")
       (source
        (origin
@@ -19721,7 +19721,7 @@ (define-public sbcl-kmrcl
         (revision "1"))
     (package
       (name "sbcl-kmrcl")
-      (version (git-version version revision commit))
+      (version (make-git-version version revision commit))
       (source
        (origin
          (method git-fetch)
@@ -19761,7 +19761,7 @@ (define-public sbcl-kons-9
         (revision "0"))
     (package
       (name "sbcl-kons-9")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -19815,7 +19815,7 @@ (define-public sbcl-lack
         (revision "1"))
     (package
       (name "sbcl-lack")
-      (version (git-version "0.3.0" revision commit))
+      (version (make-git-version "0.3.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -19886,7 +19886,7 @@ (define-public sbcl-lambda-fiddle
 	(revision "1"))
     (package
       (name "sbcl-lambda-fiddle")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -19917,7 +19917,7 @@ (define-public sbcl-language-codes
   (let ((commit "e7aa0e37cb97a3d37d6bc7316b479d01bff8f42e"))
     (package
       (name "sbcl-language-codes")
-      (version (git-version "1.0.0" "1" commit))
+      (version (make-git-version "1.0.0" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -19951,7 +19951,7 @@ (define-public sbcl-langutils
         (revision "0"))
     (package
       (name "sbcl-langutils")
-      (version (git-version "1.0" revision commit))
+      (version (make-git-version "1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -19995,7 +19995,7 @@ (define-public sbcl-lass
         (revision "1"))
     (package
       (name "sbcl-lass")
-      (version (git-version "0.6.0" revision commit))
+      (version (make-git-version "0.6.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -20029,7 +20029,7 @@ (define-public sbcl-legion
         (revision "1"))
     (package
      (name "sbcl-legion")
-     (version (git-version "0.1.1" revision commit))
+     (version (make-git-version "0.1.1" revision commit))
      (source
       (origin
        (method git-fetch)
@@ -20068,7 +20068,7 @@ (define-public sbcl-legit
         (revision "3"))
     (package
       (name "sbcl-legit")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -20114,7 +20114,7 @@ (define-public sbcl-lem-mailbox
         (revision "0"))
     (package
       (name "sbcl-lem-mailbox")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -20147,7 +20147,7 @@ (define-public sbcl-let-over-lambda
         (revision "1"))
     (package
       (name "sbcl-let-over-lambda")
-      (version (git-version "1.0.1" revision commit))
+      (version (make-git-version "1.0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -20192,7 +20192,7 @@ (define-public sbcl-let-plus
         (revision "2"))
     (package
       (name "sbcl-let-plus")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -20233,7 +20233,7 @@ (define-public sbcl-lev
         (revision "1"))
     (package
       (name "sbcl-lev")
-      (version (git-version "0.1.0" revision commit))
+      (version (make-git-version "0.1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -20351,7 +20351,7 @@ (define-public sbcl-linedit
         (revision "1"))
     (package
       (name "sbcl-linedit")
-      (version (git-version "0.17.6" revision commit))
+      (version (make-git-version "0.17.6" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -20383,7 +20383,7 @@ (define-public sbcl-lisp-namespace
     (package
       (name "sbcl-lisp-namespace")
       (build-system asdf-build-system/sbcl)
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (home-page "https://github.com/guicho271828/lisp-namespace")
       (source
        (origin
@@ -20416,7 +20416,7 @@ (define-public sbcl-lisp-pay
         (revision "0"))
     (package
       (name "sbcl-lisp-pay")
-      (version (git-version "0.0.5" revision commit))
+      (version (make-git-version "0.0.5" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -20459,7 +20459,7 @@ (define-public sbcl-lisp-preprocessor
         (revision "0"))
     (package
       (name "sbcl-lisp-preprocessor")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -20494,7 +20494,7 @@ (define-public sbcl-lisp-stat
         (revision "0"))
     (package
       (name "sbcl-lisp-stat")
-      (version (git-version "1.2.0" revision commit))
+      (version (make-git-version "1.2.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -20538,7 +20538,7 @@ (define-public sbcl-lispbuilder-sdl
         (revision "2"))
     (package
       (name "sbcl-lispbuilder-sdl")
-      (version (git-version "0.9.8.2" revision commit))
+      (version (make-git-version "0.9.8.2" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -20583,7 +20583,7 @@ (define-public sbcl-list-named-class
         (revision "0"))
     (package
       (name "sbcl-list-named-class")
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -20644,7 +20644,7 @@ (define-public sbcl-literate-lisp
         (revision "1"))
     (package
       (name "sbcl-literate-lisp")
-      (version (git-version "0.6" revision commit))
+      (version (make-git-version "0.6" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -20678,7 +20678,7 @@ (define-public sbcl-livesupport
 	(revision "1"))
     (package
       (name "sbcl-livesupport")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -20708,7 +20708,7 @@ (define-public sbcl-lla
         (revision "2"))
     (package
       (name "sbcl-lla")
-      (version (git-version "0.4.0" revision commit))
+      (version (make-git-version "0.4.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -20764,7 +20764,7 @@ (define-public sbcl-lmdb
         (revision "0"))
     (package
       (name "sbcl-lmdb")
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -20815,7 +20815,7 @@ (define-public sbcl-local-time
         (revision "4"))
     (package
      (name "sbcl-local-time")
-     (version (git-version "1.0.6" revision commit))
+     (version (make-git-version "1.0.6" revision commit))
      (source
       (origin
        (method git-fetch)
@@ -20887,7 +20887,7 @@ (define-public sbcl-log4cl
         (revision "2"))
     (package
       (name "sbcl-log4cl")
-      (version (git-version "1.1.4" revision commit))
+      (version (make-git-version "1.1.4" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -20920,7 +20920,7 @@ (define-public sbcl-lorem-ipsum
         (revision "0"))
     (package
       (name "sbcl-lorem-ipsum")
-      (version (git-version "1.0" revision commit))
+      (version (make-git-version "1.0" revision commit))
       (source
         (origin
           (method git-fetch)
@@ -20951,7 +20951,7 @@ (define-public sbcl-lparallel
         (revision "1"))
     (package
       (name "sbcl-lparallel")
-      (version (git-version "2.8.4" revision commit))
+      (version (make-git-version "2.8.4" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -21008,7 +21008,7 @@ (define-public sbcl-lquery
         (commit "8048111c6b83956daa632e7a3ffbd8c9c203bd8d"))
     (package
       (name "sbcl-lquery")
-      (version (git-version "3.2.1" revision commit))
+      (version (make-git-version "3.2.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -21045,7 +21045,7 @@ (define-public sbcl-ltk
         (revision "0"))
     (package
       (name "sbcl-ltk")
-      (version (git-version "0.992" revision commit))
+      (version (make-git-version "0.992" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -21102,7 +21102,7 @@ (define-public sbcl-lunamech-matrix-api
         (revision "0"))
     (package
       (name "sbcl-lunamech-matrix-api")
-      (version (git-version "0.0.2" revision commit))
+      (version (make-git-version "0.0.2" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -21142,7 +21142,7 @@ (define-public sbcl-lw-compat
   (let ((commit "aabfe28c6c1a4949f9d7b3cb30319367c9fd1c0d"))
     (package
       (name "sbcl-lw-compat")
-      (version (git-version "1.0.0" "1" commit))
+      (version (make-git-version "1.0.0" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -21173,7 +21173,7 @@ (define-public sbcl-lzlib
         (revision "2"))
     (package
       (name "sbcl-lzlib")
-      (version (git-version "2.0" revision commit))
+      (version (make-git-version "2.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -21217,7 +21217,7 @@ (define-public sbcl-machine-state
         (revision "2"))
     (package
       (name "sbcl-machine-state")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -21254,7 +21254,7 @@ (define-public sbcl-magic-ed
         (revision "1"))
     (package
       (name "sbcl-magic-ed")
-      (version (git-version "0.2" revision commit))
+      (version (make-git-version "0.2" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -21285,7 +21285,7 @@ (define-public sbcl-magicffi
   (let ((commit "d88f2f280c31f639e4e05be75215d8a8dce6aef2"))
     (package
       (name "sbcl-magicffi")
-      (version (git-version "0.0.0" "1" commit))
+      (version (make-git-version "0.0.0" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -21378,7 +21378,7 @@ (define-public sbcl-maiden
         (revision "1"))
     (package
       (name "sbcl-maiden")
-      (version (git-version "3.1.0" revision commit))
+      (version (make-git-version "3.1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -21433,7 +21433,7 @@ (define-public sbcl-maidenhead
         (revision "1"))
     (package
       (name "sbcl-maidenhead")
-      (version (git-version "1.1" revision commit))
+      (version (make-git-version "1.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -21466,7 +21466,7 @@ (define-public sbcl-make-hash
         (commit "ae0909cd8e697520a1085fac6f54ac2b448ebd21"))
     (package
       (name "sbcl-make-hash")
-      (version (git-version "1.0.2" revision commit))
+      (version (make-git-version "1.0.2" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -21498,7 +21498,7 @@ (define-public sbcl-map-bind
         (revision "0"))
     (package
       (name "sbcl-map-bind")
-      (version (git-version "1.0" revision commit))
+      (version (make-git-version "1.0" revision commit))
       (source
         (origin
           (method git-fetch)
@@ -21530,7 +21530,7 @@ (define-public sbcl-map-set
         (revision "1"))
     (package
       (name "sbcl-map-set")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method url-fetch)
@@ -21563,7 +21563,7 @@ (define-public sbcl-markup-reader
         (revision "1"))
     (package
       (name "sbcl-markup-reader")
-      (version (git-version "0.0.1" revision commit))
+      (version (make-git-version "0.0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -21603,7 +21603,7 @@ (define-public sbcl-marray
         (revision "0"))
     (package
       (name "sbcl-marray")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -21641,7 +21641,7 @@ (define-public sbcl-marshal
         (revision "1"))
     (package
      (name "sbcl-marshal")
-     (version (git-version "1.3.0" revision commit))
+     (version (make-git-version "1.3.0" revision commit))
      (source
       (origin
        (method git-fetch)
@@ -21673,7 +21673,7 @@ (define-public sbcl-mathkit
   (let ((commit "fd884f94b36ef5e9bc19459ad0b3cda6303d2a2a"))
     (package
       (name "sbcl-mathkit")
-      (version (git-version "0.0" "1" commit))
+      (version (make-git-version "0.0" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -21705,7 +21705,7 @@ (define-public sbcl-maxpc
         (revision "1"))
     (package
       (name "sbcl-maxpc")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -21863,7 +21863,7 @@ (define-public sbcl-messagebox
         (revision "1"))
     (package
       (name "sbcl-messagebox")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -21906,7 +21906,7 @@ (define-public sbcl-meta
         (revision "0"))
     (package
       (name "sbcl-meta")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -21937,7 +21937,7 @@ (define-public sbcl-metabang-bind
         (revision "2"))
     (package
       (name "sbcl-metabang-bind")
-      (version (git-version "0.8.0" revision commit))
+      (version (make-git-version "0.8.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -21973,7 +21973,7 @@ (define-public sbcl-metacopy
         (revision "2"))
     (package
       (name "sbcl-metacopy")
-      (version (git-version "0.2.0" revision commit))
+      (version (make-git-version "0.2.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -22008,7 +22008,7 @@ (define-public sbcl-metatilities-base
         (revision "2"))
     (package
       (name "sbcl-metatilities-base")
-      (version (git-version "0.6.6" revision commit))
+      (version (make-git-version "0.6.6" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -22040,7 +22040,7 @@ (define-public sbcl-metering
         (revision "0"))
     (package
       (name "sbcl-metering")
-      (version (git-version "3.2" revision commit))
+      (version (make-git-version "3.2" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -22071,7 +22071,7 @@ (define-public sbcl-mgl-gpr
         (revision "1"))
     (package
       (name "sbcl-mgl-gpr")
-      (version (git-version "0.0.1" revision commit))
+      (version (make-git-version "0.0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -22103,7 +22103,7 @@ (define-public sbcl-mgl-pax
         (revision "1"))
     (package
       (name "sbcl-mgl-pax")
-      (version (git-version "0.3.0" revision commit))
+      (version (make-git-version "0.3.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -22163,7 +22163,7 @@ (define-public sbcl-mgrs
         (revision "1"))
     (package
       (name "sbcl-mgrs")
-      (version (git-version "1.0" revision commit))
+      (version (make-git-version "1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -22234,7 +22234,7 @@ (define-public sbcl-mito
 	(revision "3"))
     (package
       (name "sbcl-mito")
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (home-page "https://github.com/fukamachi/mito")
       (source
        (origin
@@ -22346,7 +22346,7 @@ (define-public sbcl-mmap
         (revision "0"))
     (package
       (name "sbcl-mmap")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -22383,7 +22383,7 @@ (define-public sbcl-modf
         (revision "0"))
     (package
       (name "sbcl-modf")
-      (version (git-version "0" revision commit))
+      (version (make-git-version "0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -22419,7 +22419,7 @@ (define-public sbcl-modularize
         (revision "1"))
     (package
       (name "sbcl-modularize")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -22455,7 +22455,7 @@ (define-public sbcl-modularize-hooks
         (revision "1"))
     (package
       (name "sbcl-modularize-hooks")
-      (version (git-version "1.0.2" revision commit))
+      (version (make-git-version "1.0.2" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -22487,7 +22487,7 @@ (define-public sbcl-modularize-interfaces
         (revision "1"))
     (package
       (name "sbcl-modularize-interfaces")
-      (version (git-version "0.9.3" revision commit))
+      (version (make-git-version "0.9.3" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -22520,7 +22520,7 @@ (define-public sbcl-moira
         (revision "1"))
     (package
       (name "sbcl-moira")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -22556,7 +22556,7 @@ (define-public sbcl-more-conditions
         (revision "1"))
     (package
       (name "sbcl-more-conditions")
-      (version (git-version "0.4.5" revision commit))
+      (version (make-git-version "0.4.5" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -22589,7 +22589,7 @@ (define-public sbcl-montezuma
         (revision "1"))
     (package
       (name "sbcl-montezuma")
-      (version (git-version "0.1.3" revision commit))
+      (version (make-git-version "0.1.3" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -22649,7 +22649,7 @@ (define-public sbcl-moptilities
   (let ((commit "a436f16b357c96b82397ec018ea469574c10dd41"))
     (package
       (name "sbcl-moptilities")
-      (version (git-version "0.3.13" "1" commit))
+      (version (make-git-version "0.3.13" "1" commit))
       (home-page "https://github.com/gwkkwg/moptilities/")
       (source
        (origin
@@ -22707,7 +22707,7 @@ (define-public sbcl-mssql
         (revision "1"))
     (package
       (name "sbcl-mssql")
-      (version (git-version "0.0.3" revision commit))
+      (version (make-git-version "0.0.3" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -22780,7 +22780,7 @@ (define-public sbcl-multilang-documentation
   (let ((commit "59e798a07e949e8957a20927f52aca425d84e4a0"))
     (package
       (name "sbcl-multilang-documentation")
-      (version (git-version "1.0.0" "1" commit))
+      (version (make-git-version "1.0.0" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -22813,7 +22813,7 @@ (define-public sbcl-music-spelling
         (revision "0"))
     (package
       (name "sbcl-music-spelling")
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -22845,7 +22845,7 @@ (define-public sbcl-mw-equiv
         (revision "1"))
     (package
       (name "sbcl-mw-equiv")
-      (version (git-version "0.1.2" revision commit))
+      (version (make-git-version "0.1.2" revision commit))
       (home-page "https://github.com/sharplispers/mw-equiv/")
       (source
        (origin
@@ -22900,7 +22900,7 @@ (define-public sbcl-myway
         (revision "1"))
     (package
      (name "sbcl-myway")
-     (version (git-version "0.1.0" revision commit))
+     (version (make-git-version "0.1.0" revision commit))
      (source
       (origin
        (method git-fetch)
@@ -22985,7 +22985,7 @@ (define-public sbcl-named-readtables
         (revision "4"))
     (package
       (name "sbcl-named-readtables")
-      (version (git-version "0.9" revision commit))
+      (version (make-git-version "0.9" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -23022,7 +23022,7 @@ (define-public sbcl-napa-fft3
         (revision "0"))
     (package
       (name "sbcl-napa-fft3")
-      (version (git-version "0.0.1" revision commit))
+      (version (make-git-version "0.0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -23332,7 +23332,7 @@ (define-public sbcl-nibbles
         (revision "3"))
     (package
       (name "sbcl-nibbles")
-      (version (git-version "0.14" revision commit))
+      (version (make-git-version "0.14" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -23380,7 +23380,7 @@ (define-public sbcl-ningle
         (revision "2"))
     (package
       (name "sbcl-ningle")
-      (version (git-version "0.3.0" revision commit))
+      (version (make-git-version "0.3.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -23545,7 +23545,7 @@ (define-public sbcl-nodgui
         (revision "2"))
     (package
       (name "sbcl-nodgui")
-      (version (git-version "0.7.2.0" revision commit))
+      (version (make-git-version "0.7.2.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -23608,7 +23608,7 @@ (define-public sbcl-nontrivial-gray-streams
         (revision "0"))
     (package
       (name "sbcl-nontrivial-gray-streams")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -23696,7 +23696,7 @@ (define-public sbcl-numcl
         (revision "3"))
     (package
       (name "sbcl-numcl")
-      (version (git-version "0.2.0" revision commit))
+      (version (make-git-version "0.2.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -23742,7 +23742,7 @@ (define-public sbcl-numerical-utilities
         (revision "0"))
     (package
       (name "sbcl-numerical-utilities")
-      (version (git-version "1.2.0" revision commit))
+      (version (make-git-version "1.2.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -23783,7 +23783,7 @@ (define-public sbcl-numpy-file-format
         (revision "2"))
     (package
       (name "sbcl-numpy-file-format")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -23847,7 +23847,7 @@ (define-public sbcl-olc
         (revision "1"))
     (package
       (name "sbcl-olc")
-      (version (git-version "1.0" revision commit))
+      (version (make-git-version "1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -23879,7 +23879,7 @@ (define-public sbcl-one-more-re-nightmare
         (revision "1"))
     (package
       (name "sbcl-one-more-re-nightmare")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -23932,7 +23932,7 @@ (define-public sbcl-open-with
         (revision "0"))
     (package
       (name "sbcl-open-with")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -23978,7 +23978,7 @@ (define-public sbcl-opticl
         (revision "1"))
     (package
       (name "sbcl-opticl")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -24019,7 +24019,7 @@ (define-public sbcl-opticl-core
         (revision "0"))
     (package
       (name "sbcl-opticl-core")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -24051,7 +24051,7 @@ (define-public sbcl-optima
     (package
       (name "sbcl-optima")
       (build-system asdf-build-system/sbcl)
-      (version (git-version "1.0" revision commit))
+      (version (make-git-version "1.0" revision commit))
       (home-page "https://github.com/m2ym/optima")
       (source
        (origin
@@ -24090,7 +24090,7 @@ (define-public sbcl-org-sampler
         (revision "1"))
     (package
      (name "sbcl-org-sampler")
-     (version (git-version "0.2.1" revision commit))
+     (version (make-git-version "0.2.1" revision commit))
      (source
       (origin
        (method git-fetch)
@@ -24124,7 +24124,7 @@ (define-public sbcl-origin
         (revision "1"))
     (package
       (name "sbcl-origin")
-      (version (git-version "2.0.0" revision commit))
+      (version (make-git-version "2.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -24157,7 +24157,7 @@ (define-public sbcl-osc
         (revision "0"))
     (package
      (name "sbcl-osc")
-     (version (git-version "0.9" revision commit))
+     (version (make-git-version "0.9" revision commit))
      (source
        (origin
          (method git-fetch)
@@ -24190,7 +24190,7 @@ (define-public sbcl-osicat
         (revision "4"))
     (package
       (name "sbcl-osicat")
-      (version (git-version "0.7.0" revision commit))
+      (version (make-git-version "0.7.0" revision commit))
       (home-page "https://www.common-lisp.net/project/osicat/")
       (source
        (origin
@@ -24279,7 +24279,7 @@ (define-public sbcl-overlord
   (let ((commit "a8f37b321a8aae1652fc50b78e74e57c771cc763"))
     (package
       (name "sbcl-overlord")
-      (version (git-version "0.0.0" "1" commit))
+      (version (make-git-version "0.0.0" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -24352,7 +24352,7 @@ (define-public sbcl-parenscript
   (let ((commit "7a1ac46353cecd144fc91915ba9f122aafcf4766"))
     (package
       (name "sbcl-parenscript")
-      (version (git-version "2.7.1" "1" commit))
+      (version (make-git-version "2.7.1" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -24411,7 +24411,7 @@ (define-public sbcl-parse
         (revision "1"))
     (package
      (name "sbcl-parse")
-      (version (git-version "1.0" revision commit))
+      (version (make-git-version "1.0" revision commit))
      (source
       (origin
        (method git-fetch)
@@ -24439,7 +24439,7 @@ (define-public sbcl-parse-declarations
         (revision "1"))
     (package
       (name "sbcl-parse-declarations")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -24480,7 +24480,7 @@ (define-public sbcl-parse-float
         (revision "2"))
     (package
       (name "sbcl-parse-float")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -24519,7 +24519,7 @@ (define-public sbcl-parse-js
         (revision "1"))
     (package
       (name "sbcl-parse-js")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -24627,7 +24627,7 @@ (define-public sbcl-parser-combinators
         (revision "1"))
     (package
       (name "sbcl-parser-combinators")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -24668,7 +24668,7 @@ (define-public sbcl-path-parse
         (revision "1"))
     (package
       (name "sbcl-path-parse")
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -24701,7 +24701,7 @@ (define-public sbcl-pathname-utils
         (revision "4"))
     (package
       (name "sbcl-pathname-utils")
-      (version (git-version "1.1.0" revision commit))
+      (version (make-git-version "1.1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -24748,7 +24748,7 @@ (define-public sbcl-pem
     (package
       (name "sbcl-pem")
       (build-system asdf-build-system/sbcl)
-      (version (git-version "0.1.0" revision commit))
+      (version (make-git-version "0.1.0" revision commit))
       (home-page "https://github.com/fukamachi/pem")
       (source
        (origin
@@ -24782,7 +24782,7 @@ (define-public sbcl-percent-encoding
         (revision "1"))
     (package
       (name "sbcl-percent-encoding")
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -24844,7 +24844,7 @@ (define-public sbcl-periods
         (revision "2"))
     (package
       (name "sbcl-periods")
-      (version (git-version "0.0.2" revision commit))
+      (version (make-git-version "0.0.2" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -24880,7 +24880,7 @@ (define-public sbcl-phos
   (let ((commit "6620b82b091cdfed655e1093ef045dbe518d5474"))
     (package
       (name "sbcl-phos")
-      (version (git-version "0.0.1" "1" commit))
+      (version (make-git-version "0.0.1" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -24955,7 +24955,7 @@ (define-public sbcl-pileup
         (revision "1"))
     (package
       (name "sbcl-pileup")
-      (version (git-version "1.0.1" revision commit))
+      (version (make-git-version "1.0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -24988,7 +24988,7 @@ (define-public sbcl-piping
         (revision "1"))
     (package
       (name "sbcl-piping")
-      (version (git-version "2.0.0" revision commit))
+      (version (make-git-version "2.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -25019,7 +25019,7 @@ (define-public sbcl-plump
         (revision "3"))
     (package
       (name "sbcl-plump")
-      (version (git-version "2.0.0" revision commit))
+      (version (make-git-version "2.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -25058,7 +25058,7 @@ (define-public sbcl-plump-sexp
         (revision "0"))
     (package
       (name "sbcl-plump-sexp")
-      (version (git-version "0.1.0" revision commit))
+      (version (make-git-version "0.1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -25094,7 +25094,7 @@ (define-public sbcl-png
         (revision "1"))
     (package
       (name "sbcl-png")
-      (version (git-version "0.6" revision commit))
+      (version (make-git-version "0.6" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -25138,7 +25138,7 @@ (define-public sbcl-png-read
         (revision "1"))
     (package
       (name "sbcl-png-read")
-      (version (git-version "0.3.1" revision commit))
+      (version (make-git-version "0.3.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -25167,7 +25167,7 @@ (define-public sbcl-pngload
         (revision "2"))
     (package
       (name "sbcl-pngload")
-      (version (git-version "2.0.0" revision commit))
+      (version (make-git-version "2.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -25209,7 +25209,7 @@ (define-public sbcl-policy-cond
         (revision "0"))
     (package
       (name "sbcl-policy-cond")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -25294,7 +25294,7 @@ (define-public sbcl-portable-condition-system
         (revision "0"))
     (package
       (name "sbcl-portable-condition-system")
-      (version (git-version "1.1.0" revision commit))
+      (version (make-git-version "1.1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -25330,7 +25330,7 @@ (define-public sbcl-portable-threads
   (let ((commit "aa26bf38338a6b068bf8bfb3375d8d8c3b0a28df"))
     (package
       (name "sbcl-portable-threads")
-      (version (git-version "2.3" "2" commit))
+      (version (make-git-version "2.3" "2" commit))
       (source
        (origin
          (method git-fetch)
@@ -25362,7 +25362,7 @@ (define-public sbcl-portal
         (revision "2"))
     (package
       (name "sbcl-portal")
-      (version (git-version "1.2" revision commit))
+      (version (make-git-version "1.2" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -25404,7 +25404,7 @@ (define-public sbcl-positional-lambda
         (revision "0"))
     (package
       (name "sbcl-positional-lambda")
-      (version (git-version "2.0" revision commit))
+      (version (make-git-version "2.0" revision commit))
       (source
         (origin
           (method git-fetch)
@@ -25595,7 +25595,7 @@ (define-public sbcl-pp-toml
         (revision "0"))
     (package
       (name "sbcl-pp-toml")
-      (version (git-version "1.0.1" revision commit))
+      (version (make-git-version "1.0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -25634,7 +25634,7 @@ (define-public sbcl-ppath
   (let ((commit "eb1a8173b4d1d691ea9a7699412123462f58c3ce"))
     (package
       (name "sbcl-ppath")
-      (version (git-version "0.1" "1" commit))
+      (version (make-git-version "0.1" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -25678,7 +25678,7 @@ (define-public sbcl-print-licenses
     (package
       (name "sbcl-print-licenses")
       (build-system asdf-build-system/sbcl)
-      (version (git-version "0.1.0" revision commit))
+      (version (make-git-version "0.1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -25710,7 +25710,7 @@ (define-public sbcl-printv
         (revision "2"))
     (package
       (name "sbcl-printv")
-      (version (git-version "0.1.0" revision commit))
+      (version (make-git-version "0.1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -25750,7 +25750,7 @@ (define-public sbcl-priority-queue
         (revision "0"))
     (package
       (name "sbcl-priority-queue")
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -25780,7 +25780,7 @@ (define-public sbcl-proc-parse
   (let ((commit "ac3636834d561bdc2686c956dbd82494537285fd"))
     (package
       (name "sbcl-proc-parse")
-      (version (git-version "0.0.0" "1" commit))
+      (version (make-git-version "0.0.0" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -25819,7 +25819,7 @@ (define-public sbcl-progressons
         (revision "0"))
     (package
       (name "sbcl-progressons")
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -25896,7 +25896,7 @@ (define-public sbcl-promise
         (revision "0"))
     (package
       (name "sbcl-promise")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -25935,7 +25935,7 @@ (define-public sbcl-prompter
         (revision "0"))
     (package
       (name "sbcl-prompter")
-      (version (git-version "0.1.1" revision commit))
+      (version (make-git-version "0.1.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -25982,7 +25982,7 @@ (define-public sbcl-purgatory
         (revision "1"))
     (package
       (name "sbcl-purgatory")
-      (version (git-version "0.1.2" revision commit))
+      (version (make-git-version "0.1.2" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -26016,7 +26016,7 @@ (define-public sbcl-puri
         (revision "2"))
     (package
       (name "sbcl-puri")
-      (version (git-version "1.5.7" revision commit))
+      (version (make-git-version "1.5.7" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -26093,7 +26093,7 @@ (define-public sbcl-py4cl
         (revision "2"))
     (package
       (name "sbcl-py4cl")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -26163,7 +26163,7 @@ (define-public sbcl-pythonic-string-reader
   (let ((commit "47a70ba1e32362e03dad6ef8e6f36180b560f86a"))
     (package
       (name "sbcl-pythonic-string-reader")
-      (version (git-version "0.0.0" "1" commit))
+      (version (make-git-version "0.0.0" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -26198,7 +26198,7 @@ (define-public sbcl-pzmq
         (revision "2"))
     (package
       (name "sbcl-pzmq")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -26273,7 +26273,7 @@ (define-public sbcl-qmynd
         (revision "1"))
     (package
       (name "sbcl-qmynd")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -26349,7 +26349,7 @@ (define-public sbcl-queues
   (let ((commit "47d4da65e9ea20953b74aeeab7e89a831b66bc94"))
     (package
       (name "sbcl-queues")
-      (version (git-version "0.0.0" "1" commit))
+      (version (make-git-version "0.0.0" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -26387,7 +26387,7 @@ (define-public sbcl-quicklisp-stats
         (revision "0"))
     (package
       (name "sbcl-quicklisp-stats")
-      (version (git-version "0.0.1" revision commit))
+      (version (make-git-version "0.0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -26452,7 +26452,7 @@ (define-public sbcl-quicksearch
   (let ((commit "fb02ecf7c876ec580ab18c7d2c8c7814c06af599"))
     (package
       (name "sbcl-quicksearch")
-      (version (git-version "0.01.04" "1" commit))
+      (version (make-git-version "0.01.04" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -26497,7 +26497,7 @@ (define-public sbcl-quri
         (revision "0"))
     (package
       (name "sbcl-quri")
-      (version (git-version "0.7.0" revision commit))
+      (version (make-git-version "0.7.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -26529,7 +26529,7 @@ (define-public sbcl-radiance
         (revision "3"))
     (package
       (name "sbcl-radiance")
-      (version (git-version "2.1.2" revision commit))
+      (version (make-git-version "2.1.2" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -26596,7 +26596,7 @@ (define-public sbcl-radiance-contribs
         (revision "1"))
     (package
       (name "sbcl-radiance-contribs")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -26639,7 +26639,7 @@ (define-public sbcl-random-sample
         (revision "0"))
     (package
       (name "sbcl-random-sample")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -26675,7 +26675,7 @@ (define-public sbcl-random-state
         (revision "1"))
     (package
       (name "sbcl-random-state")
-      (version (git-version "0.1.0" revision commit))
+      (version (make-git-version "0.1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -26714,7 +26714,7 @@ (define-public sbcl-re
         (revision "1"))
     (package
      (name "sbcl-re")
-      (version (git-version "1.0" revision commit))
+      (version (make-git-version "1.0" revision commit))
      (source
       (origin
        (method git-fetch)
@@ -26792,7 +26792,7 @@ (define-public sbcl-regex
   (let ((commit "fbc9a9f313b9edc1788f33d4b23a29151635ae22"))
     (package
       (name "sbcl-regex")
-      (version (git-version "1" "1" commit))
+      (version (make-git-version "1" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -26819,7 +26819,7 @@ (define-public sbcl-repl-utilities
   (let ((commit "7e300df663177ea4581f4e7e9c601377881dd986"))
     (package
       (name "sbcl-repl-utilities")
-      (version (git-version "0.0.0" "1" commit))
+      (version (make-git-version "0.0.0" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -26851,7 +26851,7 @@ (define-public sbcl-restas
         (revision "1"))
     (package
       (name "sbcl-restas")
-      (version (git-version "0.1.4" revision commit))
+      (version (make-git-version "0.1.4" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -26897,7 +26897,7 @@ (define-public sbcl-retrospectiff
         (revision "1"))
     (package
       (name "sbcl-retrospectiff")
-      (version (git-version "0.2" revision commit))
+      (version (make-git-version "0.2" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -26935,7 +26935,7 @@ (define-public sbcl-rfc2388
         (revision "1"))
     (package
      (name "sbcl-rfc2388")
-     (version (git-version "0.0.0" revision commit))
+     (version (make-git-version "0.0.0" revision commit))
      (source
       (origin
        (method git-fetch)
@@ -26965,7 +26965,7 @@ (define-public sbcl-routes
         (revision "1"))
     (package
       (name "sbcl-routes")
-      (version (git-version "0.2.5" revision commit))
+      (version (make-git-version "0.2.5" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -27010,7 +27010,7 @@ (define-public sbcl-rss
   (let ((commit "51d0145e91b86327ae5c36364f9c3048052e7a58"))
     (package
       (name "sbcl-rss")
-      (version (git-version "0.9.1.1" "2" commit))
+      (version (make-git-version "0.9.1.1" "2" commit))
       (source
        (origin
          (method git-fetch)
@@ -27045,7 +27045,7 @@ (define-public sbcl-rtg-math
         (revision "1"))
     (package
       (name "sbcl-rtg-math")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -27076,7 +27076,7 @@ (define-public sbcl-rucksack
         (revision "0"))
     (package
      (name "sbcl-rucksack")
-     (version (git-version "0.1.20" revision commit))
+     (version (make-git-version "0.1.20" revision commit))
      (source
        (origin
          (method git-fetch)
@@ -27102,7 +27102,7 @@ (define-public sbcl-rutils
         (revision "0"))
     (package
       (name "sbcl-rutils")
-      (version (git-version "5.2.1" revision commit))
+      (version (make-git-version "5.2.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -27146,7 +27146,7 @@ (define-public sbcl-s-base64
         (revision "0"))
     (package
       (name "sbcl-s-base64")
-      (version (git-version "2" revision commit))
+      (version (make-git-version "2" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -27179,7 +27179,7 @@ (define-public sbcl-s-graphviz
         (revision "1"))
     (package
       (name "sbcl-s-graphviz")
-      (version (git-version "2.0" revision commit))
+      (version (make-git-version "2.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -27213,7 +27213,7 @@ (define-public sbcl-s-sysdeps
     (package
       (name "sbcl-s-sysdeps")
       (build-system asdf-build-system/sbcl)
-      (version (git-version "1" revision commit))
+      (version (make-git-version "1" revision commit))
       (home-page "https://github.com/svenvc/s-sysdeps")
       (source
        (origin
@@ -27330,7 +27330,7 @@ (define-public sbcl-safe-read
         (revision "0"))
     (package
       (name "sbcl-safe-read")
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -27392,7 +27392,7 @@ (define-public sbcl-sb-cga
   (let ((commit "9a554ea1c01cac998ff7eaa5f767bc5bcdc4c094"))
     (package
       (name "sbcl-sb-cga")
-      (version (git-version "1.0.1" "1" commit))
+      (version (make-git-version "1.0.1" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -27426,7 +27426,7 @@ (define-public sbcl-schemeish
         (revision "2"))
     (package
       (name "sbcl-schemeish")
-      (version (git-version "0.0.1" revision commit))
+      (version (make-git-version "0.0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -27468,7 +27468,7 @@ (define-public sbcl-screamer
   (let ((commit "ce50614024de090b376107668da5e53232540ec7"))
     (package
       (name "sbcl-screamer")
-      (version (git-version "0.0.1" "1" commit))
+      (version (make-git-version "0.0.1" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -27512,7 +27512,7 @@ (define-public sbcl-sdf
         (revision "1"))
     (package
       (name "sbcl-sdf")
-      (version (git-version "0.0.1" revision commit))
+      (version (make-git-version "0.0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -27553,7 +27553,7 @@ (define-public sbcl-sdl2
         (revision "2"))
     (package
       (name "sbcl-sdl2")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -27599,7 +27599,7 @@ (define-public sbcl-sdl2-image
         (revision "1"))
     (package
       (name "sbcl-sdl2-image")
-      (version (git-version "1.0" revision commit))
+      (version (make-git-version "1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -27640,7 +27640,7 @@ (define-public sbcl-sdl2kit
   (let ((commit "aae663224a10ece2b0c374aa5942a3f0bc1b3c2f"))
     (package
       (name "sbcl-sdl2kit")
-      (version (git-version "0.0.0" "1" commit))
+      (version (make-git-version "0.0.0" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -27675,7 +27675,7 @@ (define-public sbcl-sdl2-mixer
         (revision "1"))
     (package
       (name "sbcl-sdl2-mixer")
-      (version (git-version "1.0" revision commit))
+      (version (make-git-version "1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -27718,7 +27718,7 @@ (define-public sbcl-sdl2-ttf
         (revision "1"))
     (package
       (name "sbcl-sdl2-ttf")
-      (version (git-version "1.0" revision commit))
+      (version (make-git-version "1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -27770,7 +27770,7 @@ (define-public sbcl-sealable-metaobjects
   (let ((commit "e09ec97252e0844528f61abdc0c7ee256875f8ee"))
     (package
       (name "sbcl-sealable-metaobjects")
-      (version (git-version "0.0.0" "1" commit))
+      (version (make-git-version "0.0.0" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -27805,7 +27805,7 @@ (define-public sbcl-secret-values
         (revision "0"))
     (package
       (name "sbcl-secret-values")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -27837,7 +27837,7 @@ (define-public sbcl-seedable-rng
         (revision "1"))
     (package
       (name "sbcl-seedable-rng")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -27869,7 +27869,7 @@ (define-public sbcl-select
         (revision "0"))
     (package
       (name "sbcl-select")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -27904,7 +27904,7 @@ (define-public sbcl-serapeum
         (revision "12"))
     (package
       (name "sbcl-serapeum")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (home-page "https://github.com/ruricolist/serapeum")
       (source
        (origin
@@ -27959,7 +27959,7 @@ (define-public sbcl-series
         (revision "1"))
     (package
       (name "sbcl-series")
-      (version (git-version "2.2.11" revision commit))
+      (version (make-git-version "2.2.11" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -27997,7 +27997,7 @@ (define-public sbcl-sha1
         (revision "0"))
     (package
      (name "sbcl-sha1")
-     (version (git-version "1.0" revision commit))
+     (version (make-git-version "1.0" revision commit))
      (home-page "https://github.com/massung/sha1")
      (source
       (origin
@@ -28030,7 +28030,7 @@ (define-public sbcl-shadow
         (revision "1"))
     (package
       (name "sbcl-shadow")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -28103,7 +28103,7 @@ (define-public sbcl-shasht
         (revision "2"))
     (package
       (name "sbcl-shasht")
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -28139,7 +28139,7 @@ (define-public sbcl-shlex
         (revision "2"))
     (package
       (name "sbcl-shlex")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -28171,7 +28171,7 @@ (define-public sbcl-simple-date-time
         (revision "1"))
     (package
       (name "sbcl-simple-date-time")
-      (version (git-version "0.1.0" revision commit))
+      (version (make-git-version "0.1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -28200,7 +28200,7 @@ (define-public sbcl-simple-guess
         (revision "0"))
     (package
       (name "sbcl-simple-guess")
-      (version (git-version "1.0" revision commit))
+      (version (make-git-version "1.0" revision commit))
       (source
         (origin
           (method git-fetch)
@@ -28238,7 +28238,7 @@ (define-public sbcl-simple-inferiors
   (let ((commit "deac886354e03f8a9502ce96f12a0459ce3be671"))
     (package
       (name "sbcl-simple-inferiors")
-      (version (git-version "1.1.0" "1" commit))
+      (version (make-git-version "1.1.0" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -28338,7 +28338,7 @@ (define-public sbcl-simple-parallel-tasks
         (revision "1"))
     (package
       (name "sbcl-simple-parallel-tasks")
-      (version (git-version "1.0" revision commit))
+      (version (make-git-version "1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -28370,7 +28370,7 @@ (define-public sbcl-simple-rgb
         (revision "1"))
     (package
       (name "sbcl-simple-rgb")
-      (version (git-version "0.01" revision commit))
+      (version (make-git-version "0.01" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -28403,7 +28403,7 @@ (define-public sbcl-simple-routes
         (revision "1"))
     (package
       (name "sbcl-simple-routes")
-      (version (git-version "0.3" revision commit))
+      (version (make-git-version "0.3" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -28435,7 +28435,7 @@ (define-public sbcl-simple-tasks
         (revision "1"))
     (package
       (name "sbcl-simple-tasks")
-      (version (git-version "1.3.0" revision commit))
+      (version (make-git-version "1.3.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -28464,7 +28464,7 @@ (define-public sbcl-simplified-types
         (revision "0"))
     (package
       (name "sbcl-simplified-types")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -28504,7 +28504,7 @@ (define-public sbcl-sketch
   (let ((commit "4cc00b08e202c7adda41391463096cf9df1705c3"))
     (package
       (name "sbcl-sketch")
-      (version (git-version "2017-11" "1" commit))
+      (version (make-git-version "2017-11" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -28549,7 +28549,7 @@ (define-public sbcl-skippy
         (revision "0"))
     (package
       (name "sbcl-skippy")
-      (version (git-version "1.3.12" revision commit))
+      (version (make-git-version "1.3.12" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -28629,7 +28629,7 @@ (define-public sbcl-slite
         (revision "0"))
     (package
       (name "sbcl-slite")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -28676,7 +28676,7 @@ (define-public sbcl-slot-extra-options
   (let ((commit "29517d980325cd63744f1acf4cfe5c8ccec2b318"))
     (package
       (name "sbcl-slot-extra-options")
-      (version (git-version "1.1.1" "1" commit))
+      (version (make-git-version "1.1.1" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -28719,7 +28719,7 @@ (define-public sbcl-micros
         (revision "2"))
     (package
       (name "sbcl-micros")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -28750,7 +28750,7 @@ (define-public sbcl-slynk
         (revision "9"))
     (package
       (name "sbcl-slynk")
-      (version (git-version "1.0.43" revision commit))
+      (version (make-git-version "1.0.43" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -28823,7 +28823,7 @@ (define-public sbcl-smart-buffer
         (revision "1"))
     (package
       (name "sbcl-smart-buffer")
-      (version (git-version "0.0.1" revision commit))
+      (version (make-git-version "0.0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -28859,7 +28859,7 @@ (define-public sbcl-smug
         (revision "0"))
     (package
      (name "sbcl-smug")
-     (version (git-version "0.0.0" revision commit))
+     (version (make-git-version "0.0.0" revision commit))
      (source
        (origin
          (method git-fetch)
@@ -28895,7 +28895,7 @@ (define-public sbcl-snakes
         (revision "0"))
     (package
       (name "sbcl-snakes")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
         (origin
           (method git-fetch)
@@ -28932,7 +28932,7 @@ (define-public sbcl-spatial-trees
         (revision "1"))
     (package
       (name "sbcl-spatial-trees")
-      (version (git-version "0" revision commit))
+      (version (make-git-version "0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -28970,7 +28970,7 @@ (define-public sbcl-special-functions
         (revision "0"))
     (package
       (name "sbcl-special-functions")
-      (version (git-version "1.2.0" revision commit))
+      (version (make-git-version "1.2.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -29012,7 +29012,7 @@ (define-public sbcl-specialization-store
         (revision "1"))
     (package
       (name "sbcl-specialization-store")
-      (version (git-version "0.0.5" revision commit))
+      (version (make-git-version "0.0.5" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -29050,7 +29050,7 @@ (define-public sbcl-specialized-function
         (revision "3"))
     (package
       (name "sbcl-specialized-function")
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -29090,7 +29090,7 @@ (define-public sbcl-speechless
         (revision "1"))
     (package
       (name "sbcl-speechless")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -29139,7 +29139,7 @@ (define-public sbcl-spinneret
   (let ((commit "d4398b5a344b5c59e497c9ee78fdbae7cc434f74"))
     (package
       (name "sbcl-spinneret")
-      (version (git-version "3.0" "6" commit))
+      (version (make-git-version "3.0" "6" commit))
       (source
        (origin
          (method git-fetch)
@@ -29230,7 +29230,7 @@ (define-public sbcl-st-json
         (revision "0"))
     (package
       (name "sbcl-st-json")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -29266,7 +29266,7 @@ (define-public sbcl-staple
         (revision "1"))
     (package
       (name "sbcl-staple")
-      (version (git-version "2.0.0" revision commit))
+      (version (make-git-version "2.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -29393,7 +29393,7 @@ (define-public sbcl-statistics
         (revision "0"))
     (package
       (name "sbcl-statistics")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -29429,7 +29429,7 @@ (define-public sbcl-stdutils
         (revision "0"))
     (package
       (name "sbcl-stdutils")
-      (version (git-version "1.0" revision commit))
+      (version (make-git-version "1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -29462,7 +29462,7 @@ (define-public sbcl-stealth-mixin
         (revision "0"))
     (package
       (name "sbcl-stealth-mixin")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -29496,7 +29496,7 @@ (define-public sbcl-stmx
         (revision "3"))
     (package
      (name "sbcl-stmx")
-     (version (git-version "2.0.5" revision commit))
+     (version (make-git-version "2.0.5" revision commit))
      (source
       (origin
        (method git-fetch)
@@ -29544,7 +29544,7 @@ (define-public sbcl-string-case
         (revision "0"))
     (package
       (name "sbcl-string-case")
-      (version (git-version "0.0.2" revision commit))
+      (version (make-git-version "0.0.2" revision commit))
       (home-page "https://github.com/pkhuong/string-case")
       (source
        (origin
@@ -29577,7 +29577,7 @@ (define-public sbcl-string-pokemonize
         (revision "0"))
     (package
      (name "sbcl-string-pokemonize")
-     (version (git-version "20210503" revision commit))
+     (version (make-git-version "20210503" revision commit))
      (source
        (origin
          (method git-fetch)
@@ -29612,7 +29612,7 @@ (define-public sbcl-stripe
         (revision "0"))
     (package
       (name "sbcl-stripe")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -29643,7 +29643,7 @@ (define-public sbcl-supertrace
   (let ((commit "66d22c3ff131ecd1c8048dfced1d62ed6024ecb0"))
     (package
       (name "sbcl-supertrace")
-      (version (git-version "0.1.0" "1" commit))
+      (version (make-git-version "0.1.0" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -29709,7 +29709,7 @@ (define-public sbcl-sxql
         (revision "4"))
     (package
       (name "sbcl-sxql")
-      (version (git-version "0.1.0" revision commit))
+      (version (make-git-version "0.1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -29747,7 +29747,7 @@ (define-public sbcl-sxql-composer
         (revision "1"))
     (package
       (name "sbcl-sxql-composer")
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -29817,7 +29817,7 @@ (define-public sbcl-symbol-munger
         (revision "2"))
     (package
       (name "sbcl-symbol-munger")
-      (version (git-version "0.0.1" revision commit))
+      (version (make-git-version "0.0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -29862,7 +29862,7 @@ (define-public sbcl-system-load
         (revision "0"))
     (package
       (name "sbcl-system-load")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -29890,7 +29890,7 @@ (define-public sbcl-system-locale
   (let ((commit "4b334bc2fa45651bcaa28ae7d9331095d6bf0a17"))
     (package
       (name "sbcl-system-locale")
-      (version (git-version "1.0.0" "1" commit))
+      (version (make-git-version "1.0.0" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -29922,7 +29922,7 @@ (define-public sbcl-tailrec
         (revision "2"))
     (package
       (name "sbcl-tailrec")
-      (version (git-version "0" revision commit))
+      (version (make-git-version "0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -29954,7 +29954,7 @@ (define-public sbcl-tar
         (revision "0"))
     (package
       (name "sbcl-tar")
-      (version (git-version "0.2.3" revision commit))
+      (version (make-git-version "0.2.3" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -30002,7 +30002,7 @@ (define-public sbcl-tar-file
         (revision "0"))
     (package
       (name "sbcl-tar-file")
-      (version (git-version "0.2.1" revision commit))
+      (version (make-git-version "0.2.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -30051,7 +30051,7 @@ (define-public sbcl-terminal-keypress
         (revision "1"))
     (package
       (name "sbcl-terminal-keypress")
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -30092,7 +30092,7 @@ (define-public sbcl-terminal-size
         (revision "1"))
     (package
       (name "sbcl-terminal-size")
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -30125,7 +30125,7 @@ (define-public sbcl-terminfo
         (revision "1"))
     (package
       (name "sbcl-terminfo")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -30158,7 +30158,7 @@ (define-public sbcl-termp
         (revision "0"))
     (package
       (name "sbcl-termp")
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -30191,7 +30191,7 @@ (define-public sbcl-terrable
         (revision "1"))
     (package
      (name "sbcl-terrable")
-     (version (git-version "1.0.0" revision commit))
+     (version (make-git-version "1.0.0" revision commit))
      (source
       (origin
        (method git-fetch)
@@ -30224,7 +30224,7 @@ (define-public sbcl-the-cost-of-nothing
         (revision "0"))
     (package
       (name "sbcl-the-cost-of-nothing")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -30267,7 +30267,7 @@ (define-public sbcl-tooter
         (revision "6"))
     (package
       (name "sbcl-tooter")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -30301,7 +30301,7 @@ (define-public sbcl-transmission
   (let ((commit "4bbf1d2761bfa5dfa79b7bc12c3238089b994d95"))
     (package
       (name "sbcl-transmission")
-      (version (git-version "0.1" "1" commit))
+      (version (make-git-version "0.1" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -30336,7 +30336,7 @@ (define-public sbcl-trees
   (let ((commit "7b06048af0248c4302088c758208276f9faf2beb"))
     (package
       (name "sbcl-trees")
-      (version (git-version "0.11" "1" commit))
+      (version (make-git-version "0.11" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -30426,7 +30426,7 @@ (define-public sbcl-trial
         (revision "2"))
     (package
       (name "sbcl-trial")
-      (version (git-version "1.2.0" revision commit))
+      (version (make-git-version "1.2.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -30542,7 +30542,7 @@ (define-public sbcl-tripod
         (revision "1"))
     (package
       (name "sbcl-tripod")
-      (version (git-version "0.0.1" revision commit))
+      (version (make-git-version "0.0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -30610,7 +30610,7 @@ (define-public sbcl-trivia.trivial
         (revision "0"))
     (package
       (name "sbcl-trivia.trivial")
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -30697,7 +30697,7 @@ (define-public sbcl-trivial-adjust-simple-array
     (package
       (name "sbcl-trivial-adjust-simple-array")
       ;; It's currently at 0.0.1, but so is the other commits
-      (version (git-version "0.0.1" revision commit))
+      (version (make-git-version "0.0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -30732,7 +30732,7 @@ (define-public sbcl-trivial-arguments
         (revision "1"))
     (package
       (name "sbcl-trivial-arguments")
-      (version (git-version "1.1.0" revision commit))
+      (version (make-git-version "1.1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -30763,7 +30763,7 @@ (define-public sbcl-trivial-backtrace
         (revision "2"))
     (package
      (name "sbcl-trivial-backtrace")
-     (version (git-version "1.1.0" revision commit))
+     (version (make-git-version "1.1.0" revision commit))
      (source
       (origin
        (method git-fetch)
@@ -30811,7 +30811,7 @@ (define-public sbcl-trivial-battery
         (revision "1"))
     (package
       (name "sbcl-trivial-battery")
-      (version (git-version "0.1.0" revision commit))
+      (version (make-git-version "0.1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -30841,7 +30841,7 @@ (define-public sbcl-trivial-benchmark
         (revision "2"))
     (package
       (name "sbcl-trivial-benchmark")
-      (version (git-version "2.0.0" revision commit))
+      (version (make-git-version "2.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -30878,7 +30878,7 @@ (define-public sbcl-trivial-channels
         (revision "1"))
     (package
       (name "sbcl-trivial-channels")
-      (version (git-version "1.0" revision commit))
+      (version (make-git-version "1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -30908,7 +30908,7 @@ (define-public sbcl-trivial-clipboard
         (revision "8"))
     (package
       (name "sbcl-trivial-clipboard")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -30959,7 +30959,7 @@ (define-public sbcl-trivial-cltl2
     (package
       (name "sbcl-trivial-cltl2")
       (build-system asdf-build-system/sbcl)
-      (version (git-version "0.1.1" revision commit))
+      (version (make-git-version "0.1.1" revision commit))
       (home-page "https://github.com/Zulu-Inuoe/trivial-cltl2")
       (source
        (origin
@@ -30988,7 +30988,7 @@ (define-public sbcl-trivial-custom-debugger
   (let ((commit "a560594a673bbcd88136af82086107ee5ff9ca81"))
     (package
       (name "sbcl-trivial-custom-debugger")
-      (version (git-version "1.0.0" "1" commit))
+      (version (make-git-version "1.0.0" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -31028,7 +31028,7 @@ (define-public sbcl-trivial-do
   (let ((commit "03a1729f1e71bad3ebcf6cf098a0cce52dfa1163"))
     (package
       (name "sbcl-trivial-do")
-      (version (git-version "0.1" "1" commit))
+      (version (make-git-version "0.1" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -31060,7 +31060,7 @@ (define-public sbcl-trivial-download
   (let ((commit "d2472061d86b1cf3d32f388daacd4e32a13af699"))
     (package
       (name "sbcl-trivial-download")
-      (version (git-version "0.3" "1" commit))
+      (version (make-git-version "0.3" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -31090,7 +31090,7 @@ (define-public sbcl-trivial-escapes
   (let ((commit "1eca78da2078495d09893be58c28b3aa7b8cc4d1"))
     (package
       (name "sbcl-trivial-escapes")
-      (version (git-version "1.2.0" "1" commit))
+      (version (make-git-version "1.2.0" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -31125,7 +31125,7 @@ (define-public sbcl-trivial-extensible-sequences
         (revision "0"))
     (package
       (name "sbcl-trivial-extensible-sequences")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -31195,7 +31195,7 @@ (define-public sbcl-trivial-file-size
         (revision "0"))
     (package
       (name "sbcl-trivial-file-size")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (home-page "https://github.com/ruricolist/trivial-file-size")
       (source
        (origin
@@ -31233,7 +31233,7 @@ (define-public sbcl-trivial-garbage
         (revision "0"))
     (package
       (name "sbcl-trivial-garbage")
-      (version (git-version "0.21" revision commit))
+      (version (make-git-version "0.21" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -31267,7 +31267,7 @@ (define-public sbcl-trivial-gray-streams
         (commit "2b3823edbc78a450db4891fd2b566ca0316a7876"))
     (package
       (name "sbcl-trivial-gray-streams")
-      (version (git-version "2.0" revision commit))
+      (version (make-git-version "2.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -31301,7 +31301,7 @@ (define-public sbcl-trivial-indent
         (revision "1"))
     (package
       (name "sbcl-trivial-indent")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -31336,7 +31336,7 @@ (define-public sbcl-trivial-macroexpand-all
         (revision "0"))
     (package
       (name "sbcl-trivial-macroexpand-all")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (home-page "https://github.com/cbaggers/trivial-macroexpand-all")
       (source
        (origin
@@ -31368,7 +31368,7 @@ (define-public sbcl-trivial-main-thread
         (revision "1"))
     (package
       (name "sbcl-trivial-main-thread")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -31400,7 +31400,7 @@ (define-public sbcl-trivial-mimes
         (revision "2"))
     (package
       (name "sbcl-trivial-mimes")
-      (version (git-version "1.1.0" revision commit))
+      (version (make-git-version "1.1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -31433,7 +31433,7 @@ (define-public sbcl-trivial-monitored-thread
         (revision "0"))
     (package
       (name "sbcl-trivial-monitored-thread")
-      (version (git-version "0.3.11" revision commit))
+      (version (make-git-version "0.3.11" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -31466,7 +31466,7 @@ (define-public sbcl-trivial-octet-streams
         (revision "1"))
     (package
       (name "sbcl-trivial-octet-streams")
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -31495,7 +31495,7 @@ (define-public sbcl-trivial-open-browser
         (revision "1"))
     (package
       (name "sbcl-trivial-open-browser")
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -31561,7 +31561,7 @@ (define-public sbcl-trivial-raw-io
         (revision "1"))
     (package
       (name "sbcl-trivial-raw-io")
-      (version (git-version "0.0.2" revision commit))
+      (version (make-git-version "0.0.2" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -31593,7 +31593,7 @@ (define-public sbcl-trivial-rfc-1123
         (revision "0"))
     (package
       (name "sbcl-trivial-rfc-1123")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -31622,7 +31622,7 @@ (define-public sbcl-trivial-shell
   (let ((commit "e02ec191b34b52deca5d1c4ee99d4fa13b8772e0"))
     (package
       (name "sbcl-trivial-shell")
-      (version (git-version "0.2.0" "1" commit))
+      (version (make-git-version "0.2.0" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -31686,7 +31686,7 @@ (define-public sbcl-trivial-timeout
         (revision "2"))
     (package
       (name "sbcl-trivial-timeout")
-      (version (git-version "0.1.5" revision commit))
+      (version (make-git-version "0.1.5" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -31747,7 +31747,7 @@ (define-public sbcl-trivial-utf-8
         (revision "2"))
     (package
       (name "sbcl-trivial-utf-8")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -31787,7 +31787,7 @@ (define-public sbcl-trivial-utilities
         (revision "0"))
     (package
       (name "sbcl-trivial-utilities")
-      (version (git-version "0.4.0" revision commit))
+      (version (make-git-version "0.4.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -31822,7 +31822,7 @@ (define-public sbcl-trivial-with-current-source-form
         (revision "1"))
     (package
       (name "sbcl-trivial-with-current-source-form")
-      (version (git-version "0.1.0" revision commit))
+      (version (make-git-version "0.1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -31861,7 +31861,7 @@ (define-public sbcl-trivial-ws
         (revision "0"))
     (package
       (name "sbcl-trivial-ws")
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -31900,7 +31900,7 @@ (define-public sbcl-trivialib-type-unify
         (revision "1"))
     (package
       (name "sbcl-trivialib-type-unify")
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -31940,7 +31940,7 @@ (define-public sbcl-trucler
         (revision "1"))
     (package
       (name "sbcl-trucler")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -31980,7 +31980,7 @@ (define-public sbcl-type-i
     (package
       (name "sbcl-type-i")
       (build-system asdf-build-system/sbcl)
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (home-page "https://github.com/guicho271828/type-i")
       (source
        (origin
@@ -32019,7 +32019,7 @@ (define-public sbcl-type-r
         (revision "1"))
     (package
       (name "sbcl-type-r")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -32055,7 +32055,7 @@ (define-public sbcl-type-templates
         (revision "0"))
     (package
       (name "sbcl-type-templates")
-      (version (git-version "4.0.0" revision commit))
+      (version (make-git-version "4.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -32096,7 +32096,7 @@ (define-public sbcl-typo
         (revision "0"))
     (package
       (name "sbcl-typo")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -32132,7 +32132,7 @@ (define-public sbcl-uax-14
         (revision "1"))
     (package
       (name "sbcl-uax-14")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -32215,7 +32215,7 @@ (define-public sbcl-ubiquitous
         (revision "1"))
     (package
       (name "sbcl-ubiquitous")
-      (version (git-version "2.0.0" revision commit))
+      (version (make-git-version "2.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -32251,7 +32251,7 @@ (define-public sbcl-ucons
         (revision "0"))
     (package
       (name "sbcl-ucons")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -32335,7 +32335,7 @@ (define-public sbcl-umbra
         (revision "1"))
     (package
       (name "sbcl-umbra")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -32366,7 +32366,7 @@ (define-public sbcl-unix-opts
         (revision "1"))
     (package
       (name "sbcl-unix-opts")
-      (version (git-version "0.1.7" revision commit))
+      (version (make-git-version "0.1.7" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -32488,7 +32488,7 @@ (define-public sbcl-utf8-input-stream
         (revision "0"))
     (package
       (name "sbcl-utf8-input-stream")
-      (version (git-version "0.0.1" revision commit))
+      (version (make-git-version "0.0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -32520,7 +32520,7 @@ (define-public sbcl-utils-kt
   (let ((commit "4adfe2889036ab5ffdd3cc2182ca2cc692bf11ff"))
     (package
       (name "sbcl-utils-kt")
-      (version (git-version "2007-12-02" "1" commit))
+      (version (make-git-version "2007-12-02" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -32552,7 +32552,7 @@ (define-public sbcl-utm-ups
         (revision "0"))
     (package
       (name "sbcl-utm-ups")
-      (version (git-version "1.2" revision commit))
+      (version (make-git-version "1.2" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -32584,7 +32584,7 @@ (define-public sbcl-uuid
   (let ((commit "e7d6680c3138385c0708f7aaf0c96622eeb140e8"))
     (package
       (name "sbcl-uuid")
-      (version (git-version "2012.12.26" "1" commit))
+      (version (make-git-version "2012.12.26" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -32616,7 +32616,7 @@ (define-public sbcl-varjo
         (revision "1"))
     (package
       (name "sbcl-varjo")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -32657,7 +32657,7 @@ (define-public sbcl-vas-string-metrics
         (revision "1"))
     (package
       (name "sbcl-vas-string-metrics")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -32702,7 +32702,7 @@ (define-public sbcl-verbose
         (revision "1"))
     (package
       (name "sbcl-verbose")
-      (version (git-version "2.0.0" revision commit))
+      (version (make-git-version "2.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -32734,7 +32734,7 @@ (define-public sbcl-vernacular
   (let ((commit "79be179e9ada423b3ec41d2a1ea6f6e0266ed21f"))
     (package
       (name "sbcl-vernacular")
-      (version (git-version "0.8.0" "1" commit))
+      (version (make-git-version "0.8.0" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -32790,7 +32790,7 @@ (define-public sbcl-vgplot
         (revision "0"))
     (package
       (name "sbcl-vgplot")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -32824,7 +32824,7 @@ (define-public sbcl-colony
         (revision "0"))
     (package
       (name "sbcl-colony")
-      (version (git-version "0.1.0" revision commit))
+      (version (make-git-version "0.1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -32905,7 +32905,7 @@ (define-public sbcl-vom
         (revision "1"))
     (package
       (name "sbcl-vom")
-      (version (git-version "0.1.4" revision commit))
+      (version (make-git-version "0.1.4" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -32992,7 +32992,7 @@ (define-public sbcl-websocket-driver
         (revision "1"))
     (package
      (name "sbcl-websocket-driver")
-     (version (git-version "0.2.0" revision commit))
+     (version (make-git-version "0.2.0" revision commit))
      (home-page "https://github.com/fukamachi/websocket-driver")
      (source
       (origin
@@ -33032,7 +33032,7 @@ (define-public sbcl-which
         (revision "1"))
     (package
       (name "sbcl-which")
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -33065,7 +33065,7 @@ (define-public sbcl-wild-package-inferred-system
         (revision "0"))
     (package
       (name "sbcl-wild-package-inferred-system")
-      (version (git-version "0.2.0" revision commit))
+      (version (make-git-version "0.2.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -33096,7 +33096,7 @@ (define-public sbcl-with-user-abort
         (revision "0"))
     (package
       (name "sbcl-with-user-abort")
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -33125,7 +33125,7 @@ (define-public sbcl-woo
         (revision "2"))
     (package
       (name "sbcl-woo")
-      (version (git-version "0.12.0" revision commit))
+      (version (make-git-version "0.12.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -33186,7 +33186,7 @@ (define-public sbcl-wordnet
         (revision "0"))
     (package
       (name "sbcl-wordnet")
-      (version (git-version "0.0.1" revision commit))
+      (version (make-git-version "0.0.1" revision commit))
       (source
         (origin
           (method git-fetch)
@@ -33219,7 +33219,7 @@ (define-public sbcl-wu-decimal
         (revision "0"))
     (package
       (name "sbcl-wu-decimal")
-      (version (git-version "2.0.0" revision commit))
+      (version (make-git-version "2.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -33257,7 +33257,7 @@ (define-public sbcl-xhtmlambda
       (version
        ;; The source repository doesn't provide any version nor revision, but
        ;; a timestamp
-       (git-version "2022-01-21" revision commit))
+       (make-git-version "2022-01-21" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -33290,7 +33290,7 @@ (define-public sbcl-xkbcommon
         (revision "0"))
     (package
       (name "sbcl-xkbcommon")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -33395,7 +33395,7 @@ (define-public sbcl-xpath
   (let ((commit "d364da693a534e23bd5eb3a85420e9c25e6c75b3"))
     (package
       (name "sbcl-xpath")
-      (version (git-version "0.1" "1" commit))
+      (version (make-git-version "0.1" "1" commit))
       (source
        (origin
          (method git-fetch)
@@ -33426,7 +33426,7 @@ (define-public sbcl-xsubseq
         (revision "1"))
     (package
      (name "sbcl-xsubseq")
-     (version (git-version "0.0.1" revision commit))
+     (version (make-git-version "0.0.1" revision commit))
      (source
       (origin
        (method git-fetch)
@@ -33491,7 +33491,7 @@ (define-public sbcl-yxorp
         (revision "4"))
     (package
       (name "sbcl-yxorp")
-      (version (git-version "0.4" revision commit))
+      (version (make-git-version "0.4" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -33569,7 +33569,7 @@ (define-public sbcl-zip
         (revision "1"))
     (package
       (name "sbcl-zip")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -33602,7 +33602,7 @@ (define-public sbcl-zippy
         (revision "1"))
     (package
       (name "sbcl-zippy")
-      (version (git-version "1.1.0" revision commit))
+      (version (make-git-version "1.1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -33738,7 +33738,7 @@ (define-public sbcl-zr-utils
         (revision "0"))
     (package
       (name "sbcl-zr-utils")
-      (version (git-version "0.0.0.0" revision commit))
+      (version (make-git-version "0.0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -33817,7 +33817,7 @@ (define-public sbcl-zsort
         (revision "1"))
     (package
       (name "sbcl-zsort")
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -33851,7 +33851,7 @@ (define-public sbcl-zstd
         (revision "1"))
     (package
       (name "sbcl-zstd")
-      (version (git-version "2.0" revision commit))
+      (version (make-git-version "2.0" revision commit))
       (source
        (origin
          (method git-fetch)
diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index ee03ed5ee8a..51dcd151e5f 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -164,7 +164,7 @@ (define-public carp
         (revision "1"))
     (package
       (name "carp")
-      (version (git-version "0.5.5" revision commit))
+      (version (make-git-version "0.5.5" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -1279,7 +1279,7 @@ (define-public s7-bootstrap
     (hidden-package
      (package
        (name "s7-bootstrap")
-       (version (git-version "24.1" revision commit))
+       (version (make-git-version "24.1" revision commit))
        (source (origin
                  (method git-fetch)
                  (uri (git-reference
@@ -1652,7 +1652,7 @@ (define man-for-txr
         (revision "41"))
     (package
       (name "man-for-txr")
-      (version (git-version "1.6g" revision commit))
+      (version (make-git-version "1.6g" revision commit))
       (source
        (origin
          (method git-fetch)
diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm
index ff438598147..53d48052f81 100644
--- a/gnu/packages/logging.scm
+++ b/gnu/packages/logging.scm
@@ -125,7 +125,7 @@ (define-public logmich
         (revision "0"))
     (package
       (name "logmich")
-      (version (git-version "0.2.0" revision commit))
+      (version (make-git-version "0.2.0" revision commit))
       (source
        (origin
          (method git-fetch)
diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm
index 59598f20c55..ad480e0c5ca 100644
--- a/gnu/packages/lua.scm
+++ b/gnu/packages/lua.scm
@@ -180,7 +180,7 @@ (define-public luajit
         (commit "04dca7911ea255f37be799c18d74c305b921c1a6"))
     (package
       (name "luajit")
-      (version (git-version branch "0" commit))
+      (version (make-git-version branch "0" commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
diff --git a/gnu/packages/luanti.scm b/gnu/packages/luanti.scm
index 246c174d452..43861b5dd38 100644
--- a/gnu/packages/luanti.scm
+++ b/gnu/packages/luanti.scm
@@ -190,7 +190,7 @@ (define-public minetest-game
         (revision "1"))
     (package
       (name "luanti-game")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -349,7 +349,7 @@ (define-public luanti-ethereal
         (revision "0"))
     (package
       (name "luanti-ethereal")
-      (version (git-version "1.29" revision commit))
+      (version (make-git-version "1.29" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -406,7 +406,7 @@ (define-public luanti-mesecons
         (revision "63"))
     (package
       (name "luanti-mesecons")
-      (version (git-version "1.2.1" revision commit))
+      (version (make-git-version "1.2.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -609,7 +609,7 @@ (define-public luanti-throwing
         (revision "0"))
     (package
       (name "luanti-throwing")
-      (version (git-version "1.1" revision commit))
+      (version (make-git-version "1.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -637,7 +637,7 @@ (define-public luanti-throwing-arrows
         (revision "0"))
     (package
       (name "luanti-throwing-arrows")
-      (version (git-version "1.1" revision commit))
+      (version (make-git-version "1.1" revision commit))
       (source
        (origin
          (method git-fetch)
