Skip to content

[Backport release-26.05] hol_light: build against the default OCaml (5.4)#526837

Merged
vbgl merged 2 commits into
release-26.05from
backport-525966-to-release-26.05
Jun 1, 2026
Merged

[Backport release-26.05] hol_light: build against the default OCaml (5.4)#526837
vbgl merged 2 commits into
release-26.05from
backport-525966-to-release-26.05

Conversation

@nixpkgs-ci
Copy link
Copy Markdown
Contributor

@nixpkgs-ci nixpkgs-ci Bot commented Jun 1, 2026

Bot-based backport to release-26.05, triggered by a label in #525966.

Before merging, ensure that this backport is acceptable for the release.

Even as a non-committer, if you find that it is not acceptable, leave a comment.

Tip

If you maintain all packages touched by this pull request, and they are all located under pkgs/by-name/*, you can comment @NixOS/nixpkgs-merge-bot merge to automatically merge this PR using the nixpkgs-merge-bot.

camlp5's META requires pcre2 and fmt, but they were only buildInputs, so
findlib consumers of camlp5 could not resolve them. Move them to
propagatedBuildInputs.

(cherry picked from commit 74a82cc)
Build against the default OCaml (5.4) set instead of the 5.3 pin, using the
module-mode launcher (ocaml-hol). Carries a patch so the pa_j chooser
accepts camlp5 8.05, links findlib into ocaml-hol, and sets up the runtime
OCAMLPATH/CAML_LD_LIBRARY_PATH. Drops the camlp5 8.03.2 downgrade.

(cherry picked from commit 7579aa2)
@nixpkgs-ci nixpkgs-ci Bot requested a review from mkannwischer June 1, 2026 19:09
@nixpkgs-ci nixpkgs-ci Bot requested review from thoughtpolice and vbgl June 1, 2026 19:15
@nixpkgs-ci nixpkgs-ci Bot added 8.has: package (update) This PR updates a package to a newer version 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 6.topic: ocaml OCaml is a general-purpose, high-level, multi-paradigm programming language. 4.workflow: backport This targets a stable branch labels Jun 1, 2026
@vbgl vbgl added this pull request to the merge queue Jun 1, 2026
Merged via the queue into release-26.05 with commit 43c2b85 Jun 1, 2026
31 checks passed
@vbgl vbgl deleted the backport-525966-to-release-26.05 branch June 1, 2026 20:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4.workflow: backport This targets a stable branch 6.topic: ocaml OCaml is a general-purpose, high-level, multi-paradigm programming language. 8.has: package (update) This PR updates a package to a newer version 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants