Skip to content

Commit

Permalink
add 4.14 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 fb58cb9
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
(>= "4.14")
(< "5.0")))
(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/4.14";
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_4_14;
});

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" {>= "4.14" & < "5.0"}
"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

0 comments on commit fb58cb9

Please sign in to comment.