Skip to content

Commit

Permalink
add 5.1 submodule and opam constraints
Browse files Browse the repository at this point in the history
  • Loading branch information
anmonteiro committed May 21, 2024
1 parent e077caf commit 3a953fa
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 22 deletions.
4 changes: 3 additions & 1 deletion dune-project
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@
(synopsis "Toolchain to produce JS from Reason/OCaml")
(depends
(ocaml
(>= "5.2"))
(and
(>= "5.1")
(< "5.2")))
(cmdliner
(>= "1.1.0"))
dune-build-info
Expand Down
7 changes: 4 additions & 3 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
melange-compiler-libs = {
# this changes rarely, and it's better than having to rely on nix's poor
# support for submodules
url = "github:melange-re/melange-compiler-libs";
url = "github:melange-re/melange-compiler-libs/5.1";
inputs.flake-utils.follows = "flake-utils";
inputs.nixpkgs.follows = "nixpkgs";
};
Expand All @@ -26,7 +26,7 @@
} // (flake-utils.lib.eachDefaultSystem (system:
let
pkgs = nixpkgs.legacyPackages."${system}".extend (self: super: {
ocamlPackages = super.ocaml-ng.ocamlPackages_5_2;
ocamlPackages = super.ocaml-ng.ocamlPackages_5_1;
});

packages =
Expand Down
9 changes: 1 addition & 8 deletions melange.opam
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ homepage: "https://github.com/melange-re/melange"
bug-reports: "https://github.com/melange-re/melange/issues"
depends: [
"dune" {>= "3.13"}
"ocaml" {>= "5.2"}
"ocaml" {>= "5.1" & < "5.2"}
"cmdliner" {>= "1.1.0"}
"dune-build-info"
"cppo" {build}
Expand All @@ -35,10 +35,3 @@ build: [
]
]
dev-repo: "git+https://github.com/melange-re/melange.git"
pin-depends: [
[ "merlin-lib.dev" "https://github.com/ocaml/merlin/releases/download/4.14-502_preview2/merlin-4.14-502.preview2.tbz" ]
[ "merlin.dev" "https://github.com/ocaml/merlin/releases/download/4.14-502_preview2/merlin-4.14-502.preview2.tbz" ]
[ "dot-merlin-reader.dev" "https://github.com/ocaml/merlin/releases/download/4.14-502_preview2/merlin-4.14-502.preview2.tbz" ]
[ "reason-react-ppx.dev" "git+https://github.com/reasonml/reason-react.git#anmonteiro/melange-4" ]
[ "reason-react.dev" "git+https://github.com/reasonml/reason-react.git#anmonteiro/melange-4" ]
]
7 changes: 0 additions & 7 deletions melange.opam.template

This file was deleted.

2 changes: 1 addition & 1 deletion vendor/melange-compiler-libs
Submodule melange-compiler-libs updated 97 files
+3 −4 file_formats/cmi_format.ml
+17 −302 file_formats/cmt_format.ml
+6 −5 file_formats/cmt_format.mli
+25 −77 lambda/lambda.ml
+3 −34 lambda/lambda.mli
+183 −355 lambda/matching.ml
+0 −16 lambda/matching.mli
+20 −25 lambda/printlambda.ml
+35 −62 lambda/tmc.ml
+182 −112 lambda/translattribute.ml
+17 −7 lambda/translattribute.mli
+35 −60 lambda/translclass.ml
+1 −2 lambda/translclass.mli
+214 −231 lambda/translcore.ml
+50 −31 lambda/translmod.ml
+3 −7 lambda/translobj.ml
+0 −1 lambda/translobj.mli
+267 −6 lambda/translprim.ml
+0 −794 lambda/value_rec_compiler.ml
+0 −18 lambda/value_rec_compiler.mli
+1 −4 lib/melange_compiler_libs.ml
+0 −210 parsing/ast_invariants.ml
+87 −186 parsing/builtin_attributes.ml
+14 −117 parsing/builtin_attributes.mli
+66 −32 parsing/location.ml
+0 −122 parsing/unit_info.ml
+0 −159 parsing/unit_info.mli
+1 −9 typing/btype.ml
+1 −5 typing/btype.mli
+2 −8 typing/cmt2annot.ml
+401 −468 typing/ctype.ml
+10 −23 typing/ctype.mli
+2 −2 typing/datarepr.ml
+84 −109 typing/env.ml
+11 −12 typing/env.mli
+2 −4 typing/envaux.ml
+5 −7 typing/includeclass.ml
+37 −54 typing/includecore.ml
+4 −10 typing/includemod.ml
+1 −7 typing/includemod.mli
+34 −71 typing/includemod_errorprinter.ml
+3 −3 typing/mtype.ml
+40 −63 typing/oprint.ml
+28 −53 typing/parmatch.ml
+3 −23 typing/parmatch.mli
+9 −9 typing/patterns.ml
+2 −2 typing/patterns.mli
+34 −55 typing/persistent_env.ml
+6 −7 typing/persistent_env.mli
+3 −3 typing/predef.ml
+18 −24 typing/primitive.ml
+1 −1 typing/primitive.mli
+22 −16 typing/printpat.ml
+4 −4 typing/printpat.mli
+81 −180 typing/printtyp.ml
+18 −60 typing/printtyped.ml
+54 −206 typing/rec_check.ml
+3 −4 typing/rec_check.mli
+265 −84 typing/shape.ml
+28 −72 typing/shape.mli
+0 −342 typing/shape_reduce.ml
+0 −62 typing/shape_reduce.mli
+3 −1 typing/signature_group.mli
+3 −64 typing/subst.ml
+5 −0 typing/subst.mli
+18 −63 typing/tast_iterator.ml
+0 −1 typing/tast_iterator.mli
+14 −49 typing/tast_mapper.ml
+52 −82 typing/typeclass.ml
+755 −1,449 typing/typecore.ml
+8 −10 typing/typecore.mli
+158 −247 typing/typedecl.ml
+4 −7 typing/typedecl.mli
+2 −3 typing/typedecl_immediacy.ml
+1 −1 typing/typedecl_separability.ml
+10 −9 typing/typedecl_variance.ml
+17 −64 typing/typedtree.ml
+18 −105 typing/typedtree.mli
+204 −283 typing/typemod.ml
+5 −8 typing/typemod.mli
+8 −4 typing/typeopt.ml
+1 −0 typing/typeopt.mli
+1 −6 typing/types.ml
+1 −6 typing/types.mli
+61 −79 typing/typetexp.ml
+1 −10 typing/typetexp.mli
+47 −71 typing/untypeast.ml
+0 −27 typing/value_rec_types.mli
+0 −73 utils/config.fixed.ml
+20 −18 utils/config.ml
+0 −6 utils/config.mli
+5 −5 utils/diffing.ml
+1 −1 utils/diffing.mli
+176 −183 utils/misc.ml
+36 −51 utils/misc.mli
+1 −2 utils/warnings.ml
+1 −5 utils/warnings.mli

0 comments on commit 3a953fa

Please sign in to comment.