esy lock update

revery-ui · Apr 12, 2019 · ace7646 · ace7646
1 parent a621477
commit ace7646
Show file tree

Hide file tree

Showing 65 changed files with 4,226 additions and 39 deletions.
diff --git a/bench.esy.lock/index.json b/bench.esy.lock/index.json
@@ -1,28 +1,17 @@
 {
-<<<<<<< HEAD:bench.esy.lock/index.json
   "checksum": "95684439452d4263a90a9bb3b4ec638a",
   "root": "revery@link-dev:./package.json",
-=======
-  "checksum": "19b9840c553f8c6d0b9138ef0a9ed175",
-  "root": "revery@link:./package.json",
->>>>>>> Fix bug with text wrapping past max width:esy.lock/index.json
   "node": {
-    "revery@link:./package.json": {
-      "id": "revery@link:./package.json",
+    "revery@link-dev:./package.json": {
+      "id": "revery@link-dev:./package.json",
       "name": "revery",
-<<<<<<< HEAD:bench.esy.lock/index.json
       "version": "link-dev:./package.json",
       "source": {
         "type": "link-dev",
         "path": ".",
         "manifest": "package.json"
       },
       "overrides": [ "bench.json" ],
-=======
-      "version": "link:./package.json",
-      "source": { "type": "link", "path": ".", "manifest": "package.json" },
-      "overrides": [],
->>>>>>> Fix bug with text wrapping past max width:esy.lock/index.json
       "dependencies": [
         "reperf@1.4.0@d41d8cd9",
         "rebez@github:jchavarri/rebez#46cbc183@d41d8cd9",
@@ -425,8 +414,8 @@
       ],
       "devDependencies": [ "ocaml@4.7.1004@d41d8cd9" ]
     },
-    "@opam/tyxml@opam:4.3.0@b35a7c40": {
-      "id": "@opam/tyxml@opam:4.3.0@b35a7c40",
+    "@opam/tyxml@opam:4.3.0@15e44054": {
+      "id": "@opam/tyxml@opam:4.3.0@15e44054",
       "name": "@opam/tyxml",
       "version": "opam:4.3.0",
       "source": {
@@ -560,11 +549,7 @@
         "opam": {
           "name": "re",
           "version": "1.9.0",
-<<<<<<< HEAD:bench.esy.lock/index.json
           "path": "bench.esy.lock/opam/re.1.9.0"
-=======
-          "path": "esy.lock/opam/re.1.9.0"
->>>>>>> Fix bug with text wrapping past max width:esy.lock/index.json
         }
       },
       "overrides": [],
@@ -594,7 +579,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.7.1004@d41d8cd9", "@opam/tyxml@opam:4.3.0@b35a7c40",
+        "ocaml@4.7.1004@d41d8cd9", "@opam/tyxml@opam:4.3.0@15e44054",
         "@opam/dune@opam:1.7.3@72aad784",
         "@opam/base-bytes@opam:base@19d0c2ff",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
@@ -644,11 +629,7 @@
         "opam": {
           "name": "ppx_derivers",
           "version": "1.2.1",
-<<<<<<< HEAD:bench.esy.lock/index.json
           "path": "bench.esy.lock/opam/ppx_derivers.1.2.1"
-=======
-          "path": "esy.lock/opam/ppx_derivers.1.2.1"
->>>>>>> Fix bug with text wrapping past max width:esy.lock/index.json
         }
       },
       "overrides": [],
@@ -676,7 +657,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.7.1004@d41d8cd9", "@opam/tyxml@opam:4.3.0@b35a7c40",
+        "ocaml@4.7.1004@d41d8cd9", "@opam/tyxml@opam:4.3.0@15e44054",
         "@opam/result@opam:1.3@bee8bf2e", "@opam/fpath@opam:0.7.2@45477b93",
         "@opam/dune@opam:1.7.3@72aad784", "@opam/cppo@opam:1.6.5@bec3dbd9",
         "@opam/cmdliner@opam:1.0.2@8ab0598a",
@@ -781,11 +762,7 @@
         "opam": {
           "name": "mmap",
           "version": "1.1.0",
-<<<<<<< HEAD:bench.esy.lock/index.json
           "path": "bench.esy.lock/opam/mmap.1.1.0"
-=======
-          "path": "esy.lock/opam/mmap.1.1.0"
->>>>>>> Fix bug with text wrapping past max width:esy.lock/index.json
         }
       },
       "overrides": [],
@@ -795,8 +772,8 @@
       ],
       "devDependencies": [ "ocaml@4.7.1004@d41d8cd9" ]
     },
-    "@opam/merlin-extend@opam:0.3@e1fc0d08": {
-      "id": "@opam/merlin-extend@opam:0.3@e1fc0d08",
+    "@opam/merlin-extend@opam:0.3@0af73a50": {
+      "id": "@opam/merlin-extend@opam:0.3@0af73a50",
       "name": "@opam/merlin-extend",
       "version": "opam:0.3",
       "source": {
@@ -971,11 +948,7 @@
         "opam": {
           "name": "lwt",
           "version": "4.2.1",
-<<<<<<< HEAD:bench.esy.lock/index.json
           "path": "bench.esy.lock/opam/lwt.4.2.1"
-=======
-          "path": "esy.lock/opam/lwt.4.2.1"
->>>>>>> Fix bug with text wrapping past max width:esy.lock/index.json
         }
       },
       "overrides": [],
@@ -1595,7 +1568,7 @@
         "ocaml@4.7.1004@d41d8cd9", "@opam/result@opam:1.3@bee8bf2e",
         "@opam/ocamlfind@opam:1.8.0@f744a0c5",
         "@opam/ocaml-migrate-parsetree@opam:1.2.0@23e55f71",
-        "@opam/merlin-extend@opam:0.3@e1fc0d08",
+        "@opam/merlin-extend@opam:0.3@0af73a50",
         "@opam/menhir@opam:20181113@0c8257a8",
         "@opam/dune@opam:1.7.3@72aad784"
       ],

diff --git a/bench.esy.lock/opam/merlin-extend.0.3/opam b/bench.esy.lock/opam/merlin-extend.0.3/opam
@@ -9,7 +9,7 @@ build: [make]
 install: [make "install"]
 remove: ["ocamlfind" "remove" "merlin_extend"]
 depends: [
-  "ocaml" {>= "4.02.3"}
+  "ocaml" {>= "4.02.3" & < "4.08.0"}
   "ocamlfind" {build}
   "cppo" {build}
 ]

diff --git a/bench.esy.lock/opam/tyxml.4.3.0/opam b/bench.esy.lock/opam/tyxml.4.3.0/opam
@@ -14,11 +14,12 @@ build: [
 
 depends: [
   "ocaml" {>= "4.02"}
+  "re" {>= "1.5.0"}
+  ("ocaml" {>= "4.07"} | "re" {>= "1.8.0"})
   "dune" {build}
   "alcotest" {with-test}
   "seq"
   "uutf" {>= "1.0.0"}
-  "re" {>= "1.5.0"}
 ]
 
 synopsis:"TyXML is a library for building correct HTML and SVG documents"

diff --git a/...am__s__merlin_extend_opam__c__0.3_opam_override/files/merlin-extend-winfix-4.2.3007.patch b/...am__s__merlin_extend_opam__c__0.3_opam_override/files/merlin-extend-winfix-4.2.3007.patch
@@ -0,0 +1,34 @@
+--- ./extend_helper.ml
++++ ./extend_helper.ml
+@@ -1,13 +1,6 @@
+-(*pp cppo -V OCAML:`ocamlc -version` *)
+ open Parsetree
+ open Extend_protocol
+
+-#if OCAML_VERSION < (4, 3, 0)
+-# define CONST_STRING Asttypes.Const_string
+-#else
+-# define CONST_STRING Parsetree.Pconst_string
+-#endif
+-
+ (** Default implementation for [Reader_def.print_outcome] using
+     [Oprint] from compiler-libs *)
+ let print_outcome_using_oprint ppf = function
+@@ -28,7 +21,7 @@
+       pstr_loc = Location.none;
+       pstr_desc = Pstr_eval ({
+           pexp_loc = Location.none;
+-          pexp_desc = Pexp_constant (CONST_STRING (msg, None));
++          pexp_desc = Pexp_constant (Asttypes.Const_string (msg, None));
+           pexp_attributes = [];
+         }, []);
+     }]
+@@ -112,7 +105,7 @@
+   let msg = match payload with
+     | PStr [{
+         pstr_desc = Pstr_eval ({
+-            pexp_desc = Pexp_constant (CONST_STRING (msg, _));
++            pexp_desc = Pexp_constant (Asttypes.Const_string (msg, _));
+           }, _);
+       }] -> msg
+     | _ -> "Warning: extension produced an incorrect syntax-error node"
diff --git a/bench.esy.lock/overrides/opam__s__merlin_extend_opam__c__0.3_opam_override/package.json b/bench.esy.lock/overrides/opam__s__merlin_extend_opam__c__0.3_opam_override/package.json
@@ -1,9 +1,12 @@
 {
+  "buildEnv": {
+    "PATCH_CMD": "#{ocaml.version == '4.2.3007' ? 'patch -p1 < merlin-extend-winfix-4.2.3007.patch' : 'patch -p1 < merlin-extend-winfix.patch'}"
+  },
   "build": [
     [
       "bash",
       "-c",
-      "#{os == 'windows' ? 'patch -p1 < merlin-extend-winfix.patch' : 'true'}"
+      "#{os == 'windows' ? $PATCH_CMD : 'true'}"
     ],
     [
       "make"

diff --git a/esy.lock/.gitattributes b/esy.lock/.gitattributes
@@ -0,0 +1,3 @@
+
+# Set eol to LF so files aren't converted to CRLF-eol on Windows.
+* text eol=lf
diff --git a/esy.lock/.gitignore b/esy.lock/.gitignore
@@ -0,0 +1,3 @@
+
+# Reset any possible .gitignore, we want all esy.lock to be un-ignored.
+!*
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@

		# Set eol to LF so files aren't converted to CRLF-eol on Windows.
		* text eol=lf
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@

		# Reset any possible .gitignore, we want all esy.lock to be un-ignored.
		!*