Skip to content

Commit

Permalink
Bump wasm dependency to v1.1 (#1032)
Browse files Browse the repository at this point in the history
* Bump wasm dependency to v1.1

this prepares for #1000

This rips out multi-value support in our serializer/parser.

* Special stack_type encoding/decoding

* Bumping wasm changed the FloatLit printing

I hope that is ok.

* Update nix/ocaml-wasm.nix

Co-Authored-By: Gabor Greif <ggreif@gmail.com>
  • Loading branch information
2 people authored and mergify[bot] committed Dec 16, 2019
1 parent 75e0919 commit acae13f
Show file tree
Hide file tree
Showing 9 changed files with 140 additions and 156 deletions.
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 = "v${version}";
sha256 = "1jsgrjqzsdmm6f5pgd947nikj7pnxx1mqdnz16j7s62rg8x06h7d";
};

buildInputs = [ ocaml findlib ocamlbuild ];
Expand Down
Loading

0 comments on commit acae13f

Please sign in to comment.