Skip to content
New issue

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

#

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

Already on GitHub? # to your account

ocaml: fix setup for ocaml 4.14.1 #639

Merged
merged 2 commits into from
May 5, 2023
Merged

ocaml: fix setup for ocaml 4.14.1 #639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c3a466
upstream: Remove old ocamlformat and odoc-parser
psafont Apr 24, 2023
0af2696
ocaml: Use correct file contents in ocaml-system.4.14.1
psafont May 5, 2023
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
2 changes: 0 additions & 2 deletions .github/duplicates-upstream-extra.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,4 @@ ocaml-system
merlin
merlin-dot-reader
ocaml-lsp-server
ocamlformat
ocamlformat-rpc-lib
odoc-parser
2 changes: 0 additions & 2 deletions .github/duplicates-xs-toolstack.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
ocaml
ocaml-base-compiler
ocaml-system
ocamlformat
odoc-parser
2 changes: 1 addition & 1 deletion packages/ocaml/ocaml-system.4.14.1/files/gen_ocaml_config.ml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@ let () =
file-depends: [ [ %%S %%S ] [ %%S %%S ] ]\n\
variables { path: %%S }\n"
ocamlc ocamlc_digest graphics graphics_digest (Filename.dirname ocamlc);
close_out oc
close_out oc
59 changes: 0 additions & 59 deletions packages/upstream/ocamlformat.0.19.0/opam
View file
Open in desktop

This file was deleted.

36 changes: 0 additions & 36 deletions packages/upstream/odoc-parser.0.9.0/opam
View file
Open in desktop

This file was deleted.