guix, branch ocaml-team

gnu: ocaml5: Factor out common opam version string.

2026-07-12T06:11:03+00:00

* 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

gnu: ocaml5: Update ocaml-opam-core to 2.5.2. [security-fixes]

2026-07-12T06:10:54+00:00

Fixes CVE-2026-57825.

* gnu/packages/ocaml5.scm (ocaml-opam-core): Update to 2.5.2.

Change-Id: Ia56d246bd75853c32e70dd55815333fb04a6ee9f
Signed-off-by: Julien Lepiller

gnu: ocaml5: Update opam-installer to 2.5.2. [security-fixes]

2026-07-12T06:10:22+00:00

Fixes CVE-2026-57825.

* gnu/packages/ocaml5.scm (opam-installer): Update to 2.5.2.

Change-Id: I21031e72fbe54b3a6755a26e960127fff903cc79
Signed-off-by: Julien Lepiller

gnu: ocaml5: ocaml-5.3: Delete variable.

2026-05-17T16:45:38+00:00

* gnu/packages/ocaml5.scm (ocaml-5.3): Delete variable.

Change-Id: Id78b07917692518e1afd48041b69871ecbae58c2
Signed-off-by: Julien Lepiller

gnu: ocaml5: Update default compiler to 5.4.1 and update dependees broken by change. [security-fixes]

2026-05-17T16:45:26+00:00

* gnu/packages/ocaml5.scm (ocaml): Update alias to ocaml-5.4.
(%dune-base): Update to 3.22.2.
(ocaml-dune-fs-io, ocaml-dune-top-closure): New variables.
(ocaml-stdune, ocaml-dune-rpc): Update dune dependencies.
(%ocaml-odoc-base): Update to 3.2.1.
(%ocaml-merlin-base): Update to 5.7.1-504.
(%ocaml-lsp-base): Update to 1.26.0.
* guix/build-system/ocaml.scm (default-ocaml5.3): Change prefix to `ocaml5.4`
and update alias to point at ocaml-5.4.
(default-ocaml5): Update alias to point at default-ocaml5.4.

Co-authored-by: Nox 

Change-Id: I279d9fe8e748c69f115d0547bce9ac721bac684d
Signed-off-by: Julien Lepiller

gnu: ocaml5: Update most ocaml5.3 package prefixes to ocaml5.4.

2026-05-17T16:45:10+00:00

This is a non-functional change; switching to the 5.4 compiler happens in the
next commit.

* gnu/packages/ocaml5.scm (ocaml5.3-dune-bootstrap)
(ocaml5.3-dune-configurator, ocaml5.3-dune, ocaml5.3-findlib): Rename variable
with `ocaml5.4` prefix.
* guix/build-system/ocaml.scm: (strip-ocaml5.3-variant)
(default-ocaml5.3-findlib, default-ocaml5.3-dune): Rename variable with
`ocaml5.4` prefix.
(package-with-ocaml5.3): Rename variable with `ocaml5.4` prefix. Search for `ocaml5.4`
package variant.

Change-Id: I39b5138001f09d40046b4d2d52e4570b5a6ca0a1
Signed-off-by: Julien Lepiller

gnu: ocaml5: ocaml5.3-findlib: Use default ocaml package.

2026-05-17T16:45:08+00:00

* gnu/packages/ocaml5.scm (ocaml5.3-findlib)[native-inputs]: Use ocaml
instead of ocaml-5.4.

Change-Id: Id0b4f12faa34d897c9d4452c5b4b434c1c09a4fb
Signed-off-by: Julien Lepiller

gnu: ocaml5: Update %ocaml-ocamlformat-base for Dune 3.22.

2026-05-17T16:45:06+00:00

* gnu/packages/ocaml.scm (%ocaml-ocamlformat-base): Pin to version compatible
with Dune 3.22.

Change-Id: Ic2a605d3ec7552b95e5b0128786c45ea7ac442a8
Signed-off-by: Julien Lepiller

gnu: ocaml: Remove ocaml5.0-lsp-server.

2026-05-17T16:45:04+00:00

* gnu/packages/ocaml.scm (ocaml5.0-lsp-server): Delete variable.

Change-Id: I2601f97102f1fb6ede5f259cc8c9740e40cae474
Signed-off-by: Julien Lepiller

gnu: ocaml: Remove ocaml5.0-merlin.

2026-05-17T16:45:03+00:00

* gnu/packages/ocaml.scm (ocaml5.0-merlin): Delete variable.

Change-Id: I58825c4b2de3dc831397c48c6514d9197989203e
Signed-off-by: Julien Lepiller