diff --git a/Makefile b/Makefile index c87f00c59..70e3c882f 100644 --- a/Makefile +++ b/Makefile @@ -29,10 +29,6 @@ opam-create-switch: ## Create opam switch .PHONY: opam-install-test opam-install-test: ## Install test dependencies - opam pin add js_of_ocaml-compiler --dev-repo -y - opam pin add js_of_ocaml --dev-repo -y - opam pin add merlin-lib git+https://github.com/voodoos/merlin#5.1.1-upgrade - opam pin add merlin git+https://github.com/voodoos/merlin#5.1.1-upgrade opam pin add melange.dev . --with-test -y opam pin add melange-playground.dev . --with-test -y diff --git a/melange.opam b/melange.opam index 5a74f3026..5573c9351 100644 --- a/melange.opam +++ b/melange.opam @@ -36,3 +36,9 @@ build: [ ] ] dev-repo: "git+https://github.com/melange-re/melange.git" +pin-depends: [ + [ "js_of_ocaml-compiler.dev" "https://github.com/ocsigen/js_of_ocaml/archive/31e5d22f96435e511c8bd6e2a6d43f7c5fb13dec.tar.gz" ] + [ "js_of_ocaml.dev" "https://github.com/ocsigen/js_of_ocaml/archive/31e5d22f96435e511c8bd6e2a6d43f7c5fb13dec.tar.gz" ] + [ "merlin-lib.dev" "https://github.com/voodoos/merlin/archive/15491d05db13ec6beaf3c84632914c29b674270d.tar.gz" ] + [ "merlin.dev" "https://github.com/voodoos/merlin/archive/15491d05db13ec6beaf3c84632914c29b674270d.tar.gz" ] +] diff --git a/melange.opam.template b/melange.opam.template new file mode 100644 index 000000000..47b6ba86b --- /dev/null +++ b/melange.opam.template @@ -0,0 +1,6 @@ +pin-depends: [ + [ "js_of_ocaml-compiler.dev" "https://github.com/ocsigen/js_of_ocaml/archive/31e5d22f96435e511c8bd6e2a6d43f7c5fb13dec.tar.gz" ] + [ "js_of_ocaml.dev" "https://github.com/ocsigen/js_of_ocaml/archive/31e5d22f96435e511c8bd6e2a6d43f7c5fb13dec.tar.gz" ] + [ "merlin-lib.dev" "https://github.com/voodoos/merlin/archive/15491d05db13ec6beaf3c84632914c29b674270d.tar.gz" ] + [ "merlin.dev" "https://github.com/voodoos/merlin/archive/15491d05db13ec6beaf3c84632914c29b674270d.tar.gz" ] +]