Subject: [PATCH 32/34] gnu/packages/x*.scm: Use make-git-version.

From: Nicolas Graves <[email-masked]>
Date: Sat, 26 Jul 2025 04:39:38 +0200

find gnu/packages/ -type f -name "x*.scm" -exec sed -i 's/(git-version /(make-git-version /g' {} +

Then manually checked the potential usage of `version` on the build-side.
---
 gnu/packages/xdisorg.scm | 10 +++++-----
 gnu/packages/xiph.scm    |  2 +-
 gnu/packages/xml.scm     |  2 +-
 gnu/packages/xorg.scm    |  4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index c396cf7c992..bc7fec7432e 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -506,7 +506,7 @@ (define-public bigbagkbdtrixxkb
         (revision "0"))
     (package
       (name "bigbagkbdtrixxkb")
-      (version (git-version "0" revision commit))
+      (version (make-git-version "0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -587,7 +587,7 @@ (define-public xkblayout
         (commit "c0851b0f4bc9bc1a07240605baac8e50abe63fa8"))
     (package
       (name "xkblayout")
-      (version (git-version version revision commit))
+      (version (make-git-version version revision commit))
       (home-page "https://gitlab.freedesktop.org/whot/xkblayout")
       (source
        (origin
@@ -2116,7 +2116,7 @@ (define-public xsel
         (revision "1"))
     (package
       (name "xsel")
-      (version (git-version "1.2.0" revision commit))
+      (version (make-git-version "1.2.0" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -2749,7 +2749,7 @@ (define-public xss-lock
         (commit "1e158fb20108058dbd62bd51d8e8c003c0a48717"))
     (package
       (name "xss-lock")
-      (version (git-version version revision commit))
+      (version (make-git-version version revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -4296,7 +4296,7 @@ (define-public xforms
         (commit "2c1a9f151baf50887a517280645ec23379fb96f8"))
     (package
       (name "xforms")
-      (version (git-version "1.3.0" revision commit))
+      (version (make-git-version "1.3.0" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm
index d58665f6c34..bb13456ecd5 100644
--- a/gnu/packages/xiph.scm
+++ b/gnu/packages/xiph.scm
@@ -556,7 +556,7 @@ (define-public rnnoise
         (revision "0"))
    (package
      (name "rnnoise")
-     (version (git-version "0" revision commit))
+     (version (make-git-version "0" revision commit))
      (source (origin
                (method git-fetch)
                (uri (git-reference
diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index 0d1992eb209..f33cf3663bf 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -1985,7 +1985,7 @@ (define-public python-untangle
     (package
       (name "python-untangle")
       ;; PyPI currently offers some untagged 1.1.1 version.
-      (version (git-version "1.1.1" revision commit))
+      (version (make-git-version "1.1.1" revision commit))
       (source
        (origin
          (method git-fetch)             ;no tests in pypi archive
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 6f202c2d7da..929ef560c13 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -2846,7 +2846,7 @@ (define-public xf86-video-ati
         (revision "1"))
     (package
       (name "xf86-video-ati")
-      (version (git-version "19.1.0" revision commit))
+      (version (make-git-version "19.1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -3064,7 +3064,7 @@ (define-public xf86-video-intel
         (revision "18"))
     (package
       (name "xf86-video-intel")
-      (version (git-version "2.99.917" revision commit))
+      (version (make-git-version "2.99.917" revision commit))
       (source
        (origin
          ;; there's no current tarball
-- 
2.50.1