@@ -222,7 +222,7 @@ (define-public dds
(revision "1"))
(package
(name "dds")
- (version (git-version "2.9.0" revision commit))
+ (version (make-git-version "2.9.0" revision commit))
(source
(origin
(method git-fetch)
@@ -272,7 +272,9 @@ (define-public dds
(copy-recursively "../include" inc))
(let ((doc (string-append #$output
"/share/doc/"
- #$name "-" #$version)))
+ #$name "-"
+ #$(package-version
+ this-package))))
(install-file "../LICENSE" doc)
(copy-recursively "../doc" doc)))))))
(native-inputs
@@ -430,7 +432,8 @@ (define-public grfcodec
`(begin
;; The sources are not a git repository
(substitute* "generate_version.cmake"
- (("\\$\\{GIT.*describe.*") (string-append "echo \"" ,version "\"\n"))
+ (("\\$\\{GIT.*describe.*")
+ (string-append "echo \"" ,version "\"\n"))
(("\\$\\{GIT.*show.*") "echo \"Not shown for reproducibility.\"\n"))
(substitute* "CMakeLists.txt"
(("find_package\\(Git REQUIRED\\)") ""))))))
@@ -1895,7 +1898,7 @@ (define-public python-pyxel
(package
(name "python-pyxel")
;; This is the latest version to not require Rust…
- (version (git-version "1.4.3" revision commit))
+ (version (make-git-version "1.4.3" revision commit))
(source
(origin
(method git-fetch)
@@ -2899,7 +2902,7 @@ (define-public ioquake3
(commit "ab18167a09415e9e9f4859c197bad72ec39807d5"))
(package
(name "ioquake3")
- (version (git-version "1.3.6" revision commit))
+ (version (make-git-version "1.3.6" revision commit))
(source
(origin
(method git-fetch)
@@ -3202,7 +3205,7 @@ (define-public chipmunk
(revision "1"))
(package
(name "chipmunk")
- (version (git-version "7.0.3" revision commit))
+ (version (make-git-version "7.0.3" revision commit))
(source
(origin
(method git-fetch)
@@ -3369,7 +3372,7 @@ (define-public warsow-qfusion
(let ((commit "c4de15df559410aff0ca6643724e24cddb0ecbbd"))
(package
(name "warsow-qfusion")
- (version (git-version "2.5" "1" commit)) ; 2.5-beta
+ (version (make-git-version "2.5" "1" commit)) ; 2.5-beta
(source (origin
(method git-fetch)
(uri (git-reference
@@ -3711,7 +3714,7 @@ (define-public tic80
"1ivjwwqxqjfhm8caz1srkp8wx7fpzvpf7s26ifif7cryvqch8vnf")))))
(package
(name "tic80")
- (version (git-version "1.2.0" "1" commit))
+ (version (make-git-version "1.2.0" "1" commit))
(source
(origin
(method git-fetch)
@@ -472,7 +472,7 @@ (define-public anarch
(revision "1"))
(package
(name "anarch")
- (version (git-version "1.1d" revision commit))
+ (version (make-git-version "1.1d" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -840,7 +840,7 @@ (define-public vdrift
(revision "0"))
(package
(name "vdrift")
- (version (git-version "2014-10-20" revision commit))
+ (version (make-git-version "2014-10-20" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1150,7 +1150,7 @@ (define-public sgt-puzzles
(revision "0"))
(package
(name "sgt-puzzles")
- (version (git-version "20250510" revision commit))
+ (version (make-git-version "20250510" revision commit))
(source
(origin
(method git-fetch)
@@ -1938,7 +1938,7 @@ (define-public joycond
(revision "2"))
(package
(name "joycond")
- (version (git-version "0.1.0" revision commit))
+ (version (make-git-version "0.1.0" revision commit))
(source
(origin
(method git-fetch)
@@ -2240,7 +2240,7 @@ (define-public ghosthop
(revision "1"))
(package
(name "ghosthop")
- (version (git-version "0" revision commit))
+ (version (make-git-version "0" revision commit))
(source
(origin
(method git-fetch)
@@ -2859,7 +2859,7 @@ (define-public redeal
(revision "1"))
(package
(name "redeal")
- (version (git-version "0.2.0" revision commit))
+ (version (make-git-version "0.2.0" revision commit))
(source
(origin
(method git-fetch)
@@ -2888,7 +2888,9 @@ (define-public redeal
(lambda _
(let* ((doc (string-append #$output "/share/doc/"))
(examples
- (string-append doc #$name "-" #$version "/examples")))
+ (string-append doc #$name "-"
+ #$(package-version this-package)
+ "/examples")))
(mkdir-p examples)
(copy-recursively "examples" examples)))))))
(inputs (list dds `(,python "tk")))
@@ -3928,7 +3930,7 @@ (define-public pingus
(revision "0"))
(package
(name "pingus")
- (version (git-version "0.7.6" revision commit))
+ (version (make-git-version "0.7.6" revision commit))
(source
(origin
(method git-fetch)
@@ -4454,7 +4456,7 @@ (define-public mars
(revision "2"))
(package
(name "mars")
- (version (git-version "0.7.5" revision commit))
+ (version (make-git-version "0.7.5" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -5507,7 +5509,7 @@ (define openttd-opengfx
(revision "0"))
(package
(name "openttd-opengfx")
- (version (git-version "7.1" revision commit))
+ (version (make-git-version "7.1" revision commit))
(source
(origin
(method git-fetch)
@@ -6686,7 +6688,7 @@ (define-public tuxemon
(revision "0"))
(package
(name "tuxemon")
- (version (git-version "0.4.34" revision commit))
+ (version (make-git-version "0.4.34" revision commit))
(source
(origin
(method git-fetch)
@@ -7153,7 +7155,7 @@ (define-public moonlight-common
(revision "1"))
(package
(name "moonlight-common")
- (version (git-version "6.1.0" revision commit))
+ (version (make-git-version "6.1.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -9819,7 +9821,7 @@ (define-public frozen-bubble
(revision "1"))
(package
(name "frozen-bubble")
- (version (git-version "2.2.1" revision commit))
+ (version (make-git-version "2.2.1" revision commit))
(source
(origin
(method git-fetch)
@@ -10920,7 +10922,7 @@ (define-public marble-marcher
(revision "1"))
(package
(name "marble-marcher")
- (version (git-version "0" revision commit))
+ (version (make-git-version "0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -11146,7 +11148,7 @@ (define-public jstest-gtk
(revision "0"))
(package
(name "jstest-gtk")
- (version (git-version "0.1.0" revision commit))
+ (version (make-git-version "0.1.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -12126,7 +12128,7 @@ (define-public neverball
(revision "1"))
(package
(name "neverball")
- (version (git-version "1.6.0" revision commit))
+ (version (make-git-version "1.6.0" revision commit))
(source
(origin
(method git-fetch)
@@ -12382,7 +12384,7 @@ (define-public xevil
(revision "0"))
(package
(name "xevil")
- (version (git-version "2.02" revision commit))
+ (version (make-git-version "2.02" revision commit))
(source
(origin
(method git-fetch)
@@ -12409,7 +12411,8 @@ (define-public xevil
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "cmn/game.cpp"
(("(#define VERSION ).*" _ define)
- (string-append define "\"" #$version "\"\n")))
+ (string-append define "\""
+ #$(package-version this-package) "\"\n")))
(substitute* "cmn/utils.cpp"
(("[^\"]*/(bin/uname)" _ command)
(search-input-file inputs command)))
@@ -12429,7 +12432,8 @@ (define-public xevil
(string-append #$output "/bin"))
(list "xevil" "serverping")))
(let ((doc (string-append #$output "/share/doc/"
- #$name "-" #$version)))
+ #$name "-"
+ #$(package-version this-package))))
(mkdir-p doc)
(for-each (lambda (file)
(copy-recursively file
@@ -12461,7 +12465,7 @@ (define-public azimuth
(revision "0"))
(package
(name "azimuth")
- (version (git-version "1.0.3" revision commit))
+ (version (make-git-version "1.0.3" revision commit))
(source
(origin
(method git-fetch)
@@ -12590,7 +12594,7 @@ (define-public paperview
(revision "1"))
(package
(name "paperview")
- (version (git-version "0.0.1" revision commit)) ;no upstream release
+ (version (make-git-version "0.0.1" revision commit)) ;no upstream release
(source (origin
(method git-fetch)
(uri (git-reference
@@ -12652,7 +12656,7 @@ (define-public devours
(revision "0"))
(package
(name "devours")
- (version (git-version "3" revision commit))
+ (version (make-git-version "3" revision commit))
(source
(origin
(method git-fetch)
@@ -12728,7 +12732,7 @@ (define-public schiffbruch
(let ((commit "e41916d15d87749c82c5005cbb42d1bb079b43d9"))
(package
(name "schiffbruch")
- (version (git-version "1.2.1" "0" commit))
+ (version (make-git-version "1.2.1" "0" commit))
(source
(origin
(method git-fetch)
@@ -13003,7 +13007,7 @@ (define-public plunder
(revision "1"))
(package
(name "plunder")
- (version (git-version "1.0.0" revision commit))
+ (version (make-git-version "1.0.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -13042,7 +13046,7 @@ (define-public freerct
(revision "0"))
(package
(name "freerct")
- (version (git-version "0.1" revision commit))
+ (version (make-git-version "0.1" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -13298,7 +13302,7 @@ (define-public steam-devices-udev-rules
(revision "1"))
(package
(name "steam-devices-udev-rules")
- (version (git-version "1.0.0.61" revision commit))
+ (version (make-git-version "1.0.0.61" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -123,7 +123,7 @@ (define-public egawk-next
(package
(inherit gawk-mpfr)
(name "egawk-next")
- (version (git-version "5.1.60" revision commit))
+ (version (make-git-version "5.1.60" revision commit))
(source
(origin
(method git-fetch)
@@ -46,7 +46,7 @@ (define-public genimage
(revision "0"))
(package
(name "genimage")
- (version (git-version "18" revision commit))
+ (version (make-git-version "18" revision commit))
(source
(origin
(method git-fetch)
@@ -1373,7 +1373,7 @@ (define-public mapnik
(revision "0"))
(package
(name "mapnik")
- (version (git-version "3.1.0" revision commit))
+ (version (make-git-version "3.1.0" revision commit))
(source
(origin
(method git-fetch)
@@ -2981,7 +2981,7 @@ (define-public r-rnaturalearthhires
(revision "1"))
(package
(name "r-rnaturalearthhires")
- (version (git-version "0.2.1" revision commit))
+ (version (make-git-version "0.2.1" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1099,7 +1099,7 @@ (define-public nanovg-for-extempore
(commit "3c60175fcc2e5fe305b04355cdce35d499c80310"))
(package
(name "nanovg-for-extempore")
- (version (git-version version revision commit))
+ (version (make-git-version version revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1347,7 +1347,7 @@ (define-public piglit
(commit "814046fe6942eac660ee4a6cc5fcc54011a49945"))
(package
(name "piglit")
- (version (git-version "0.0.0" revision commit))
+ (version (make-git-version "0.0.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1625,7 +1625,7 @@ (define-public cppgir-for-telegram-desktop
(package
(inherit cppgir)
(name "cppgir-for-telegram-desktop")
- (version (git-version "2.0" revision commit))
+ (version (make-git-version "2.0" revision commit))
(source
(origin
(method git-fetch)
@@ -1035,7 +1035,7 @@ (define-public gnome-shell-extension-noannoyance
(revision "23"))
(package
(name "gnome-shell-extension-noannoyance")
- (version (git-version "17" revision commit))
+ (version (make-git-version "17" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1948,7 +1948,7 @@ (define-public nordic-theme
(revision "0"))
(package
(name "nordic-theme")
- (version (git-version "1.9.0" revision commit))
+ (version (make-git-version "1.9.0" revision commit))
(source
(origin
(method git-fetch)
@@ -2040,7 +2040,7 @@ (define-public dia
(revision "6"))
(package
(name "dia")
- (version (git-version "0.97.3" revision commit))
+ (version (make-git-version "0.97.3" revision commit))
(source
(origin
(method git-fetch)
@@ -10251,7 +10251,7 @@ (define-public gnome-screenshot
(revision "0"))
(package
(name "gnome-screenshot")
- (version (git-version "41.0" revision commit))
+ (version (make-git-version "41.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -10826,7 +10826,7 @@ (define-public libzapojit
(commit "99d49bac5edc4afdcac742a0a142908e405597b0"))
(package
(name "libzapojit")
- (version (git-version "0.0.3" revision commit))
+ (version (make-git-version "0.0.3" revision commit))
(source
(origin
(method git-fetch)
@@ -14564,7 +14564,7 @@ (define gtk-frdp-for-gnome-connections
(revision "1"))
(package
(inherit gtk-frdp)
- (version (git-version "45.90" revision commit))
+ (version (make-git-version "45.90" revision commit))
(source
(origin
(method git-fetch)
@@ -1258,7 +1258,7 @@ (define-public go-google-golang-org-genproto-googleapis-rpc
(revision "0"))
(package
(name "go-google-golang-org-genproto-googleapis-rpc")
- (version (git-version "0.0.0" revision commit))
+ (version (make-git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
@@ -318,7 +318,7 @@ (define-public go-github-com-cheekybits-is
(revision "0"))
(package
(name "go-github-com-cheekybits-is")
- (version (git-version "0.0.0" revision commit))
+ (version (make-git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
@@ -1836,7 +1836,7 @@ (define-public go-github-com-petermattis-goid
(revision "2"))
(package
(name "go-github-com-petermattis-goid")
- (version (git-version "0.0.0" revision commit))
+ (version (make-git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
@@ -306,7 +306,7 @@ (define-public go-github-com-aperturerobotics-jacobsa-crypto
(revision "0"))
(package
(name "go-github-com-aperturerobotics-jacobsa-crypto")
- (version (git-version "1.0.1" revision commit))
+ (version (make-git-version "1.0.1" revision commit))
(source
(origin
(method git-fetch)
@@ -339,7 +339,7 @@ (define-public go-github-com-apparentlymart-go-openvpn-mgmt
(revision "0"))
(package
(name "go-github-com-apparentlymart-go-openvpn-mgmt")
- (version (git-version "0.0.0" revision commit))
+ (version (make-git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
@@ -438,7 +438,7 @@ (define-public go-github-com-btcsuite-btcd-btcec
(revision "0"))
(package
(name "go-github-com-btcsuite-btcd-btcec")
- (version (git-version "0.12.0-beta" revision commit))
+ (version (make-git-version "0.12.0-beta" revision commit))
(source
(origin
(method git-fetch)
@@ -555,7 +555,7 @@ (define-public go-github-com-chmduquesne-rollinghash
(revision "1"))
(package
(name "go-github-com-chmduquesne-rollinghash")
- (version (git-version "4.0.0" revision commit))
+ (version (make-git-version "4.0.0" revision commit))
(source
(origin
(method git-fetch)
@@ -1477,7 +1477,7 @@ (define-public go-github-com-libp2p-go-libp2p-crypto
(revision "0"))
(package
(name "go-github-com-libp2p-go-libp2p-crypto")
- (version (git-version "2.0.1" revision commit))
+ (version (make-git-version "2.0.1" revision commit))
(source
(origin
(method git-fetch)
@@ -1506,7 +1506,7 @@ (define-public go-github-com-libp2p-go-libp2p-peer
(revision "0"))
(package
(name "go-github-com-libp2p-go-libp2p-peer")
- (version (git-version "2.3.8" revision commit))
+ (version (make-git-version "2.3.8" revision commit))
(source
(origin
(method git-fetch)
@@ -1616,7 +1616,7 @@ (define-public go-github-com-minio-blake2b-simd
(revision "0"))
(package
(name "go-github-com-minio-blake2b-simd")
- (version (git-version "0.0.0" revision commit))
+ (version (make-git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
@@ -1913,7 +1913,7 @@ (define-public go-github-com-operatorfoundation-ed25519
(revision "0"))
(package
(name "go-github-com-operatorfoundation-ed25519")
- (version (git-version "0.0.0" revision commit))
+ (version (make-git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
@@ -2273,7 +2273,7 @@ (define-public go-github-com-riobard-go-bloom
(revision "0"))
(package
(name "go-github-com-riobard-go-bloom")
- (version (git-version "0.0.0" revision commit))
+ (version (make-git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
@@ -2770,7 +2770,7 @@ (define-public go-gitlab-com-yawning-edwards25519-extra
(revision "0"))
(package
(name "go-gitlab-com-yawning-edwards25519-extra")
- (version (git-version "0.0.0" revision commit))
+ (version (make-git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
@@ -104,7 +104,7 @@ (define-public go-github-com-git-lfs-pktline
(revision "1"))
(package
(name "go-github-com-git-lfs-pktline")
- (version (git-version "0.0.0" revision commit))
+ (version (make-git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
@@ -183,7 +183,7 @@ (define-public go-0xacab-org-leap-shapeshifter
(revision "12"))
(package
(name "go-0xacab-org-leap-shapeshifter")
- (version (git-version "0.0.0" revision commit))
+ (version (make-git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
@@ -2415,7 +2415,7 @@ (define-public go-github-com-emersion-go-imap-id
(revision "0"))
(package
(name "go-github-com-emersion-go-imap-id")
- (version (git-version "0.0.0" revision commit))
+ (version (make-git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
@@ -2444,7 +2444,7 @@ (define-public go-github-com-emersion-go-imap-idle
(revision "0"))
(package
(name "go-github-com-emersion-go-imap-idle")
- (version (git-version "0.0.0" revision commit))
+ (version (make-git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
@@ -2633,7 +2633,7 @@ (define-public go-github-com-emersion-go-sasl
(revision "1"))
(package
(name "go-github-com-emersion-go-sasl")
- (version (git-version "0.0.0" revision commit))
+ (version (make-git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
@@ -2968,7 +2968,7 @@ (define-public go-github-com-getsentry-raven-go
(revision "0"))
(package
(name "go-github-com-getsentry-raven-go")
- (version (git-version "0.2.0" revision commit))
+ (version (make-git-version "0.2.0" revision commit))
(source
(origin
(method git-fetch)
@@ -4184,7 +4184,7 @@ (define-public go-github-com-gorilla-context
(revision "0"))
(package
(name "go-github-com-gorilla-context")
- (version (git-version "0.0.0" revision commit))
+ (version (make-git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
@@ -9682,7 +9682,7 @@ (define-public go-github-com-tv42-httpunix
(revision "0"))
(package
(name "go-github-com-tv42-httpunix")
- (version (git-version "0.0.0" revision commit))
+ (version (make-git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
@@ -10069,7 +10069,7 @@ (define-public go-github-com-whyrusleeping-json-filter
(revision "0"))
(package
(name "go-github-com-whyrusleeping-json-filter")
- (version (git-version "0.0.0" revision commit))
+ (version (make-git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
@@ -10202,7 +10202,7 @@ (define-public go-github-com-xeipuuv-gojsonpointer
(revision "0"))
(package
(name "go-github-com-xeipuuv-gojsonpointer")
- (version (git-version "0.0.0" revision commit))
+ (version (make-git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
@@ -10227,7 +10227,7 @@ (define-public go-github-com-xeipuuv-gojsonreference
(revision "0"))
(package
(name "go-github-com-xeipuuv-gojsonreference")
- (version (git-version "0.0.0" revision commit))
+ (version (make-git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
@@ -4632,7 +4632,7 @@ (define-public go-github-com-danwakefield-fnmatch
(revision "0"))
(package
(name "go-github-com-danwakefield-fnmatch")
- (version (git-version "0.0.0" revision commit))
+ (version (make-git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
@@ -4821,7 +4821,7 @@ (define-public go-github-com-delthas-go-libnp
(revision "1"))
(package
(name "go-github-com-delthas-go-libnp")
- (version (git-version "0.0.0" revision commit))
+ (version (make-git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
@@ -5623,7 +5623,7 @@ (define-public go-github-com-docopt-docopt-go
(revision "0"))
(package
(name "go-github-com-docopt-docopt-go")
- (version (git-version "0.6.2" revision commit))
+ (version (make-git-version "0.6.2" revision commit))
(source
(origin
(method git-fetch)
@@ -6409,7 +6409,7 @@ (define-public go-github-com-fatih-gomodifytags
(revision "0"))
(package
(name "go-github-com-fatih-gomodifytags")
- (version (git-version "1.17.0" revision commit))
+ (version (make-git-version "1.17.0" revision commit))
(source
(origin
(method git-fetch)
@@ -6516,7 +6516,7 @@ (define-public go-github-com-flynn-archive-go-shlex
(revision "0"))
(package
(name "go-github-com-flynn-archive-go-shlex")
- (version (git-version "0.0.0" revision commit))
+ (version (make-git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
@@ -7481,7 +7481,7 @@ (define-public go-github-com-go-task-slim-sprig
(revision "0"))
(package
(name "go-github-com-go-task-slim-sprig")
- (version (git-version "2.20.0" revision commit))
+ (version (make-git-version "2.20.0" revision commit))
(source
(origin
(method git-fetch)
@@ -8015,7 +8015,7 @@ (define-public go-github-com-google-cadvisor
(revision "0"))
(package
(name "go-github-com-google-cadvisor")
- (version (git-version "0.0.0" revision commit))
+ (version (make-git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
@@ -10633,7 +10633,7 @@ (define-public go-github-com-jpillora-backoff
(revision "1"))
(package
(name "go-github-com-jpillora-backoff")
- (version (git-version "1.0.0" revision commit))
+ (version (make-git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
@@ -10972,7 +10972,7 @@ (define-public go-github-com-kballard-go-shellquote
(revision "1"))
(package
(name "go-github-com-kballard-go-shellquote")
- (version (git-version "0.0.0" revision commit))
+ (version (make-git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
@@ -11514,7 +11514,7 @@ (define-public go-github-com-kr-fs
(revision "0"))
(package
(name "go-github-com-kr-fs")
- (version (git-version "0.1.0" revision commit))
+ (version (make-git-version "0.1.0" revision commit))
(source
(origin
(method git-fetch)
@@ -12260,7 +12260,7 @@ (define-public go-github-com-lyft-protoc-gen-star-v2-next
(package
(inherit go-github-com-lyft-protoc-gen-star-v2)
(name "go-github-com-lyft-protoc-gen-star-v2")
- (version (git-version "2.0.3" revision commit))
+ (version (make-git-version "2.0.3" revision commit))
(source
(origin
(method git-fetch)
@@ -12323,7 +12323,7 @@ (define-public go-github-com-marcinbor85-gohex
(revision "0"))
(package
(name "go-github-com-marcinbor85-gohex")
- (version (git-version "0.0.0" revision commit))
+ (version (make-git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
@@ -12671,7 +12671,7 @@ (define-public go-github-com-junegunn-go-shellwords
(revision "0"))
(hidden-package (package (inherit go-github-com-mattn-go-shellwords)
(name "go-github-com-junegunn-go-shellwords")
- (version (git-version "0.0.0" revision commit))
+ (version (make-git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
@@ -13558,7 +13558,7 @@ (define-public go-github-com-mreiferson-go-svc
(revision "0"))
(package
(name "go-github-com-mreiferson-go-svc")
- (version (git-version "1.2.1" revision commit))
+ (version (make-git-version "1.2.1" revision commit))
(source
(origin
(method git-fetch)
@@ -13826,7 +13826,7 @@ (define-public go-github-com-mufti1-interconv
(revision "0"))
(package
(name "go-github-com-mufti1-interconv")
- (version (git-version "0.0.0" revision commit))
+ (version (make-git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
@@ -15156,7 +15156,7 @@ (define-public go-github-com-pbnjay-memory
(revision "2"))
(package
(name "go-github-com-pbnjay-memory")
- (version (git-version "0.0.0" revision commit))
+ (version (make-git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
@@ -15889,7 +15889,7 @@ (define-public go-github-com-reiver-go-porterstemmer
(revision "0"))
(package
(name "go-github-com-reiver-go-porterstemmer")
- (version (git-version "1.0.1" revision commit))
+ (version (make-git-version "1.0.1" revision commit))
(source
(origin
(method git-fetch)
@@ -16319,7 +16319,7 @@ (define-public go-github-com-rwcarlsen-goexif
(revision "0"))
(package
(name "go-github-com-rwcarlsen-goexif")
- (version (git-version "0.0.0" revision commit))
+ (version (make-git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
@@ -18791,7 +18791,7 @@ (define-public go-github-com-vitrun-qart
(revision "0"))
(package
(name "go-github-com-vitrun-qart")
- (version (git-version "0.0.0" revision commit))
+ (version (make-git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
@@ -19270,7 +19270,7 @@ (define-public go-github-com-xaionaro-gosrc
(revision "0"))
(package
(name "go-github-com-xaionaro-gosrc")
- (version (git-version "0.0.0" revision commit))
+ (version (make-git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
@@ -19506,7 +19506,7 @@ (define-public go-github-com-yookoala-realpath
(revision "0"))
(package
(name "go-github-com-yookoala-realpath")
- (version (git-version "0.0.0" revision commit))
+ (version (make-git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
@@ -19534,7 +19534,7 @@ (define-public go-github-com-yosuke-furukawa-json5
(revision "0"))
(package
(name "go-github-com-yosuke-furukawa-json5")
- (version (git-version "0.1.1" revision commit))
+ (version (make-git-version "0.1.1" revision commit))
(source
(origin
(method git-fetch)
@@ -20058,7 +20058,7 @@ (define-public go-gitlab-com-ambrevar-damerau
(revision "0"))
(package
(name "go-gitlab-com-ambrevar-damerau")
- (version (git-version "0.0.0" revision commit))
+ (version (make-git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
@@ -20836,7 +20836,7 @@ (define-public go-go4-org
(revision "0"))
(package
(name "go-go4-org")
- (version (git-version "0.0.0" revision commit))
+ (version (make-git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
@@ -20944,7 +20944,7 @@ (define-public go-golang-org-rainycape-unidecode
(revision "1"))
(package
(name "go-golang-org-rainycape-unidecode")
- (version (git-version "0.0.0" revision commit))
+ (version (make-git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
@@ -21305,7 +21305,7 @@ (define-public go-gvisor-dev-gvisor
(revision "0"))
(package
(name "go-gvisor-dev-gvisor")
- (version (git-version "0.0.0" revision commit))
+ (version (make-git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
@@ -217,7 +217,7 @@ (define-public castget
(commit "da9727de1b9e4e636be21bf07c73eb41f5d8439b"))
(package
(name "castget")
- (version (git-version "2.0.0" revision commit))
+ (version (make-git-version "2.0.0" revision commit))
(source
(origin
(method git-fetch)
@@ -281,7 +281,7 @@ (define-public minifb
(revision "1"))
(package
(name "minifb")
- (version (git-version "0" revision commit))
+ (version (make-git-version "0" revision commit))
(source (origin
(method git-fetch)
(uri
@@ -822,7 +822,7 @@ (define-public mikktspace
(revision "0"))
(package
(name "mikktspace")
- (version (git-version "0.0.0" revision commit))
+ (version (make-git-version "0.0.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1018,7 +1018,7 @@ (define-public geomcpp
(revision "0"))
(package
(name "geomcpp")
- (version (git-version "0.0.0" revision commit))
+ (version (make-git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
@@ -1850,7 +1850,7 @@ (define-public openmw-openscenegraph
(hidden-package
(package
(inherit openscenegraph)
- (version (git-version "3.6" "3" commit))
+ (version (make-git-version "3.6" "3" commit))
(outputs (list "out"))
(source
(origin
@@ -2095,7 +2095,7 @@ (define-public facedetect
(revision "0"))
(package
(name "facedetect")
- (version (git-version "0.1" revision commit))
+ (version (make-git-version "0.1" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -2110,7 +2110,8 @@ (define-public facedetect
#:install-plan
#~`(("facedetect" "bin/facedetect")
("README.rst" ,(string-append "share/doc/" #$name
- "-" #$version "/README.rst")))
+ "-" #$(package-version this-package)
+ "/README.rst")))
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'configure
@@ -2381,7 +2382,7 @@ (define-public skia
(commit "6d0b93856303fcf3021a8b40654d7739fda4dfb0"))
(package
(name "skia")
- (version (git-version version revision commit))
+ (version (make-git-version version revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -2462,7 +2463,7 @@ (define skia.pc (string-append #$output
URL: https://skia.org/
Version: ~a
Libs: -L${libdir} -lskia
-Cflags: -I${includedir}~%" #$output #$version)))))
+Cflags: -I${includedir}~%" #$output #$(package-version this-package))))))
(replace 'check
(lambda* (#:key tests? inputs native-inputs #:allow-other-keys)
(if tests?
@@ -2624,7 +2625,7 @@ (define-public skia-for-friction
(package
(inherit skia)
(name "skia")
- (version (git-version version revision commit))
+ (version (make-git-version version revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -2976,7 +2977,7 @@ (define-public discregrid
(revision "0"))
(package
(name "discregrid")
- (version (git-version "0.0.0" revision commit))
+ (version (make-git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
@@ -3152,7 +3153,7 @@ (define-public nanosvg
(revision "0"))
(package
(name "nanosvg")
- (version (git-version "0.0.0" revision commit))
+ (version (make-git-version "0.0.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -3184,7 +3185,7 @@ (define-public asli
(revision "1"))
(package
(name "asli")
- (version (git-version "0.1" revision commit))
+ (version (make-git-version "0.1" revision commit))
(source
(origin
(method git-fetch)
@@ -3244,7 +3245,9 @@ (define-public asli
;; menukeys.
(install-file "docs/ASLI [User Manual].pdf"
(string-append #$output "/share/doc/"
- #$name "-" #$version))))))))
+ #$name "-"
+ #$(package-version
+ this-package)))))))))
(home-page "http://www.biomech.ulg.ac.be/ASLI/")
(synopsis "Create lattice infills with varying unit cell type, size and feature")
(description "ASLI (A Simple Lattice Infiller) is a command-line tool that
@@ -176,7 +176,7 @@ (define-public ccextractor
(revision "0"))
(package
(name "ccextractor")
- (version (git-version "0.94" revision commit))
+ (version (make-git-version "0.94" revision commit))
(source
(origin
(method git-fetch)
@@ -1501,7 +1501,7 @@ (define-public guile-cairo-next
(package
(inherit guile-cairo)
(name "guile-cairo-next")
- (version (git-version "1.11.2" revision commit))
+ (version (make-git-version "1.11.2" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -40,7 +40,7 @@ (define-public guile-xcb
(revision "1"))
(package
(name "guile-xcb")
- (version (git-version "1.3" revision commit))
+ (version (make-git-version "1.3" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -77,7 +77,7 @@ (define-public guile-wm
(revision "1"))
(package
(name "guile-wm")
- (version (git-version "1.0" revision commit))
+ (version (make-git-version "1.0" revision commit))
(synopsis "X11 window manager toolkit in Scheme")
(source (origin
(method git-fetch)
@@ -357,7 +357,7 @@ (define-public guile-openai
(revision "1"))
(package
(name "guile-openai")
- (version (git-version "0.2" revision commit))
+ (version (make-git-version "0.2" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -390,7 +390,7 @@ (define-public guile-pipe
(revision "0"))
(package
(name "guile-pipe")
- (version (git-version "0.0.0" revision commit))
+ (version (make-git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
@@ -416,7 +416,7 @@ (define-public guile-pubstrate
(revision "1"))
(package
(name "guile-pubstrate")
- (version (git-version "0.1.dev" revision commit))
+ (version (make-git-version "0.1.dev" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -600,7 +600,7 @@ (define-public guile-avatar
(revision "0"))
(package
(name "guile-avatar")
- (version (git-version "0.0" revision commit))
+ (version (make-git-version "0.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -708,7 +708,7 @@ (define-public guile-8sync
(let ((commit "183b4f02e68279d4984e79b79e06bfcf1861fcbf") (revision "0"))
(package
(name "guile-8sync")
- (version (git-version "0.4.2" revision commit))
+ (version (make-git-version "0.4.2" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -737,7 +737,7 @@ (define guile-8sync-for-pubstrate
(package
(inherit guile-8sync)
(name "guile-8sync-for-pubstrate")
- (version (git-version "0.4.2" revision commit))
+ (version (make-git-version "0.4.2" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1248,7 +1248,7 @@ (define-public guile-fibers-next
(package
(inherit guile-fibers)
(name "guile-fibers-next")
- (version (git-version "1.3.1"
+ (version (make-git-version "1.3.1"
revision
commit))
(source (origin
@@ -1354,7 +1354,7 @@ (define-public guile-taglib
(revision "0"))
(package
(name "guile-taglib")
- (version (git-version version revision commit))
+ (version (make-git-version version revision commit))
(home-page "https://github.com/sbarbit/guile-taglib")
(source
(origin
@@ -1527,7 +1527,7 @@ (define-public guile-ares-rs
(revision "0"))
(package
(name "guile-ares-rs")
- (version (git-version "0.9.5" revision commit))
+ (version (make-git-version "0.9.5" revision commit))
(source
(origin
(method git-fetch)
@@ -1788,7 +1788,7 @@ (define-public guile-prometheus
(revision "7"))
(package
(name "guile-prometheus")
- (version (git-version "0" revision commit))
+ (version (make-git-version "0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1903,7 +1903,7 @@ (define-public guile-aws
(revision "1"))
(package
(name "guile-aws")
- (version (git-version "0.1.0" revision commit))
+ (version (make-git-version "0.1.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1979,7 +1979,7 @@ (define-public guile-simple-zmq
(revision "11"))
(package
(name "guile-simple-zmq")
- (version (git-version "0.0.0" revision commit))
+ (version (make-git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
@@ -2015,7 +2015,7 @@ (define-public jupyter-guile-kernel
(revision "2"))
(package
(name "jupyter-guile-kernel")
- (version (git-version "0.0.0" revision commit))
+ (version (make-git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
@@ -2188,7 +2188,7 @@ (define-public guile-newra
(revision "0"))
(package
(name "guile-newra")
- (version (git-version "0" revision commit))
+ (version (make-git-version "0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -2254,7 +2254,7 @@ (define-public guile-mastodon
(revision "1"))
(package
(name "guile-mastodon")
- (version (git-version "0.0.1" revision commit))
+ (version (make-git-version "0.0.1" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -2547,7 +2547,7 @@ (define-public guile-lmdb
(revision "2"))
(package
(name "guile-lmdb")
- (version (git-version "0.0.1" revision commit))
+ (version (make-git-version "0.0.1" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -2631,7 +2631,7 @@ (define-public guile-hall
(revision "1"))
(package
(name "guile-hall")
- (version (git-version "0.4.1" revision commit))
+ (version (make-git-version "0.4.1" revision commit))
(source
(origin
(method git-fetch)
@@ -2753,7 +2753,7 @@ (define-public guile-imanifest
(revision "0"))
(package
(name "guile-imanifest")
- (version (git-version "0.0.0" revision commit))
+ (version (make-git-version "0.0.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -3470,7 +3470,7 @@ (define-public guile-raw-strings
(revision "0"))
(package
(name "guile-raw-strings")
- (version (git-version "0.0.0" revision commit))
+ (version (make-git-version "0.0.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -3670,7 +3670,7 @@ (define-public guile-simple-iterators
(revision "0"))
(package
(name "guile-simple-iterators")
- (version (git-version "0.0.0" revision commit))
+ (version (make-git-version "0.0.0" revision commit))
(source
(origin
(method git-fetch)
@@ -4139,7 +4139,7 @@ (define-public guile-picture-language
(revision "5"))
(package
(name "guile-picture-language")
- (version (git-version "0.0.1" revision commit))
+ (version (make-git-version "0.0.1" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -4178,7 +4178,7 @@ (define-public guile-studio
(revision "1"))
(package
(name "guile-studio")
- (version (git-version "0.1.1" revision commit))
+ (version (make-git-version "0.1.1" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -4565,7 +4565,7 @@ (define-public guile-srfi-125
(commit "556827a4b88b43acc0b941ac3f7f926ffad27e42"))
(package
(name "guile-srfi-125")
- (version (git-version "0.0.1" revision commit))
+ (version (make-git-version "0.0.1" revision commit))
(source
(origin
(method git-fetch)
@@ -4617,7 +4617,7 @@ (define-public guile-srfi-126
(commit "f480cf2d1a33c1f3d0fab3baf321c0ed5b5eb248"))
(package
(name "guile-srfi-126")
- (version (git-version "0.0.1" revision commit))
+ (version (make-git-version "0.0.1" revision commit))
(source
(origin
(method git-fetch)
@@ -4841,7 +4841,7 @@ (define-public guile-srfi-158
(revision "0"))
(package
(name "guile-srfi-158")
- (version (git-version "0.0.1" revision commit))
+ (version (make-git-version "0.0.1" revision commit))
(source
(origin
(method git-fetch)
@@ -4870,7 +4870,7 @@ (define-public guile-srfi-159
(revision "0"))
(package
(name "guile-srfi-159")
- (version (git-version "0" revision commit))
+ (version (make-git-version "0" revision commit))
(home-page "https://bitbucket.org/bjoli/guile-srfi-159")
(source (origin
(method hg-fetch)
@@ -4900,7 +4900,7 @@ (define-public guile-srfi-180
(revision "0"))
(package
(name "guile-srfi-180")
- (version (git-version "0" revision commit))
+ (version (make-git-version "0" revision commit))
(source
(origin
(method git-fetch)
@@ -4940,7 +4940,7 @@ (define-public guile-srfi-189
(package
(name "guile-srfi-189")
;; 'final' is the name of the latest git tag.
- (version (git-version "final" revision commit))
+ (version (make-git-version "final" revision commit))
(source
(origin
(method git-fetch)
@@ -4982,7 +4982,7 @@ (define-public guile-srfi-197
(revision "0"))
(package
(name "guile-srfi-197")
- (version (git-version "0" revision commit))
+ (version (make-git-version "0" revision commit))
(source
(origin
(method git-fetch)
@@ -5089,7 +5089,7 @@ (define-public guile-srfi-234
(commit "2c7c3df13035ef12890fc532abf61dce8f497fcd"))
(package
(name "guile-srfi-234")
- (version (git-version version revision commit))
+ (version (make-git-version version revision commit))
(source
(origin
(method git-fetch)
@@ -5127,7 +5127,7 @@ (define-public guile-srfi-235
(commit "643a44aa9d6872962257995ecb0a31eb06a71d88"))
(package
(name "guile-srfi-235")
- (version (git-version version revision commit))
+ (version (make-git-version version revision commit))
(source
(origin
(method git-fetch)
@@ -5299,7 +5299,7 @@ (define-public guile-jpeg
(revision "0"))
(package
(name "guile-jpeg")
- (version (git-version "0.0" revision commit))
+ (version (make-git-version "0.0" revision commit))
(home-page "https://gitlab.com/wingo/guile-jpeg")
(source (origin
(method git-fetch)
@@ -5603,7 +5603,7 @@ (define-public guile-ffi-cblas
(revision "0"))
(package
(name "guile-ffi-cblas")
- (version (git-version "0.0.0" revision commit))
+ (version (make-git-version "0.0.0" revision commit))
(home-page "https://github.com/lloda/guile-ffi-cblas")
(source (origin
(method git-fetch)
@@ -5647,7 +5647,7 @@ (define-public guile-gsl
(revision "2"))
(package
(name "guile-gsl")
- (version (git-version "0.0.1" revision commit))
+ (version (make-git-version "0.0.1" revision commit))
(source
(origin
(method git-fetch)
@@ -5693,7 +5693,7 @@ (define-public guile-ffi-fftw
(revision "2"))
(package
(name "guile-ffi-fftw")
- (version (git-version "0" revision commit))
+ (version (make-git-version "0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -6034,7 +6034,7 @@ (define-public guile-webutils
(revision "1"))
(package
(name "guile-webutils")
- (version (git-version "0.1" revision commit))
+ (version (make-git-version "0.1" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -6116,7 +6116,7 @@ (define-public guile-lens
(revision "0"))
(package
(name "guile-lens")
- (version (git-version "0.1" revision commit))
+ (version (make-git-version "0.1" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -6287,7 +6287,7 @@ (define-public guile-irc
(revision "1"))
(package
(name "guile-irc")
- (version (git-version "0.3.0" revision commit))
+ (version (make-git-version "0.3.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -6738,7 +6738,7 @@ (define-public guile-rsv
(revision "1"))
(package
(name "guile-rsv")
- (version (git-version "0.2.0" revision commit))
+ (version (make-git-version "0.2.0" revision commit))
(home-page "https://codeberg.org/kakafarm/guile-rsv/")
(source
(origin
@@ -6931,7 +6931,7 @@ (define-public schmutz
(revision "2"))
(package
(name "schmutz")
- (version (git-version "0" revision commit))
+ (version (make-git-version "0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -7334,7 +7334,7 @@ (define-public guile-schemetran
(revision "1"))
(package
(name "guile-schemetran")
- (version (git-version "0" revision commit))
+ (version (make-git-version "0" revision commit))
(source
(origin
(method git-fetch)
@@ -7364,7 +7364,7 @@ (define-public guile-knots
(revision "23"))
(package
(name "guile-knots")
- (version (git-version "0" revision commit))
+ (version (make-git-version "0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -7447,7 +7447,7 @@ (define-public lokke
(revision "1"))
(package
(name "lokke")
- (version (git-version "0.0.0" revision commit))
+ (version (make-git-version "0.0.0" revision commit))
(home-page "https://github.com/lokke-org/lokke")
(source (origin
(method git-fetch)
@@ -495,7 +495,7 @@ (define-public guile-next
(package
(inherit guile-3.0)
(name "guile-next")
- (version (git-version version revision commit))
+ (version (make-git-version version revision commit))
(source (origin
;; The main goal here is to allow for '--with-branch'.
(method git-fetch)
@@ -519,7 +519,7 @@ (define-public guile-next
;; wouldn't give us a valid version string.
(call-with-output-file ".tarball-version"
(lambda (port)
- (display #$version port)))))
+ (display #$(package-version this-package) port)))))
#$@(if (target-hurd?)
#~((delete 'patch-posix-spawn-usage))
#~())))))
@@ -625,7 +625,7 @@ (define-public guile-for-guile-emacs
(revision "2"))
(package (inherit guile-next)
(name "guile-for-guile-emacs")
- (version (git-version "3.0.7-81" revision commit))
+ (version (make-git-version "3.0.7-81" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference