Merge pull request #28 from grain-lang/pin-dune

Pin some things so build succeeds
grain-lang · Sep 9, 2020 · 0647323 · 0647323
2 parents 71eaf20 + f26dca8
commit 0647323
Show file tree

Hide file tree

Showing 31 changed files with 286 additions and 1,102 deletions.
diff --git a/binaryen.opam b/binaryen.opam
@@ -13,7 +13,7 @@ build: [
 ]
 depends: [
   "ocaml" {>= "4.08"}
-  "dune" {>= "2.6"}
+  "dune" {= "2.6.1"}
   "conf-cmake" {build}
   "conf-python-3" {build}
   "js_of_ocaml" {>= "3.6.0"}

diff --git a/esy.lock/index.json b/esy.lock/index.json
diff --git a/esy.lock/opam/astring.0.8.4/opam → esy.lock/opam/astring.0.8.5/opam b/esy.lock/opam/astring.0.8.4/opam → esy.lock/opam/astring.0.8.5/opam
diff --git a/esy.lock/opam/base.v0.14.0/opam b/esy.lock/opam/base.v0.14.0/opam
diff --git a/esy.lock/opam/csexp.1.3.1/opam b/esy.lock/opam/csexp.1.3.1/opam
diff --git a/esy.lock/opam/dune.2.6.2/opam → esy.lock/opam/dune.2.6.1/opam b/esy.lock/opam/dune.2.6.2/opam → esy.lock/opam/dune.2.6.1/opam
diff --git a/esy.lock/opam/fpath.0.7.2/opam b/esy.lock/opam/fpath.0.7.2/opam
diff --git a/esy.lock/opam/js_of_ocaml-compiler.3.7.0/opam b/esy.lock/opam/js_of_ocaml-compiler.3.7.0/opam
diff --git a/esy.lock/opam/js_of_ocaml-ppx.3.7.0/opam b/esy.lock/opam/js_of_ocaml-ppx.3.7.0/opam
diff --git a/esy.lock/opam/js_of_ocaml.3.7.0/opam b/esy.lock/opam/js_of_ocaml.3.7.0/opam
diff --git a/...m/ocaml-secondary-compiler.4.08.1-1/files/0001-Don-t-build-manpages-for-stdlib-docs.patch b/...m/ocaml-secondary-compiler.4.08.1-1/files/0001-Don-t-build-manpages-for-stdlib-docs.patch
diff --git a/...pam/ocaml-secondary-compiler.4.08.1-1/files/0001-Fix-failure-to-install-tools-links.patch b/...pam/ocaml-secondary-compiler.4.08.1-1/files/0001-Fix-failure-to-install-tools-links.patch
diff --git a/esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/fix-gcc10.patch b/esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/files/fix-gcc10.patch
diff --git a/esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/opam b/esy.lock/opam/ocaml-secondary-compiler.4.08.1-1/opam
diff --git a/esy.lock/opam/ocamlfind-secondary.1.8.1/files/META.in b/esy.lock/opam/ocamlfind-secondary.1.8.1/files/META.in
diff --git a/esy.lock/opam/ocamlfind-secondary.1.8.1/files/ocaml-secondary-compiler.conf.in b/esy.lock/opam/ocamlfind-secondary.1.8.1/files/ocaml-secondary-compiler.conf.in
diff --git a/esy.lock/opam/ocamlfind-secondary.1.8.1/opam b/esy.lock/opam/ocamlfind-secondary.1.8.1/opam
diff --git a/esy.lock/opam/ocamlformat.0.15.0/opam b/esy.lock/opam/ocamlformat.0.15.0/opam
diff --git a/esy.lock/opam/ppx_tools_versioned.5.4.0/opam b/esy.lock/opam/ppx_tools_versioned.5.4.0/opam
diff --git a/esy.lock/opam/stdlib-shims.0.1.0/opam b/esy.lock/opam/stdlib-shims.0.1.0/opam
diff --git a/...opam__c__2.6.2_opam_override/package.json → ...opam__c__2.6.1_opam_override/package.json b/...opam__c__2.6.2_opam_override/package.json → ...opam__c__2.6.1_opam_override/package.json
diff --git a/...des/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/clone-flexdll b/...des/opam__s__ocaml_secondary_compiler_opam__c__4.08.1_1_opam_override/files/clone-flexdll