summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorJason Conroy <jconroy@tscripta.net>2026-07-10 10:32:42 -0400
committerJulien Lepiller <julien@lepiller.eu>2026-07-12 08:11:03 +0200
commit8b8d30f0bde8387f9978c91df3f033ea899a29c2 (patch)
tree8761022e2a47a9a97946e30d4e9adc86d621282f /gnu
parent4e79deb2bfa474336f471ccf14540640b377a9b9 (diff)
gnu: ocaml5: Factor out common opam version string.ocaml-team
* gnu/packages/ocaml5.scm (%opam-version): New variable. (ocaml-opam-core, opam-installer): Use %opam-version instead of string for version. Change-Id: Id5846a8c61dd94553a2adaf17a478f68515ef28e Signed-off-by: Julien Lepiller <julien@lepiller.eu>
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/ocaml5.scm7
1 files changed, 5 insertions, 2 deletions
diff --git a/gnu/packages/ocaml5.scm b/gnu/packages/ocaml5.scm
index 7cfb05c5feb..6bc8deeb47a 100644
--- a/gnu/packages/ocaml5.scm
+++ b/gnu/packages/ocaml5.scm
@@ -3427,10 +3427,13 @@ https://spdx.github.io/spdx-spec/v2.3/SPDX-license-expressions/
3427See https://spdx.org/licenses/ for more details.") 3427See https://spdx.org/licenses/ for more details.")
3428 (license license:expat))) 3428 (license license:expat)))
3429 3429
3430;; Version shared by the ocaml-opam-core and opam-installer packages.
3431(define %opam-version "2.5.2")
3432
3430(define ocaml-opam-core 3433(define ocaml-opam-core
3431 (package 3434 (package
3432 (name "ocaml5-opam-core") 3435 (name "ocaml5-opam-core")
3433 (version "2.5.2") 3436 (version %opam-version)
3434 (source 3437 (source
3435 (origin 3438 (origin
3436 (method git-fetch) 3439 (method git-fetch)
@@ -3487,7 +3490,7 @@ Git-friendly development workflow.")
3487(define-public opam-installer 3490(define-public opam-installer
3488 (package 3491 (package
3489 (name "ocaml5-opam-installer") 3492 (name "ocaml5-opam-installer")
3490 (version "2.5.2") 3493 (version %opam-version)
3491 ;; opam has some library dependencies that in turn depend on 3494 ;; opam has some library dependencies that in turn depend on
3492 ;; opam-installer (https://codeberg.org/guix/guix/issues/3588). To break 3495 ;; opam-installer (https://codeberg.org/guix/guix/issues/3588). To break
3493 ;; the cycle, we build opam-installer from a version of the release that 3496 ;; the cycle, we build opam-installer from a version of the release that