Skip to content
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.

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

Bump wasm dependency to v1.1 #1032

Merged
merged 5 commits into from
Dec 16, 2019
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
12 changes: 1 addition & 11 deletions Building.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,7 @@ installing all required tools without nix is out of scope).
[`opam`](https://opam.ocaml.org/doc/Install.html)
* Install the packages:
```
opam install num vlq yojson menhir stdio js_of_ocaml js_of_ocaml-ppx ppx_inline_test bisect_ppx atdgen
```
* Install the `wasm` Ocaml package. We use a newer version than is on opam, and a
fork that supports the multi-value extension. See `nix/ocaml-wasm.nix` for
the precise repository and version. You can use `nix` to fetch the correct
source for you, and run the manual installation inside:
```
cp -R $(nix-build --no-out-link -Q -A wasm.src)/interpreter /tmp/interpreter
cd /tmp/interpreter
chmod u+w -R .
make install
opam install num vlq yojson menhir stdio js_of_ocaml js_of_ocaml-ppx ppx_inline_test bisect_ppx atdgen wasm
```
* Install various command line tools used by, in particuar, the test suite:
```
Expand Down
8 changes: 4 additions & 4 deletions nix/ocaml-wasm.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ else

stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-wasm-${version}";
version = "1.0";
version = "1.1";

src = fetchFromGitHub {
owner = "WebAssembly";
repo = "multi-value";
rev = "fa755dfe0c8ab3ec93636a092fc3dfbe8c8a232c";
sha256 = "0867nd4k2lypal7g2a7816wi5zs4kp4w2dv9dxan9vvn3wi19b5i";
repo = "spec";
rev = "v1.1";
sha256 = "1jsgrjqzsdmm6f5pgd947nikj7pnxx1mqdnz16j7s62rg8x06h7d";
};

buildInputs = [ ocaml findlib ocamlbuild ];
Expand Down
Loading