diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm
index 07de4cae645..5d949d50598 100644
--- a/gnu/packages/benchmark.scm
+++ b/gnu/packages/benchmark.scm
@@ -685,7 +685,7 @@ (define-public clpeak
   (let ((commit "6d59cb64997a53c35207b77a63d2e9f0e84de5fd"))
     (package
       (name "clpeak")
-      (version (git-version "1.1.0" "0" commit))
+      (version (make-git-version "1.1.0" "0" commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -870,7 +870,7 @@ (define-public vkmark
         (revision "0"))
     (package
       (name "vkmark")
-      (version (git-version "2017.08" revision commit))
+      (version (make-git-version "2017.08" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index e20b25c737e..f69dde66794 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -14846,7 +14846,7 @@ (define-public r-xcir
         (revision "1"))
     (package
       (name "r-xcir")
-      (version (git-version "1.8.0" revision commit))
+      (version (make-git-version "1.8.0" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -17691,7 +17691,7 @@ (define-public r-sanssouci
         (revision "1"))
     (package
       (name "r-sanssouci")
-      (version (git-version "0" revision commit))
+      (version (make-git-version "0" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -17726,7 +17726,7 @@ (define-public r-monocle3
         (revision "1"))
     (package
       (name "r-monocle3")
-      (version (git-version "1.3.7" revision commit))
+      (version (make-git-version "1.3.7" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -21578,7 +21578,7 @@ (define-public r-cycombine
   (let ((commit "f18504bc83ff5daee2b5eb4b28f09abdaaa66698") (revision "1"))
     (package
       (name "r-cycombine")
-      (version (git-version "0.2.6" revision commit))
+      (version (make-git-version "0.2.6" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -22375,7 +22375,7 @@ (define-public r-cicero-monocle3
         (revision "1"))
     (package (inherit r-cicero)
       (name "r-cicero-monocle3")
-      (version (git-version "1.3.9" revision commit))
+      (version (make-git-version "1.3.9" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -22504,7 +22504,7 @@ (define-public r-cistopic-next
       (name "r-cistopic-next")
       ;; The DESCRIPTION file says this is version 0.3.0, which is a bit odd
       ;; since the previous release is 2.1.0.  Oh well.
-      (version (git-version "0.3.0" revision commit))
+      (version (make-git-version "0.3.0" revision commit))
       (source
        (origin
          (method git-fetch)
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 0e8f05c8fc8..265badfb464 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -620,7 +620,7 @@ (define-public cellsnp-lite
         (revision "0"))
     (package
       (name "cellsnp-lite")
-      (version (git-version "1.2.2" revision commit))
+      (version (make-git-version "1.2.2" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -739,7 +739,7 @@ (define-public r-anglemania
         (revision "1"))
     (package
       (name "r-anglemania")
-      (version (git-version "0.99.1" revision commit))
+      (version (make-git-version "0.99.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -781,7 +781,7 @@ (define-public r-anndatar
         (revision "1"))
     (package
       (name "r-anndatar")
-      (version (git-version "0.99.0" revision commit))
+      (version (make-git-version "0.99.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -818,7 +818,7 @@ (define-public r-anpan
         (revision "1"))
     (package
       (name "r-anpan")
-      (version (git-version "0.3.0" revision commit))
+      (version (make-git-version "0.3.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -871,7 +871,7 @@ (define-public r-bedtorch
         (revision "1"))
     (package
       (name "r-bedtorch")
-      (version (git-version "0.1.12.12" revision commit))
+      (version (make-git-version "0.1.12.12" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -973,7 +973,7 @@ (define-public r-btools
         (revision "1"))
     (package
       (name "r-btools")
-      (version (git-version "0.0.1" revision commit))
+      (version (make-git-version "0.0.1" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -1011,7 +1011,7 @@ (define-public r-codeandroll2
         (revision "1"))
     (package
       (name "r-codeandroll2")
-      (version (git-version "2.3.6" revision commit))
+      (version (make-git-version "2.3.6" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -1045,7 +1045,7 @@ (define-public r-conospanel
         (revision "1"))
     (package
       (name "r-conospanel")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -1069,7 +1069,7 @@ (define-public r-conqur
         (revision "1"))
     (package
       (name "r-conqur")
-      (version (git-version "2.0" revision commit))
+      (version (make-git-version "2.0" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -1110,7 +1110,7 @@ (define-public r-ewastools
         (revision "1"))
     (package
       (name "r-ewastools")
-      (version (git-version "1.7.2" revision commit))
+      (version (make-git-version "1.7.2" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -1158,7 +1158,7 @@ (define-public r-hdwgcna
         (revision "1"))
     (package
       (name "r-hdwgcna")
-      (version (git-version "0.4.00" revision commit))
+      (version (make-git-version "0.4.00" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -1352,7 +1352,7 @@ (define-public r-netid
         (revision "1"))
     (package
       (name "r-netid")
-      (version (git-version "0.1.0" revision commit))
+      (version (make-git-version "0.1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -1402,7 +1402,7 @@ (define-public r-p2data
         (revision "1"))
     (package
       (name "r-p2data")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -1425,7 +1425,7 @@ (define-public r-pizzarr
         (revision "1"))
     (package
       (name "r-pizzarr")
-      (version (git-version "0.1.0" revision commit))
+      (version (make-git-version "0.1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -1454,7 +1454,7 @@ (define-public r-rhtslib12
         (revision "1"))
     (package
       (name "r-rhtslib12")
-      (version (git-version "1.23.2" revision commit))
+      (version (make-git-version "1.23.2" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -1481,7 +1481,7 @@ (define-public r-scdesign2
         (revision "1"))
     (package
       (name "r-scdesign2")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -1508,7 +1508,7 @@ (define-public r-scenic
         (revision "1"))
     (package
       (name "r-scenic")
-      (version (git-version "1.3.1" revision commit))
+      (version (make-git-version "1.3.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -1545,7 +1545,7 @@ (define-public r-scent
         (revision "1"))
     (package
       (name "r-scent")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -1582,7 +1582,7 @@ (define-public r-saige
         (revision "1"))
     (package
       (name "r-saige")
-      (version (git-version "1.3.4" revision commit))
+      (version (make-git-version "1.3.4" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -1675,7 +1675,7 @@ (define-public r-singlet
         (revision "1"))
     (package
       (name "r-singlet")
-      (version (git-version "0.99.26" revision commit))
+      (version (make-git-version "0.99.26" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -1750,7 +1750,7 @@ (define-public r-stringendo
         (revision "1"))
     (package
       (name "r-stringendo")
-      (version (git-version "0.6.0" revision commit))
+      (version (make-git-version "0.6.0" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -1775,7 +1775,7 @@ (define-public r-readwriter
         (revision "1"))
     (package
       (name "r-readwriter")
-      (version (git-version "1.5.3" revision commit))
+      (version (make-git-version "1.5.3" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -1801,7 +1801,7 @@ (define-public r-streamgraph
         (revision "1"))
     (package
       (name "r-streamgraph")
-      (version (git-version "0.9.0" revision commit))
+      (version (make-git-version "0.9.0" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -1836,7 +1836,7 @@ (define-public r-vitesscer
         (revision "1"))
     (package
       (name "r-vitesscer")
-      (version (git-version "0.99.0" revision commit))
+      (version (make-git-version "0.99.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -1877,7 +1877,7 @@ (define-public r-wasabi
         (revision "1"))
     (package
       (name "r-wasabi")
-      (version (git-version "1.0.1" revision commit))
+      (version (make-git-version "1.0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -1953,7 +1953,7 @@ (define-public pbgzip
   (let ((commit "2b09f97b5f20b6d83c63a5c6b408d152e3982974"))
     (package
       (name "pbgzip")
-      (version (git-version "0.0.0" "0" commit))
+      (version (make-git-version "0.0.0" "0" commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -2237,7 +2237,7 @@ (define bed-sample-files
   (let* ((name "bed-sample-files")
          (commit "a06dc0450e484090f15656ffd5d317813a5e1e01")
          (revision "0")
-         (version (git-version "0.0.0" revision commit)))
+         (version (make-git-version "0.0.0" revision commit)))
     (origin
       (method git-fetch)
       (uri (git-reference
@@ -2476,7 +2476,7 @@ (define-public python-bulkvis
         (revision "2"))
     (package
       (name "python-bulkvis")
-      (version (git-version "2.0.0" revision commit))
+      (version (make-git-version "2.0.0" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -3688,7 +3688,7 @@ (define-public python-pybio
         (revision "1"))
     (package
       (name "python-pybio")
-      (version (git-version "0.3.12" revision commit))
+      (version (make-git-version "0.3.12" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -3786,7 +3786,7 @@ (define bgen-sample-files
   (let* ((name "bgen-sample-files")
          (commit "7b1bc74f58b326ca19606fa5f3c6093d48367993")
          (revision "0")
-         (version (git-version "0.0.0" revision commit)))
+         (version (make-git-version "0.0.0" revision commit)))
     (origin
       (method git-fetch)
       (uri (git-reference
@@ -3801,7 +3801,7 @@ (define pynsptools-examples-files
          ;; taken from pysnptools/util/pysnptools.hashdown.json
          (commit "ed14e050b2b75e7f4ddb73d512fbe928bbdb2b85")
          (revision "0")
-         (version (git-version "0.0.0" revision commit)))
+         (version (make-git-version "0.0.0" revision commit)))
     (origin
       (method git-fetch)
       (uri (git-reference
@@ -4273,7 +4273,7 @@ (define-public python-whatshap
         (base-version "2.3"))
     (package
       (name "python-whatshap")
-      (version (git-version base-version revision commit))
+      (version (make-git-version base-version revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -5606,7 +5606,7 @@ (define-public python-mofax
         (revision "1"))
     (package
       (name "python-mofax")
-      (version (git-version "0.3.7" revision commit))
+      (version (make-git-version "0.3.7" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -9702,7 +9702,7 @@ (define-public isolator
         (revision "1"))
     (package
       (name "isolator")
-      (version (git-version "0.0.2" revision commit))
+      (version (make-git-version "0.0.2" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -10489,7 +10489,7 @@ (define-public music
         (revision "1"))
     (package
       (name "music")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -11017,7 +11017,7 @@ (define-public seek
         (revision "1"))
     (package
       (name "seek")
-      (version (git-version "1" revision commit))
+      (version (make-git-version "1" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -12221,7 +12221,7 @@ (define-public seqmagick
         (revision "0"))
     (package
       (name "seqmagick")
-      (version (git-version "0.8.6" revision commit))
+      (version (make-git-version "0.8.6" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -12769,7 +12769,7 @@ (define-public r-ggexpress
         (revision "1"))
     (package
       (name "r-ggexpress")
-      (version (git-version "0.6.6" revision commit))
+      (version (make-git-version "0.6.6" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -12806,7 +12806,7 @@ (define-public r-gg3d
         (revision "1"))
     (package
       (name "r-gg3d")
-      (version (git-version "0.0.0.9000" revision commit))
+      (version (make-git-version "0.0.0.9000" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -12838,7 +12838,7 @@ (define-public r-ggsankey
         (revision "1"))
     (package
       (name "r-ggsankey")
-      (version (git-version "0.0.99999" revision commit))
+      (version (make-git-version "0.0.99999" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -12869,7 +12869,7 @@ (define-public r-gutils
         (revision "2"))
     (package
       (name "r-gutils")
-      (version (git-version "0.2.0" revision commit))
+      (version (make-git-version "0.2.0" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -12903,7 +12903,7 @@ (define-public r-bamutils
         (revision "2"))
     (package
       (name "r-bamutils")
-      (version (git-version "0.0.0.9000" revision commit))
+      (version (make-git-version "0.0.0.9000" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -12938,7 +12938,7 @@ (define-public r-gtrack
         (revision "1"))
     (package
       (name "r-gtrack")
-      (version (git-version "0.1.0" revision commit))
+      (version (make-git-version "0.1.0" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -12976,7 +12976,7 @@ (define-public r-gchain
         (revision "1"))
     (package
       (name "r-gchain")
-      (version (git-version "0.2.0" revision commit))
+      (version (make-git-version "0.2.0" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -13031,7 +13031,7 @@ (define-public r-skitools
         (revision "1"))
     (package
       (name "r-skitools")
-      (version (git-version "0.0.0.9000" revision commit))
+      (version (make-git-version "0.0.0.9000" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -13079,7 +13079,7 @@ (define-public r-chromunity
         (revision "2"))
     (package
       (name "r-chromunity")
-      (version (git-version "0.0.2" revision commit))
+      (version (make-git-version "0.0.2" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -13129,7 +13129,7 @@ (define-public r-cmdstanr
         (revision "1"))
     (package
       (name "r-cmdstanr")
-      (version (git-version "0.8.1.9000" revision commit))
+      (version (make-git-version "0.8.1.9000" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -13165,7 +13165,7 @@ (define-public r-dnamcrosshyb
         (revision "1"))
     (package
       (name "r-dnamcrosshyb")
-      (version (git-version "0.0.0.9000" revision commit))
+      (version (make-git-version "0.0.0.9000" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -13209,7 +13209,7 @@ (define-public r-doubletcollection
         (revision "1"))
     (package
       (name "r-doubletcollection")
-      (version (git-version "1.1.0" revision commit))
+      (version (make-git-version "1.1.0" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -13256,7 +13256,7 @@ (define-public r-plsdabatch
         (revision "1"))
     (package
       (name "r-plsdabatch")
-      (version (git-version "0.2.3" revision commit))
+      (version (make-git-version "0.2.3" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -13296,7 +13296,7 @@ (define-public r-psupertime
         (revision "1"))
     (package
       (name "r-psupertime")
-      (version (git-version "0.2.6" revision commit))
+      (version (make-git-version "0.2.6" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -13406,7 +13406,7 @@ (define-public r-premessa
         (revision "1"))
     (package
       (name "r-premessa")
-      (version (git-version "0.3.4" revision commit))
+      (version (make-git-version "0.3.4" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -13462,7 +13462,7 @@ (define-public r-projectils
         (revision "1"))
     (package
       (name "r-projectils")
-      (version (git-version "3.0.0" revision commit))
+      (version (make-git-version "3.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -13507,7 +13507,7 @@ (define-public r-presto
         (revision "1"))
     (package
       (name "r-presto")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -13543,7 +13543,7 @@ (define-public r-sccustomize
         (revision "1"))
     (package
       (name "r-sccustomize")
-      (version (git-version "2.0.1" revision commit))
+      (version (make-git-version "2.0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -13600,7 +13600,7 @@ (define-public r-markdownhelpers
         (revision "1"))
     (package
       (name "r-markdownhelpers")
-      (version (git-version "0.2.0" revision commit))
+      (version (make-git-version "0.2.0" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -13625,7 +13625,7 @@ (define-public r-markdownreports
         (revision "1"))
     (package
       (name "r-markdownreports")
-      (version (git-version "4.5.9" revision commit))
+      (version (make-git-version "4.5.9" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -13664,7 +13664,7 @@ (define-public r-metacell
         (revision "1"))
     (package
       (name "r-metacell")
-      (version (git-version "0.3.41" revision commit))
+      (version (make-git-version "0.3.41" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -13725,7 +13725,7 @@ (define-public r-metadeconfoundr
         (revision "1"))
     (package
       (name "r-metadeconfoundr")
-      (version (git-version "0.3.0" revision commit))
+      (version (make-git-version "0.3.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -13765,7 +13765,7 @@ (define-public r-music
         (revision "2"))
     (package
       (name "r-music")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -13885,7 +13885,7 @@ (define-public r-tsis
         (revision "1"))
     (package
       (name "r-tsis")
-      (version (git-version "0.2.0" revision commit))
+      (version (make-git-version "0.2.0" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -13917,7 +13917,7 @@ (define-public r-umi4cpackage
         (revision "1"))
     (package
       (name "r-umi4cpackage")
-      (version (git-version "0.0.1" revision commit))
+      (version (make-git-version "0.0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -13958,7 +13958,7 @@ (define-public r-shinycell
         (revision "1"))
     (package
       (name "r-shinycell")
-      (version (git-version "2.0.0" revision commit))
+      (version (make-git-version "2.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -13994,7 +13994,7 @@ (define-public r-archr
         (revision "1"))
     (package
       (name "r-archr")
-      (version (git-version "1.0.2" revision commit))
+      (version (make-git-version "1.0.2" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -14042,7 +14042,7 @@ (define-public r-azimuth
         (revision "1"))
     (package
       (name "r-azimuth")
-      (version (git-version "0.5.0" revision commit))
+      (version (make-git-version "0.5.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -14102,7 +14102,7 @@ (define-public r-icellnet
         (revision "1"))
     (package
       (name "r-icellnet")
-      (version (git-version "2.2.1" revision commit))
+      (version (make-git-version "2.2.1" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -14189,7 +14189,7 @@ (define-public r-miamiplot
         (revision "1"))
     (package
       (name "r-miamiplot")
-      (version (git-version "1.1.0" revision commit))
+      (version (make-git-version "1.1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -14295,7 +14295,7 @@ (define-public r-scseqcomm
         (revision "0"))
     (package
       (name "r-scseqcomm")
-      (version (git-version "0" revision commit))
+      (version (make-git-version "0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -14344,7 +14344,7 @@ (define-public r-shaman
         (revision "2"))
     (package
       (name "r-shaman")
-      (version (git-version release revision commit))
+      (version (make-git-version release revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -14411,7 +14411,7 @@ (define-public r-demultiplex
         (revision "1"))
     (package
       (name "r-demultiplex")
-      (version (git-version "1.0.2" revision commit))
+      (version (make-git-version "1.0.2" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -14446,7 +14446,7 @@ (define-public r-demultiplex2
         (revision "2"))
     (package
       (name "r-demultiplex2")
-      (version (git-version "1.0.2" revision commit))
+      (version (make-git-version "1.0.2" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -14487,7 +14487,7 @@ (define-public r-demuxmix
         (revision "1"))
     (package
       (name "r-demuxmix")
-      (version (git-version "1.1.1" revision commit))
+      (version (make-git-version "1.1.1" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -14659,7 +14659,7 @@ (define-public r-pairwiseadonis
       ;; The versioning scheme of this package is inconsistent, with versions
       ;; progressing from 0.21 to 0.3 and then to 0.4.1, which does not follow
       ;; a standard numerical order or convention (e.g., semantic versioning).
-      (version (git-version "0.4.1" revision commit))
+      (version (make-git-version "0.4.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -15093,7 +15093,7 @@ (define-public r-phantompeakqualtools
         (revision "1"))
     (package
       (name "r-phantompeakqualtools")
-      (version (git-version "1.2.2" revision commit))
+      (version (make-git-version "1.2.2" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -15164,7 +15164,7 @@ (define-public rcas-web
         (revision "2"))
     (package
       (name "rcas-web")
-      (version (git-version "0.1.0" revision commit))
+      (version (make-git-version "0.1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -15213,7 +15213,7 @@ (define-public r-chipkernels
         (revision "1"))
     (package
       (name "r-chipkernels")
-      (version (git-version "1.1" revision commit))
+      (version (make-git-version "1.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -15281,7 +15281,7 @@ (define-public r-seraster
         (revision "1"))
     (package
       (name "r-seraster")
-      (version (git-version "0.99.0" revision commit))
+      (version (make-git-version "0.99.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -15382,7 +15382,7 @@ (define-public bits
       (name "bits")
       ;; The version is 2.13.0 even though no release archives have been
       ;; published as yet.
-      (version (git-version "2.13.0" revision commit))
+      (version (make-git-version "2.13.0" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -15427,7 +15427,7 @@ (define-public piranha
         (commit   "0466d364b71117d01e4471b74c514436cc281233"))
     (package
       (name "piranha")
-      (version (git-version "1.2.1" revision commit))
+      (version (make-git-version "1.2.1" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -15490,7 +15490,7 @@ (define-public filevercmp
         (revision "1"))
     (package
       (name "filevercmp")
-      (version (git-version "0" revision commit))
+      (version (make-git-version "0" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -15585,7 +15585,7 @@ (define-public r-chromvarmotifs
         (revision "1"))
     (package
       (name "r-chromvarmotifs")
-      (version (git-version "0.2.0" revision commit))
+      (version (make-git-version "0.2.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -15641,7 +15641,7 @@ (define-public r-rnacrosslinkoo
         (revision "1"))
     (package
       (name "r-rnacrosslinkoo")
-      (version (git-version "0.1.3" revision commit))
+      (version (make-git-version "0.1.3" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -15685,7 +15685,7 @@ (define-public r-rnaseqdtu
         (revision "1"))
     (package
       (name "r-rnaseqdtu")
-      (version (git-version "2.0" revision commit))
+      (version (make-git-version "2.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -15752,7 +15752,7 @@ (define-public r-cellchat
         (revision "1"))
     (package
       (name "r-cellchat")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -15817,7 +15817,7 @@ (define-public r-cellchat-2
         (revision "1"))
     (package
       (name "r-cellchat")
-      (version (git-version "2.1.2" revision commit))
+      (version (make-git-version "2.1.2" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -15884,7 +15884,7 @@ (define-public r-copykat
         (revision "0"))
     (package
       (name "r-copykat")
-      (version (git-version "1.0.8" revision commit))
+      (version (make-git-version "1.0.8" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -15972,7 +15972,7 @@ (define-public r-rphyloxml
         (revision "1"))
     (package
       (name "r-rphyloxml")
-      (version (git-version "0.0-9000" revision commit))
+      (version (make-git-version "0.0-9000" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -16317,7 +16317,7 @@ (define-public tadbit
         (revision "2"))
     (package
       (name "tadbit")
-      (version (git-version "1.0.1" revision commit))
+      (version (make-git-version "1.0.1" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -16513,7 +16513,7 @@ (define-public skewer
         (revision "1"))
     (package
       (name "skewer")
-      (version (git-version "0" revision commit))
+      (version (make-git-version "0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -16549,7 +16549,7 @@ (define-public f-seq
         (revision "1"))
     (package
       (name "f-seq")
-      (version (git-version "1.1" revision commit))
+      (version (make-git-version "1.1" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -17474,7 +17474,7 @@ (define-public python-multicore-tsne
         (revision "1"))
     (package
       (name "python-multicore-tsne")
-      (version (git-version "0" revision commit))
+      (version (make-git-version "0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -18606,7 +18606,7 @@ (define-public mantis
         (revision "2"))
     (package
       (name "mantis")
-      (version (git-version "0.1" revision commit))
+      (version (make-git-version "0.1" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -18644,7 +18644,7 @@ (define-public sjcount
         (revision "1"))
     (package
       (name "sjcount")
-      (version (git-version "3.2" revision commit))
+      (version (make-git-version "3.2" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -18983,7 +18983,7 @@ (define-public r-disgenet2r
         (revision "1"))
     (package
       (name "r-disgenet2r")
-      (version (git-version "0.99.2" revision commit))
+      (version (make-git-version "0.99.2" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -19023,7 +19023,7 @@ (define-public r-dtmm
         (revision "1"))
     (package
       (name "r-dtmm")
-      (version (git-version "0.1.0" revision commit))
+      (version (make-git-version "0.1.0" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -19122,7 +19122,7 @@ (define-public r-liana
         (revision "1"))
     (package
       (name "r-liana")
-      (version (git-version "0.1.14" revision commit))
+      (version (make-git-version "0.1.14" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -19254,7 +19254,7 @@ (define-public r-domultibarheatmap
         (revision "1"))
     (package
       (name "r-domultibarheatmap")
-      (version (git-version "0.1.0" revision commit))
+      (version (make-git-version "0.1.0" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -19279,7 +19279,7 @@ (define-public r-doubletfinder
         (revision "1"))
     (package
       (name "r-doubletfinder")
-      (version (git-version "2.0.3" revision commit))
+      (version (make-git-version "2.0.3" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -19313,7 +19313,7 @@ (define-public r-cytobackbone
         (revision "1"))
     (package
       (name "r-cytobackbone")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -19353,7 +19353,7 @@ (define-public r-cytoexplorer
         (revision "1"))
     (package
       (name "r-cytoexplorer")
-      (version (git-version "1.1.0" revision commit))
+      (version (make-git-version "1.1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -19459,7 +19459,7 @@ (define-public r-cytoexplorerdata
         (revision "1"))
     (package
       (name "r-cytoexplorerdata")
-      (version (git-version "1.0.3" revision commit))
+      (version (make-git-version "1.0.3" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -19484,7 +19484,7 @@ (define-public r-giotto
         (revision "1"))
     (package
       (name "r-giotto")
-      (version (git-version "1.1.2" revision commit))
+      (version (make-git-version "1.1.2" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -19544,7 +19544,7 @@ (define-public r-illuminahumanmethylationepicmanifest-latest
         (revision "1"))
     (package
       (name "r-illuminahumanmethylationepicmanifest")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -19577,7 +19577,7 @@ (define-public r-illuminahumanmethylationepicanno-ilm10b5-hg38
         (revision "1"))
     (package
       (name "r-illuminahumanmethylationepicanno-ilm10b5-hg38")
-      (version (git-version "0.0.1" revision commit))
+      (version (make-git-version "0.0.1" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -19605,7 +19605,7 @@ (define-public r-maxprobes
         (revision "1"))
     (package
       (name "r-maxprobes")
-      (version (git-version "0.0.2" revision commit))
+      (version (make-git-version "0.0.2" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -19633,7 +19633,7 @@ (define-public gffread
         (revision "1"))
     (package
       (name "gffread")
-      (version (git-version "0.9.12" revision commit))
+      (version (make-git-version "0.9.12" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -20032,7 +20032,7 @@ (define-public gffcompare
         (revision "1"))
     (package
       (name "gffcompare")
-      (version (git-version "0.10.15" revision commit))
+      (version (make-git-version "0.10.15" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -20064,7 +20064,7 @@ (define-public gffcompare
           ,(let ((commit "54917d0849c1e83cfb057b5f712e5cb6a35d948f")
                  (revision "1")
                  (name "gclib")
-                 (version (git-version "0.10.3" revision commit)))
+                 (version (make-git-version "0.10.3" revision commit)))
              (origin
                (method git-fetch)
                (uri (git-reference
@@ -20094,7 +20094,7 @@ (define-public intervaltree
   (let ((commit "b90527f9e6d51cd36ecbb50429e4524d3a418ea5"))
     (package
       (name "intervaltree")
-      (version (git-version "0.0.0" "1" commit))
+      (version (make-git-version "0.0.0" "1" commit))
       (source
         (origin
           (method git-fetch)
@@ -20733,7 +20733,7 @@ (define-public r-xbioc
         (commit "6ff0670a37ab3036aaf1d94aa4b208310946b0b5"))
     (package
       (name "r-xbioc")
-      (version (git-version "0.1.16" revision commit))
+      (version (make-git-version "0.1.16" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -20766,7 +20766,7 @@ (define-public r-cssam
         (commit "9ec58c982fa551af0d80b1a266890d92954833f2"))
     (package
       (name "r-cssam")
-      (version (git-version "1.4" revision commit))
+      (version (make-git-version "1.4" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -20797,7 +20797,7 @@ (define-public r-bseqsc
         (commit "fef3f3e38dcf3df37103348b5780937982b43b98"))
     (package
       (name "r-bseqsc")
-      (version (git-version "1.0" revision commit))
+      (version (make-git-version "1.0" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -20844,7 +20844,7 @@ (define-public porechop
         (revision "1"))
     (package
       (name "porechop")
-      (version (git-version "0.2.3" revision commit))
+      (version (make-git-version "0.2.3" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -21113,7 +21113,7 @@ (define-public filtlong
         (revision "1"))
     (package
       (name "filtlong")
-      (version (git-version "0.2.0" revision commit))
+      (version (make-git-version "0.2.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -21817,7 +21817,7 @@ (define-public r-scopeloomr
         (revision "1"))
     (package
       (name "r-scopeloomr")
-      (version (git-version "0.13.0" revision commit))
+      (version (make-git-version "0.13.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -21870,7 +21870,7 @@ (define-public r-databaselinke-r
         (revision "1"))
     (package
       (name "r-databaselinke-r")
-      (version (git-version "1.7.0" revision commit))
+      (version (make-git-version "1.7.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -21898,7 +21898,7 @@ (define-public r-seurat-utils
         (revision "1"))
     (package
       (name "r-seurat-utils")
-      (version (git-version "2.5.0" revision commit))
+      (version (make-git-version "2.5.0" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -21962,7 +21962,7 @@ (define-public r-seuratextend
         (revision "1"))
     (package
       (name "r-seuratextend")
-      (version (git-version "1.0.7" revision commit))
+      (version (make-git-version "1.0.7" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -22008,7 +22008,7 @@ (define-public r-seuratextenddata
         (revision "1"))
     (package
       (name "r-seuratextenddata")
-      (version (git-version "0.2.1" revision commit))
+      (version (make-git-version "0.2.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -22031,7 +22031,7 @@ (define-public r-seuratwrappers
         (revision "1"))
     (package
       (name "r-seuratwrappers")
-      (version (git-version "0.3.1" revision commit))
+      (version (make-git-version "0.3.1" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -22154,7 +22154,7 @@ (define-public pyscenic
         (revision "1"))
     (package
       (name "pyscenic")
-      (version (git-version "0.12.1" revision commit))
+      (version (make-git-version "0.12.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -22355,7 +22355,7 @@ (define-public tbsp
         (revision "2"))
     (package
       (name "tbsp")
-      (version (git-version "1.0.0" revision commit))
+      (version (make-git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -22464,7 +22464,7 @@ (define-public smithwaterman
   (let ((commit "2610e259611ae4cde8f03c72499d28f03f6d38a7"))
     (package
       (name "smithwaterman")
-      (version (git-version "0.0.0" "2" commit))
+      (version (make-git-version "0.0.0" "2" commit))
       (source (origin
         (method git-fetch)
         (uri (git-reference
@@ -22527,7 +22527,7 @@ (define-public smithwaterman
                                Description: smith-waterman-gotoh alignment algorithm~@
                                Libs: -L${libdir} -lsmithwaterman~@
                                Cflags: -I${includedir}~%"
-                               out #$version)))))))))
+                               out #$(package-version this-package))))))))))
       (home-page "https://github.com/ekg/smithwaterman")
       (synopsis "Implementation of the Smith-Waterman algorithm")
       (description "Implementation of the Smith-Waterman algorithm.")
@@ -22617,7 +22617,7 @@ (define-public fsom
   (let ((commit "a6ef318fbd347c53189384aef7f670c0e6ce89a3"))
     (package
       (name "fsom")
-      (version (git-version "0.0.0" "1" commit))
+      (version (make-git-version "0.0.0" "1" commit))
       (source (origin
         (method git-fetch)
         (uri (git-reference
@@ -22998,7 +22998,7 @@ (define-public r-hdf5dataframe
         (revision "1"))
     (package
       (name "r-hdf5dataframe")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -23027,7 +23027,7 @@ (define-public r-imagearray
         (revision "1"))
     (package
       (name "r-imagearray")
-      (version (git-version "1.0" revision commit))
+      (version (make-git-version "1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -23051,7 +23051,7 @@ (define-public r-velocyto
         (revision "1"))
     (package
       (name "r-velocyto")
-      (version (git-version "0.6" revision commit))
+      (version (make-git-version "0.6" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -23094,7 +23094,7 @@ (define-public r-voltron
         (revision "5"))
     (package
       (name "r-voltron")
-      (version (git-version "0.2.0" revision commit))
+      (version (make-git-version "0.2.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -23225,7 +23225,7 @@ (define-public r-zarrdataframe
         (revision "1"))
     (package
       (name "r-zarrdataframe")
-      (version (git-version "0.0.0" revision commit))
+      (version (make-git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -23254,7 +23254,7 @@ (define-public r-zarrarray
         (revision "1"))
     (package
       (name "r-zarrarray")
-      (version (git-version "1.0" revision commit))
+      (version (make-git-version "1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -24051,7 +24051,7 @@ (define-public r-signac
         (revision "1"))
     (package
       (name "r-signac")
-      (version (git-version "1.12.0" revision commit))
+      (version (make-git-version "1.12.0" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -24140,7 +24140,7 @@ (define-public python-pyvcf3
         (revision "0"))
     (package
       (name "python-pyvcf3")
-      (version (git-version "1.0.3" revision commit))
+      (version (make-git-version "1.0.3" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -24778,7 +24778,7 @@ (define-public r-catch
         (revision "1"))
     (package
       (name "r-catch")
-      (version (git-version "1.0" revision commit))
+      (version (make-git-version "1.0" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -24806,7 +24806,7 @@ (define-public r-spacexr
         (revision "1"))
     (package
       (name "r-spacexr")
-      (version (git-version "2.2.1" revision commit))
+      (version (make-git-version "2.2.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -24926,7 +24926,7 @@ (define-public r-compgenomrdata
         (revision "1"))
     (package
       (name "r-compgenomrdata")
-      (version (git-version "0.1.0" revision commit))
+      (version (make-git-version "0.1.0" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -24949,7 +24949,7 @@ (define-public r-cytonorm
         (revision "1"))
     (package
       (name "r-cytonorm")
-      (version (git-version "0.0.10" revision commit))
+      (version (make-git-version "0.0.10" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -24987,7 +24987,7 @@ (define-public r-kbet
         (revision "1"))
     (package
       (name "r-kbet")
-      (version (git-version "0.99.6" revision commit))
+      (version (make-git-version "0.99.6" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm
index 309f85c716a..48129db8523 100644
--- a/gnu/packages/bittorrent.scm
+++ b/gnu/packages/bittorrent.scm
@@ -277,7 +277,7 @@ (define-public tremc
         (revision "1"))
   (package
     (name "tremc")
-    (version (git-version "0.9.3" revision commit))
+    (version (make-git-version "0.9.3" revision commit))
     (source
      (origin
        (method git-fetch)
diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm
index d0899635182..6cb3a944ed6 100644
--- a/gnu/packages/boost.scm
+++ b/gnu/packages/boost.scm
@@ -385,7 +385,7 @@ (define-public boost-sync
         (revision "2"))
     (package
       (name "boost-sync")
-      (version (git-version version revision commit))
+      (version (make-git-version version revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -417,7 +417,7 @@ (define-public boost-signals2
         (revision "0"))
     (package
       (name "boost-signals2")
-      (version (git-version (package-version boost) revision commit))
+      (version (make-git-version (package-version boost) revision commit))
       (source
        (origin
          (method git-fetch)
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 1321b55df49..31f91bb1fc2 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -673,7 +673,7 @@ (define-public syslinux
   (let ((commit "bb41e935cc83c6242de24d2271e067d76af3585c"))
     (package
       (name "syslinux")
-      (version (git-version "6.04-pre" "1" commit))
+      (version (make-git-version "6.04-pre" "1" commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -1630,7 +1630,7 @@ (define u-boot-ts-mx6
     (package
       (inherit u-boot)
       (name "u-boot-ts-mx6")
-      (version (git-version "2015.04_3" revision commit))
+      (version (make-git-version "2015.04_3" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -1944,7 +1944,7 @@ (define-public ipxe
         (revision "3"))
     (package
       (name "ipxe")
-      (version (git-version "1.21.1" revision commit))
+      (version (make-git-version "1.21.1" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
diff --git a/gnu/packages/bqn.scm b/gnu/packages/bqn.scm
index fd090ad4336..3f60650fad6 100644
--- a/gnu/packages/bqn.scm
+++ b/gnu/packages/bqn.scm
@@ -39,7 +39,7 @@ (define-public dbqn
         (revision "1"))
     (package
       (name "dbqn")
-      (version (git-version "0.2.1" revision commit))
+      (version (make-git-version "0.2.1" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -126,7 +126,7 @@ (define cbqn-bootstrap
          (commit "66584ce1491d300746963b8ed17170348b2a03e6"))
     (package
       (name "cbqn-bootstrap")
-      (version (git-version "0" revision commit))
+      (version (make-git-version "0" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
diff --git a/gnu/packages/browser-extensions.scm b/gnu/packages/browser-extensions.scm
index 934466f9515..de422b484b5 100644
--- a/gnu/packages/browser-extensions.scm
+++ b/gnu/packages/browser-extensions.scm
@@ -97,7 +97,7 @@ (define ublock-main-assets
   (let* ((name "ublock-main-assets")
          (commit "4696d6a593755d34b28c073b0150f4b4bb000387")
          (revision "4")
-         (version (git-version "0" revision commit)))
+         (version (make-git-version "0" revision commit)))
     (origin
       (method git-fetch)
       (uri (git-reference
@@ -113,7 +113,7 @@ (define ublock-prod-assets
   (let* ((name "ublock-prod-assets")
          (commit "bfeb222d20279afcc997d4b804fc4862f1364f95")
          (revision "4")
-         (version (git-version "0" revision commit)))
+         (version (make-git-version "0" revision commit)))
     (origin
       (method git-fetch)
       (uri (git-reference
diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index 77c64fb1a37..b63829b95cf 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -235,7 +235,7 @@ (define-public gn
         (revision "2072"))            ;as returned by `git describe`, used below
     (package
       (name "gn")
-      (version (git-version "0.0" revision commit))
+      (version (make-git-version "0.0" revision commit))
       (home-page "https://gn.googlesource.com/gn")
       (source (origin
                 (method git-fetch)
@@ -387,7 +387,7 @@ (define-public muon
         (revision "0"))
     (package
       (name "muon")
-      (version (git-version "0.4.0" revision commit))
+      (version (make-git-version "0.4.0" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -831,7 +831,7 @@ (define-public genie
         (revision "0"))
     (package
       (name "genie")
-      (version (git-version "1170" revision commit))
+      (version (make-git-version "1170" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -866,7 +866,7 @@ (define*-public (gnulib-checkout #:key
   "Return as a package the exact gnulib checkout."
   (package
     (name "gnulib")
-    (version (git-version version revision commit))
+    (version (make-git-version version revision commit))
     (source
      (origin
        (method git-fetch)
@@ -1114,7 +1114,7 @@ (define-public potato-make
         (revision "0"))
     (package
       (name "potato-make")
-      (version (git-version "0" revision commit))
+      (version (make-git-version "0" revision commit))
       (source
        (origin
          (method git-fetch)
