Skip to content

vendored-omp: use ocamlformat instead of ocp-indent #2933

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anmonteiro merged 1 commit into from
Aug 3, 2026
Merged

vendored-omp: use ocamlformat instead of ocp-indent #2933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion nix/shell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ mkShell {
inputsFrom = [ reason ];
nativeBuildInputs = with ocamlPackages; [
cinaps
ocp-indent
utop
merlin
# odoc
Expand Down
2 changes: 1 addition & 1 deletion src/vendored-omp/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ The library is distributed under LGPL 2.1 and is copyright INRIA.
## Adding a new OCaml version

We use [Cinaps](https://github.com/janestreet/cinaps) to generate boilerplate.
You can install it via opam: `opam install cinaps ocp-indent`.
You can install it via opam: `opam install cinaps ocamlformat`.

Add the new version in
[src/cinaps_helpers.ml](src/cinaps_helpers.ml)
Expand Down
12 changes: 8 additions & 4 deletions src/vendored-omp/src/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,11 @@
(action
(progn
(echo
"let () = let current = ref 0 in Arg.parse_argv ~current [| Sys.argv.(0); \"-styler\"; \"ocp-indent\" |] (Arg.align Cinaps_runtime.args) ignore \"\"\n")
"let () = let current = ref 0 in Arg.parse_argv ~current [| Sys.argv.(0); \"-styler\"; \"ocamlformat --doc-comments=before --name %i\" |] (Arg.align Cinaps_runtime.args) ignore \"\"\n")
(cat %{input-file}))))
(runtime_deps %{bin:ocp-indent}))
(runtime_deps
%{bin:ocamlformat}
../../../.ocamlformat))

(cinaps
(alias cinaps)
Expand All @@ -62,6 +64,8 @@
(action
(progn
(echo
"let () = let current = ref 0 in Arg.parse_argv ~current [| Sys.argv.(0); \"-styler\"; \"ocp-indent\" |] (Arg.align Cinaps_runtime.args) ignore \"\"\n")
"let () = let current = ref 0 in Arg.parse_argv ~current [| Sys.argv.(0); \"-styler\"; \"ocamlformat --doc-comments=before --name %i\" |] (Arg.align Cinaps_runtime.args) ignore \"\"\n")
(cat %{input-file}))))
(runtime_deps %{bin:ocp-indent}))
(runtime_deps
%{bin:ocamlformat}
../../../.ocamlformat))
Loading
Loading