diff --git a/.ci/release-postinstall.js b/.ci/release-postinstall.js
index 1a6f020..137aaac 100644
--- a/.ci/release-postinstall.js
+++ b/.ci/release-postinstall.js
@@ -15,12 +15,12 @@ var fs = require("fs");
 var os = require("os");
 var platform = process.platform;
 
-var packageJson = require('./package.json');
-var binariesToCopy = Object.keys(packageJson.bin).map(function(name) {
-  return packageJson.bin[name]
-}).concat([
-  "esyInstallRelease.js"
-]);
+var packageJson = require("./package.json");
+var binariesToCopy = Object.keys(packageJson.bin)
+  .map(function(name) {
+    return packageJson.bin[name];
+  })
+  .concat(["esyInstallRelease.js"]);
 var foldersToCopy = ["bin", "_export"];
 
 function copyRecursive(srcDir, dstDir) {
diff --git a/README.md b/README.md
index bc53aa8..5e2074c 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
 # bsdoc
+
 > Documentation Generation for BuckleScript projects
 
 [![Build Status](https://dev.azure.com/reuniverse/bsdoc/_apis/build/status/reuniverse.bsdoc?branchName=master)](https://dev.azure.com/ostera/reuniverse/_build/latest?definitionId=1?branchName=master)
diff --git a/bsconfig.json b/bsconfig.json
index 5068985..f314af4 100644
--- a/bsconfig.json
+++ b/bsconfig.json
@@ -4,19 +4,17 @@
   "name": "bsdoc",
   "version": "0.1.0",
   "sources": {
-    "dir" : "src",
-    "subdirs" : true
+    "dir": "src",
+    "subdirs": true
   },
   "package-specs": {
     "module": "commonjs",
     "in-source": false
   },
   "suffix": ".bs.js",
-  "bs-dependencies": [
-    "@elliottcable/bs-cmdliner",
-  ],
+  "bs-dependencies": ["@elliottcable/bs-cmdliner"],
   "warnings": {
-    "error" : "+101"
+    "error": "+101"
   },
   "namespace": false,
   "refmt": 3
diff --git a/dune-project b/dune-project
index 241a9bb..a1da6e2 100644
--- a/dune-project
+++ b/dune-project
@@ -1,2 +1,2 @@
-(lang dune 1.9)
-(using fmt 1.1 (enabled_for reason dune))
+(lang dune 2.0)
+(name bsdoc)
diff --git a/esy.json b/esy.json
index c34a925..e84f005 100644
--- a/esy.json
+++ b/esy.json
@@ -1,25 +1,15 @@
 {
   "name": "bsdoc",
   "version": "6.0.2-alpha",
-  "keywords": [
-    "BuckleScript",
-    "Odoc-driver",
-    "documentation",
-    "generation"
-  ],
+  "keywords": ["BuckleScript", "Odoc-driver", "documentation", "generation"],
   "author": "Leandro Ostera <leandro@ostera.io>",
   "license": "MIT",
   "esy": {
     "build": "dune build -p #{self.name}",
     "buildsInSource": "_build",
     "release": {
-      "bin": [
-        "bsdoc"
-      ],
-      "includePackages": [
-        "root",
-        "@opam/odoc"
-      ]
+      "bin": ["bsdoc"],
+      "includePackages": ["root", "@opam/odoc"]
     }
   },
   "scripts": {
@@ -27,13 +17,13 @@
     "doc": "esy dune build @doc"
   },
   "dependencies": {
-    "@esy-ocaml/reason": ">= 3.4.0 < 3.5.0",
+    "@esy-ocaml/reason": ">= 3.4.0 < 3.6.0",
     "@opam/bos": "0.2.0",
-    "@opam/cmdliner": "1.0.3",
-    "@opam/dune": "1.9.0",
-    "@opam/fmt": "0.8.6",
-    "@opam/logs": "0.6.3",
-    "@opam/odoc": "1.4.0",
+    "@opam/cmdliner": "1.0.4",
+    "@opam/dune": "2.0.1",
+    "@opam/fmt": "0.8.8",
+    "@opam/logs": "0.7.0",
+    "@opam/odoc": "1.4.2",
     "ocaml": "~4.6.0",
     "refmterr": "*"
   },
diff --git a/esy.lock/.gitattributes b/esy.lock/.gitattributes
index 25366ae..e0b4e26 100644
--- a/esy.lock/.gitattributes
+++ b/esy.lock/.gitattributes
@@ -1,3 +1,3 @@
 
 # Set eol to LF so files aren't converted to CRLF-eol on Windows.
-* text eol=lf
+* text eol=lf linguist-generated
diff --git a/esy.lock/index.json b/esy.lock/index.json
index 272cee3..e9360c0 100644
--- a/esy.lock/index.json
+++ b/esy.lock/index.json
@@ -1,32 +1,35 @@
 {
-  "checksum": "49fb06773df3dd789de81cd0b49e3dda",
+  "checksum": "262fa6b9fcda2a35a770f57627381ce5",
   "root": "bsdoc@link-dev:./esy.json",
   "node": {
-    "refmterr@3.1.10@d41d8cd9": {
-      "id": "refmterr@3.1.10@d41d8cd9",
+    "refmterr@3.3.0@d41d8cd9": {
+      "id": "refmterr@3.3.0@d41d8cd9",
       "name": "refmterr",
-      "version": "3.1.10",
+      "version": "3.3.0",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://registry.npmjs.org/refmterr/-/refmterr-3.1.10.tgz#sha1:7c3e238022acb5de4e2254ab506d70eee13c0a46"
+          "archive:https://registry.npmjs.org/refmterr/-/refmterr-3.3.0.tgz#sha1:45adde80205093c201b491b3c37dd7740c9b036b"
         ]
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.6.10@d41d8cd9", "@opam/re@opam:1.9.0@7f4a36a5",
-        "@opam/dune@opam:1.9.0@a7408d38", "@esy-ocaml/reason@3.4.0@d41d8cd9"
+        "ocaml@4.6.1000@d41d8cd9", "@reason-native/pastel@0.2.3@d41d8cd9",
+        "@reason-native/console@0.1.0@d41d8cd9",
+        "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:2.0.1@5dc56bd0",
+        "@opam/atdgen@opam:2.0.0@46af0360",
+        "@esy-ocaml/reason@3.5.2@d41d8cd9"
       ],
       "devDependencies": []
     },
-    "ocaml@4.6.10@d41d8cd9": {
-      "id": "ocaml@4.6.10@d41d8cd9",
+    "ocaml@4.6.1000@d41d8cd9": {
+      "id": "ocaml@4.6.1000@d41d8cd9",
       "name": "ocaml",
-      "version": "4.6.10",
+      "version": "4.6.1000",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://registry.npmjs.org/ocaml/-/ocaml-4.6.10.tgz#sha1:33c67d0275dc1aeba25b11557192aefcd3cf0a6a"
+          "archive:https://registry.npmjs.org/ocaml/-/ocaml-4.6.1000.tgz#sha1:99525ef559353481396454f9a072dedc96b52f44"
         ]
       },
       "overrides": [],
@@ -40,19 +43,53 @@
       "source": { "type": "link-dev", "path": ".", "manifest": "esy.json" },
       "overrides": [],
       "dependencies": [
-        "refmterr@3.1.10@d41d8cd9", "ocaml@4.6.10@d41d8cd9",
-        "@opam/odoc@opam:1.4.0@816970ee", "@opam/logs@opam:0.6.3@80c08d15",
-        "@opam/fmt@opam:0.8.6@a06c130d", "@opam/dune@opam:1.9.0@a7408d38",
-        "@opam/cmdliner@opam:1.0.3@96d31520",
-        "@opam/bos@opam:0.2.0@df49e63f", "@esy-ocaml/reason@3.4.0@d41d8cd9"
+        "refmterr@3.3.0@d41d8cd9", "ocaml@4.6.1000@d41d8cd9",
+        "@opam/odoc@opam:1.4.0@a3da3a09", "@opam/logs@opam:0.7.0@1d03143e",
+        "@opam/fmt@opam:0.8.8@01c3a23c", "@opam/dune@opam:2.0.1@5dc56bd0",
+        "@opam/cmdliner@opam:1.0.4@93208aac",
+        "@opam/bos@opam:0.2.0@df49e63f", "@esy-ocaml/reason@3.5.2@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.6.10@d41d8cd9", "@opam/odoc@opam:1.4.0@816970ee",
-        "@opam/merlin@opam:3.2.2@829ee6dd"
+        "ocaml@4.6.1000@d41d8cd9", "@opam/odoc@opam:1.4.0@a3da3a09",
+        "@opam/merlin@opam:3.3.3@d653b06a"
       ]
     },
-    "@opam/yojson@opam:1.7.0@2d92307e": {
-      "id": "@opam/yojson@opam:1.7.0@2d92307e",
+    "@reason-native/pastel@0.2.3@d41d8cd9": {
+      "id": "@reason-native/pastel@0.2.3@d41d8cd9",
+      "name": "@reason-native/pastel",
+      "version": "0.2.3",
+      "source": {
+        "type": "install",
+        "source": [
+          "archive:https://registry.npmjs.org/@reason-native/pastel/-/pastel-0.2.3.tgz#sha1:5c5d420c09874584ce15a38695c5dfd0f0ff5dfa"
+        ]
+      },
+      "overrides": [],
+      "dependencies": [
+        "ocaml@4.6.1000@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d",
+        "@opam/dune@opam:2.0.1@5dc56bd0", "@esy-ocaml/reason@3.5.2@d41d8cd9"
+      ],
+      "devDependencies": []
+    },
+    "@reason-native/console@0.1.0@d41d8cd9": {
+      "id": "@reason-native/console@0.1.0@d41d8cd9",
+      "name": "@reason-native/console",
+      "version": "0.1.0",
+      "source": {
+        "type": "install",
+        "source": [
+          "archive:https://registry.npmjs.org/@reason-native/console/-/console-0.1.0.tgz#sha1:3b56f0e9e1be8464329793df29020aa90e71c22c"
+        ]
+      },
+      "overrides": [],
+      "dependencies": [
+        "ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:2.0.1@5dc56bd0",
+        "@esy-ocaml/reason@3.5.2@d41d8cd9"
+      ],
+      "devDependencies": []
+    },
+    "@opam/yojson@opam:1.7.0@7056d985": {
+      "id": "@opam/yojson@opam:1.7.0@7056d985",
       "name": "@opam/yojson",
       "version": "opam:1.7.0",
       "source": {
@@ -69,14 +106,14 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.6.10@d41d8cd9", "@opam/easy-format@opam:1.3.1@9abfd4ed",
-        "@opam/dune@opam:1.9.0@a7408d38", "@opam/cppo@opam:1.6.5@bec3dbd9",
-        "@opam/biniou@opam:1.2.0@c8516f18",
+        "ocaml@4.6.1000@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4",
+        "@opam/dune@opam:2.0.1@5dc56bd0", "@opam/cppo@opam:1.6.6@f4f83858",
+        "@opam/biniou@opam:1.2.1@d7570399",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.6.10@d41d8cd9", "@opam/easy-format@opam:1.3.1@9abfd4ed",
-        "@opam/biniou@opam:1.2.0@c8516f18"
+        "ocaml@4.6.1000@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4",
+        "@opam/dune@opam:2.0.1@5dc56bd0", "@opam/biniou@opam:1.2.1@d7570399"
       ]
     },
     "@opam/uutf@opam:1.0.2@4440868f": {
@@ -97,15 +134,15 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.6.10@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea",
-        "@opam/topkg@opam:1.0.0@61f4ccf9",
-        "@opam/ocamlfind@opam:1.8.0@f744a0c5",
-        "@opam/ocamlbuild@opam:0.14.0@427a2331",
-        "@opam/cmdliner@opam:1.0.3@96d31520",
+        "ocaml@4.6.1000@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea",
+        "@opam/topkg@opam:1.0.1@a42c631e",
+        "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
+        "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
+        "@opam/cmdliner@opam:1.0.4@93208aac",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.6.10@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea"
+        "ocaml@4.6.1000@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea"
       ]
     },
     "@opam/uchar@opam:0.0.2@c8218eea": {
@@ -126,13 +163,13 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.6.10@d41d8cd9", "@opam/ocamlbuild@opam:0.14.0@427a2331",
+        "ocaml@4.6.1000@d41d8cd9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
-      "devDependencies": [ "ocaml@4.6.10@d41d8cd9" ]
+      "devDependencies": [ "ocaml@4.6.1000@d41d8cd9" ]
     },
-    "@opam/tyxml@opam:4.3.0@15e44054": {
-      "id": "@opam/tyxml@opam:4.3.0@15e44054",
+    "@opam/tyxml@opam:4.3.0@c1da25f1": {
+      "id": "@opam/tyxml@opam:4.3.0@c1da25f1",
       "name": "@opam/tyxml",
       "version": "opam:4.3.0",
       "source": {
@@ -149,45 +186,44 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.6.10@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f",
-        "@opam/seq@opam:0.1@93954fa7", "@opam/re@opam:1.9.0@7f4a36a5",
-        "@opam/dune@opam:1.9.0@a7408d38", "@esy-ocaml/substs@0.0.1@d41d8cd9"
+        "ocaml@4.6.1000@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f",
+        "@opam/seq@opam:0.2.2@e9144e45", "@opam/re@opam:1.9.0@d4d5e13d",
+        "@opam/dune@opam:2.0.1@5dc56bd0", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.6.10@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f",
-        "@opam/seq@opam:0.1@93954fa7", "@opam/re@opam:1.9.0@7f4a36a5"
+        "ocaml@4.6.1000@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f",
+        "@opam/seq@opam:0.2.2@e9144e45", "@opam/re@opam:1.9.0@d4d5e13d",
+        "@opam/dune@opam:2.0.1@5dc56bd0"
       ]
     },
-    "@opam/topkg@opam:1.0.0@61f4ccf9": {
-      "id": "@opam/topkg@opam:1.0.0@61f4ccf9",
+    "@opam/topkg@opam:1.0.1@a42c631e": {
+      "id": "@opam/topkg@opam:1.0.1@a42c631e",
       "name": "@opam/topkg",
-      "version": "opam:1.0.0",
+      "version": "opam:1.0.1",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/e3/e3d76bda06bf68cb5853caf6627da603#md5:e3d76bda06bf68cb5853caf6627da603",
-          "archive:http://erratique.ch/software/topkg/releases/topkg-1.0.0.tbz#md5:e3d76bda06bf68cb5853caf6627da603"
+          "archive:https://opam.ocaml.org/cache/md5/16/16b90e066d8972a5ef59655e7c28b3e9#md5:16b90e066d8972a5ef59655e7c28b3e9",
+          "archive:http://erratique.ch/software/topkg/releases/topkg-1.0.1.tbz#md5:16b90e066d8972a5ef59655e7c28b3e9"
         ],
         "opam": {
           "name": "topkg",
-          "version": "1.0.0",
-          "path": "esy.lock/opam/topkg.1.0.0"
+          "version": "1.0.1",
+          "path": "esy.lock/opam/topkg.1.0.1"
         }
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.6.10@d41d8cd9", "@opam/result@opam:1.3@bee8bf2e",
-        "@opam/ocamlfind@opam:1.8.0@f744a0c5",
-        "@opam/ocamlbuild@opam:0.14.0@427a2331",
+        "ocaml@4.6.1000@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
+        "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.6.10@d41d8cd9", "@opam/result@opam:1.3@bee8bf2e",
-        "@opam/ocamlbuild@opam:0.14.0@427a2331"
+        "ocaml@4.6.1000@d41d8cd9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03"
       ]
     },
-    "@opam/stdlib-shims@opam:0.1.0@b4c63262": {
-      "id": "@opam/stdlib-shims@opam:0.1.0@b4c63262",
+    "@opam/stdlib-shims@opam:0.1.0@d957c903": {
+      "id": "@opam/stdlib-shims@opam:0.1.0@d957c903",
       "name": "@opam/stdlib-shims",
       "version": "opam:0.1.0",
       "source": {
@@ -204,34 +240,37 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.6.10@d41d8cd9", "@opam/dune@opam:1.9.0@a7408d38",
+        "ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:2.0.1@5dc56bd0",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
-      "devDependencies": [ "ocaml@4.6.10@d41d8cd9" ]
+      "devDependencies": [
+        "ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:2.0.1@5dc56bd0"
+      ]
     },
-    "@opam/seq@opam:0.1@93954fa7": {
-      "id": "@opam/seq@opam:0.1@93954fa7",
+    "@opam/seq@opam:0.2.2@e9144e45": {
+      "id": "@opam/seq@opam:0.2.2@e9144e45",
       "name": "@opam/seq",
-      "version": "opam:0.1",
+      "version": "opam:0.2.2",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/0e/0e87f9709541ed46ecb6f414bc31458c#md5:0e87f9709541ed46ecb6f414bc31458c",
-          "archive:https://github.com/c-cube/seq/archive/0.1.tar.gz#md5:0e87f9709541ed46ecb6f414bc31458c"
+          "archive:https://opam.ocaml.org/cache/md5/90/9033e02283aa3bde9f97f24e632902e3#md5:9033e02283aa3bde9f97f24e632902e3",
+          "archive:https://github.com/c-cube/seq/archive/0.2.2.tar.gz#md5:9033e02283aa3bde9f97f24e632902e3"
         ],
         "opam": {
           "name": "seq",
-          "version": "0.1",
-          "path": "esy.lock/opam/seq.0.1"
+          "version": "0.2.2",
+          "path": "esy.lock/opam/seq.0.2.2"
         }
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.6.10@d41d8cd9", "@opam/ocamlfind@opam:1.8.0@f744a0c5",
-        "@opam/ocamlbuild@opam:0.14.0@427a2331",
+        "ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:2.0.1@5dc56bd0",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
-      "devDependencies": [ "ocaml@4.6.10@d41d8cd9" ]
+      "devDependencies": [
+        "ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:2.0.1@5dc56bd0"
+      ]
     },
     "@opam/rresult@opam:0.6.0@4b185e72": {
       "id": "@opam/rresult@opam:0.6.0@4b185e72",
@@ -251,41 +290,43 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.6.10@d41d8cd9", "@opam/topkg@opam:1.0.0@61f4ccf9",
-        "@opam/result@opam:1.3@bee8bf2e",
-        "@opam/ocamlfind@opam:1.8.0@f744a0c5",
-        "@opam/ocamlbuild@opam:0.14.0@427a2331",
+        "ocaml@4.6.1000@d41d8cd9", "@opam/topkg@opam:1.0.1@a42c631e",
+        "@opam/result@opam:1.4@dc720aef",
+        "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
+        "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.6.10@d41d8cd9", "@opam/result@opam:1.3@bee8bf2e"
+        "ocaml@4.6.1000@d41d8cd9", "@opam/result@opam:1.4@dc720aef"
       ]
     },
-    "@opam/result@opam:1.3@bee8bf2e": {
-      "id": "@opam/result@opam:1.3@bee8bf2e",
+    "@opam/result@opam:1.4@dc720aef": {
+      "id": "@opam/result@opam:1.4@dc720aef",
       "name": "@opam/result",
-      "version": "opam:1.3",
+      "version": "opam:1.4",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/4b/4beebefd41f7f899b6eeba7414e7ae01#md5:4beebefd41f7f899b6eeba7414e7ae01",
-          "archive:https://github.com/janestreet/result/releases/download/1.3/result-1.3.tbz#md5:4beebefd41f7f899b6eeba7414e7ae01"
+          "archive:https://opam.ocaml.org/cache/md5/d3/d3162dbc501a2af65c8c71e0866541da#md5:d3162dbc501a2af65c8c71e0866541da",
+          "archive:https://github.com/janestreet/result/archive/1.4.tar.gz#md5:d3162dbc501a2af65c8c71e0866541da"
         ],
         "opam": {
           "name": "result",
-          "version": "1.3",
-          "path": "esy.lock/opam/result.1.3"
+          "version": "1.4",
+          "path": "esy.lock/opam/result.1.4"
         }
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.6.10@d41d8cd9", "@opam/jbuilder@opam:transition@58bdfe0a",
+        "ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:2.0.1@5dc56bd0",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
-      "devDependencies": [ "ocaml@4.6.10@d41d8cd9" ]
+      "devDependencies": [
+        "ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:2.0.1@5dc56bd0"
+      ]
     },
-    "@opam/re@opam:1.9.0@7f4a36a5": {
-      "id": "@opam/re@opam:1.9.0@7f4a36a5",
+    "@opam/re@opam:1.9.0@d4d5e13d": {
+      "id": "@opam/re@opam:1.9.0@d4d5e13d",
       "name": "@opam/re",
       "version": "opam:1.9.0",
       "source": {
@@ -302,15 +343,16 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.6.10@d41d8cd9", "@opam/seq@opam:0.1@93954fa7",
-        "@opam/dune@opam:1.9.0@a7408d38", "@esy-ocaml/substs@0.0.1@d41d8cd9"
+        "ocaml@4.6.1000@d41d8cd9", "@opam/seq@opam:0.2.2@e9144e45",
+        "@opam/dune@opam:2.0.1@5dc56bd0", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.6.10@d41d8cd9", "@opam/seq@opam:0.1@93954fa7"
+        "ocaml@4.6.1000@d41d8cd9", "@opam/seq@opam:0.2.2@e9144e45",
+        "@opam/dune@opam:2.0.1@5dc56bd0"
       ]
     },
-    "@opam/ppx_derivers@opam:1.2.1@0b458500": {
-      "id": "@opam/ppx_derivers@opam:1.2.1@0b458500",
+    "@opam/ppx_derivers@opam:1.2.1@ecf0aa45": {
+      "id": "@opam/ppx_derivers@opam:1.2.1@ecf0aa45",
       "name": "@opam/ppx_derivers",
       "version": "opam:1.2.1",
       "source": {
@@ -327,13 +369,15 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.6.10@d41d8cd9", "@opam/dune@opam:1.9.0@a7408d38",
+        "ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:2.0.1@5dc56bd0",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
-      "devDependencies": [ "ocaml@4.6.10@d41d8cd9" ]
+      "devDependencies": [
+        "ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:2.0.1@5dc56bd0"
+      ]
     },
-    "@opam/odoc@opam:1.4.0@816970ee": {
-      "id": "@opam/odoc@opam:1.4.0@816970ee",
+    "@opam/odoc@opam:1.4.0@a3da3a09": {
+      "id": "@opam/odoc@opam:1.4.0@a3da3a09",
       "name": "@opam/odoc",
       "version": "opam:1.4.0",
       "source": {
@@ -350,46 +394,48 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.6.10@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.9.0@a7408d38", "@opam/cppo@opam:1.6.5@bec3dbd9",
-        "@opam/cmdliner@opam:1.0.3@96d31520",
+        "ocaml@4.6.1000@d41d8cd9", "@opam/tyxml@opam:4.3.0@c1da25f1",
+        "@opam/result@opam:1.4@dc720aef", "@opam/fpath@opam:0.7.2@45477b93",
+        "@opam/dune@opam:2.0.1@5dc56bd0", "@opam/cppo@opam:1.6.6@f4f83858",
+        "@opam/cmdliner@opam:1.0.4@93208aac",
         "@opam/astring@opam:0.8.3@4e5e17d5",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
-      "devDependencies": [ "ocaml@4.6.10@d41d8cd9" ]
+      "devDependencies": [
+        "ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:2.0.1@5dc56bd0"
+      ]
     },
-    "@opam/ocamlfind@opam:1.8.0@f744a0c5": {
-      "id": "@opam/ocamlfind@opam:1.8.0@f744a0c5",
+    "@opam/ocamlfind@opam:1.8.1@ff07b0f9": {
+      "id": "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
       "name": "@opam/ocamlfind",
-      "version": "opam:1.8.0",
+      "version": "opam:1.8.1",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/a7/a710c559667672077a93d34eb6a42e5b#md5:a710c559667672077a93d34eb6a42e5b",
-          "archive:http://download2.camlcity.org/download/findlib-1.8.0.tar.gz#md5:a710c559667672077a93d34eb6a42e5b",
-          "archive:http://download.camlcity.org/download/findlib-1.8.0.tar.gz#md5:a710c559667672077a93d34eb6a42e5b"
+          "archive:https://opam.ocaml.org/cache/md5/18/18ca650982c15536616dea0e422cbd8c#md5:18ca650982c15536616dea0e422cbd8c",
+          "archive:http://download2.camlcity.org/download/findlib-1.8.1.tar.gz#md5:18ca650982c15536616dea0e422cbd8c",
+          "archive:http://download.camlcity.org/download/findlib-1.8.1.tar.gz#md5:18ca650982c15536616dea0e422cbd8c"
         ],
         "opam": {
           "name": "ocamlfind",
-          "version": "1.8.0",
-          "path": "esy.lock/opam/ocamlfind.1.8.0"
+          "version": "1.8.1",
+          "path": "esy.lock/opam/ocamlfind.1.8.1"
         }
       },
       "overrides": [
         {
           "opamoverride":
-            "esy.lock/overrides/opam__s__ocamlfind_opam__c__1.8.0_opam_override"
+            "esy.lock/overrides/opam__s__ocamlfind_opam__c__1.8.1_opam_override"
         }
       ],
       "dependencies": [
-        "ocaml@4.6.10@d41d8cd9", "@opam/conf-m4@opam:1@dd7dde42",
+        "ocaml@4.6.1000@d41d8cd9", "@opam/conf-m4@opam:1@3b2b148a",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
-      "devDependencies": [ "ocaml@4.6.10@d41d8cd9" ]
+      "devDependencies": [ "ocaml@4.6.1000@d41d8cd9" ]
     },
-    "@opam/ocamlbuild@opam:0.14.0@427a2331": {
-      "id": "@opam/ocamlbuild@opam:0.14.0@427a2331",
+    "@opam/ocamlbuild@opam:0.14.0@6ac75d03": {
+      "id": "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
       "name": "@opam/ocamlbuild",
       "version": "opam:0.14.0",
       "source": {
@@ -411,164 +457,164 @@
         }
       ],
       "dependencies": [
-        "ocaml@4.6.10@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9"
+        "ocaml@4.6.1000@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
-      "devDependencies": [ "ocaml@4.6.10@d41d8cd9" ]
+      "devDependencies": [ "ocaml@4.6.1000@d41d8cd9" ]
     },
-    "@opam/ocaml-migrate-parsetree@opam:1.2.0@23e55f71": {
-      "id": "@opam/ocaml-migrate-parsetree@opam:1.2.0@23e55f71",
+    "@opam/ocaml-migrate-parsetree@opam:1.5.0@3e319dbc": {
+      "id": "@opam/ocaml-migrate-parsetree@opam:1.5.0@3e319dbc",
       "name": "@opam/ocaml-migrate-parsetree",
-      "version": "opam:1.2.0",
+      "version": "opam:1.5.0",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/cc/cc6fb09ad6f99156c7dba47711c62c6f#md5:cc6fb09ad6f99156c7dba47711c62c6f",
-          "archive:https://github.com/ocaml-ppx/ocaml-migrate-parsetree/releases/download/v1.2.0/ocaml-migrate-parsetree-v1.2.0.tbz#md5:cc6fb09ad6f99156c7dba47711c62c6f"
+          "archive:https://opam.ocaml.org/cache/sha256/7f/7f56679c9561552762666de5b6b81c8e4cc2e9fd92272e2269878a2eb534e3c0#sha256:7f56679c9561552762666de5b6b81c8e4cc2e9fd92272e2269878a2eb534e3c0",
+          "archive:https://github.com/ocaml-ppx/ocaml-migrate-parsetree/releases/download/v1.5.0/ocaml-migrate-parsetree-v1.5.0.tbz#sha256:7f56679c9561552762666de5b6b81c8e4cc2e9fd92272e2269878a2eb534e3c0"
         ],
         "opam": {
           "name": "ocaml-migrate-parsetree",
-          "version": "1.2.0",
-          "path": "esy.lock/opam/ocaml-migrate-parsetree.1.2.0"
+          "version": "1.5.0",
+          "path": "esy.lock/opam/ocaml-migrate-parsetree.1.5.0"
         }
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.6.10@d41d8cd9", "@opam/result@opam:1.3@bee8bf2e",
-        "@opam/ppx_derivers@opam:1.2.1@0b458500",
-        "@opam/dune@opam:1.9.0@a7408d38", "@esy-ocaml/substs@0.0.1@d41d8cd9"
+        "ocaml@4.6.1000@d41d8cd9", "@opam/result@opam:1.4@dc720aef",
+        "@opam/ppx_derivers@opam:1.2.1@ecf0aa45",
+        "@opam/dune@opam:2.0.1@5dc56bd0", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.6.10@d41d8cd9", "@opam/result@opam:1.3@bee8bf2e",
-        "@opam/ppx_derivers@opam:1.2.1@0b458500"
+        "ocaml@4.6.1000@d41d8cd9", "@opam/result@opam:1.4@dc720aef",
+        "@opam/ppx_derivers@opam:1.2.1@ecf0aa45",
+        "@opam/dune@opam:2.0.1@5dc56bd0"
       ]
     },
-    "@opam/merlin-extend@opam:0.3@0af73a50": {
-      "id": "@opam/merlin-extend@opam:0.3@0af73a50",
+    "@opam/merlin-extend@opam:0.5@a5dd7d4b": {
+      "id": "@opam/merlin-extend@opam:0.5@a5dd7d4b",
       "name": "@opam/merlin-extend",
-      "version": "opam:0.3",
+      "version": "opam:0.5",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/9c/9c6dfd4f53328f02f12fcc265f4e2dda#md5:9c6dfd4f53328f02f12fcc265f4e2dda",
-          "archive:https://github.com/let-def/merlin-extend/archive/v0.3.tar.gz#md5:9c6dfd4f53328f02f12fcc265f4e2dda"
+          "archive:https://opam.ocaml.org/cache/sha256/ca/ca3a38c360c7d4827eb4789abf7a6aa4b6e3b4e3c3ef69a5be64dce4601ec227#sha256:ca3a38c360c7d4827eb4789abf7a6aa4b6e3b4e3c3ef69a5be64dce4601ec227",
+          "archive:https://github.com/let-def/merlin-extend/releases/download/v0.5/merlin-extend-v0.5.tbz#sha256:ca3a38c360c7d4827eb4789abf7a6aa4b6e3b4e3c3ef69a5be64dce4601ec227"
         ],
         "opam": {
           "name": "merlin-extend",
-          "version": "0.3",
-          "path": "esy.lock/opam/merlin-extend.0.3"
+          "version": "0.5",
+          "path": "esy.lock/opam/merlin-extend.0.5"
         }
       },
-      "overrides": [
-        {
-          "opamoverride":
-            "esy.lock/overrides/opam__s__merlin_extend_opam__c__0.3_opam_override"
-        }
-      ],
+      "overrides": [],
       "dependencies": [
-        "ocaml@4.6.10@d41d8cd9", "@opam/ocamlfind@opam:1.8.0@f744a0c5",
-        "@opam/cppo@opam:1.6.5@bec3dbd9", "@esy-ocaml/substs@0.0.1@d41d8cd9"
+        "ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:2.0.1@5dc56bd0",
+        "@opam/cppo@opam:1.6.6@f4f83858", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
-      "devDependencies": [ "ocaml@4.6.10@d41d8cd9" ]
+      "devDependencies": [
+        "ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:2.0.1@5dc56bd0"
+      ]
     },
-    "@opam/merlin@opam:3.2.2@829ee6dd": {
-      "id": "@opam/merlin@opam:3.2.2@829ee6dd",
+    "@opam/merlin@opam:3.3.3@d653b06a": {
+      "id": "@opam/merlin@opam:3.3.3@d653b06a",
       "name": "@opam/merlin",
-      "version": "opam:3.2.2",
+      "version": "opam:3.3.3",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/ed/ede35b65f8ac9c440cfade5445662c54#md5:ede35b65f8ac9c440cfade5445662c54",
-          "archive:https://github.com/ocaml/merlin/releases/download/v3.2.2/merlin-v3.2.2.tbz#md5:ede35b65f8ac9c440cfade5445662c54"
+          "archive:https://opam.ocaml.org/cache/sha256/72/72909ef47eea1f6fca13b4109a34dccf8fe3923a3c026f1ed1db9eb5ee9aae15#sha256:72909ef47eea1f6fca13b4109a34dccf8fe3923a3c026f1ed1db9eb5ee9aae15",
+          "archive:https://github.com/ocaml/merlin/releases/download/v3.3.3/merlin-v3.3.3.tbz#sha256:72909ef47eea1f6fca13b4109a34dccf8fe3923a3c026f1ed1db9eb5ee9aae15"
         ],
         "opam": {
           "name": "merlin",
-          "version": "3.2.2",
-          "path": "esy.lock/opam/merlin.3.2.2"
+          "version": "3.3.3",
+          "path": "esy.lock/opam/merlin.3.3.3"
         }
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.6.10@d41d8cd9", "@opam/yojson@opam:1.7.0@2d92307e",
-        "@opam/ocamlfind@opam:1.8.0@f744a0c5",
-        "@opam/dune@opam:1.9.0@a7408d38", "@esy-ocaml/substs@0.0.1@d41d8cd9"
+        "ocaml@4.6.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985",
+        "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
+        "@opam/dune@opam:2.0.1@5dc56bd0", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.6.10@d41d8cd9", "@opam/yojson@opam:1.7.0@2d92307e",
-        "@opam/ocamlfind@opam:1.8.0@f744a0c5"
+        "ocaml@4.6.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985",
+        "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
+        "@opam/dune@opam:2.0.1@5dc56bd0"
       ]
     },
-    "@opam/menhir@opam:20181113@0c8257a8": {
-      "id": "@opam/menhir@opam:20181113@0c8257a8",
+    "@opam/menhir@opam:20190924@004407ff": {
+      "id": "@opam/menhir@opam:20190924@004407ff",
       "name": "@opam/menhir",
-      "version": "opam:20181113",
+      "version": "opam:20190924",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/69/69ce441a06ea131cd43e7b44c4303f3c#md5:69ce441a06ea131cd43e7b44c4303f3c",
-          "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20181113/archive.tar.gz#md5:69ce441a06ea131cd43e7b44c4303f3c"
+          "archive:https://opam.ocaml.org/cache/md5/67/677f1997fb73177d5a00fa1b8d61c3ef#md5:677f1997fb73177d5a00fa1b8d61c3ef",
+          "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20190924/archive.tar.gz#md5:677f1997fb73177d5a00fa1b8d61c3ef"
         ],
         "opam": {
           "name": "menhir",
-          "version": "20181113",
-          "path": "esy.lock/opam/menhir.20181113"
+          "version": "20190924",
+          "path": "esy.lock/opam/menhir.20190924"
         }
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.6.10@d41d8cd9", "@opam/ocamlfind@opam:1.8.0@f744a0c5",
-        "@opam/ocamlbuild@opam:0.14.0@427a2331",
+        "ocaml@4.6.1000@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
+        "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
-      "devDependencies": [ "ocaml@4.6.10@d41d8cd9" ]
+      "devDependencies": [ "ocaml@4.6.1000@d41d8cd9" ]
     },
-    "@opam/logs@opam:0.6.3@80c08d15": {
-      "id": "@opam/logs@opam:0.6.3@80c08d15",
+    "@opam/logs@opam:0.7.0@1d03143e": {
+      "id": "@opam/logs@opam:0.7.0@1d03143e",
       "name": "@opam/logs",
-      "version": "opam:0.6.3",
+      "version": "opam:0.7.0",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/37/370e4c802588f73d0777c59bc414b57b#md5:370e4c802588f73d0777c59bc414b57b",
-          "archive:https://erratique.ch/software/logs/releases/logs-0.6.3.tbz#md5:370e4c802588f73d0777c59bc414b57b"
+          "archive:https://opam.ocaml.org/cache/md5/2b/2bf021ca13331775e33cf34ab60246f7#md5:2bf021ca13331775e33cf34ab60246f7",
+          "archive:https://erratique.ch/software/logs/releases/logs-0.7.0.tbz#md5:2bf021ca13331775e33cf34ab60246f7"
         ],
         "opam": {
           "name": "logs",
-          "version": "0.6.3",
-          "path": "esy.lock/opam/logs.0.6.3"
+          "version": "0.7.0",
+          "path": "esy.lock/opam/logs.0.7.0"
         }
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.6.10@d41d8cd9", "@opam/topkg@opam:1.0.0@61f4ccf9",
-        "@opam/ocamlfind@opam:1.8.0@f744a0c5",
-        "@opam/ocamlbuild@opam:0.14.0@427a2331",
-        "@opam/fmt@opam:0.8.6@a06c130d",
-        "@opam/cmdliner@opam:1.0.3@96d31520",
+        "ocaml@4.6.1000@d41d8cd9", "@opam/topkg@opam:1.0.1@a42c631e",
+        "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
+        "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
+        "@opam/fmt@opam:0.8.8@01c3a23c",
+        "@opam/cmdliner@opam:1.0.4@93208aac",
+        "@opam/base-threads@opam:base@36803084",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
-      "devDependencies": [ "ocaml@4.6.10@d41d8cd9" ]
+      "devDependencies": [ "ocaml@4.6.1000@d41d8cd9" ]
     },
-    "@opam/jbuilder@opam:transition@58bdfe0a": {
-      "id": "@opam/jbuilder@opam:transition@58bdfe0a",
+    "@opam/jbuilder@opam:1.0+beta20.2@053ddcf2": {
+      "id": "@opam/jbuilder@opam:1.0+beta20.2@053ddcf2",
       "name": "@opam/jbuilder",
-      "version": "opam:transition",
+      "version": "opam:1.0+beta20.2",
       "source": {
         "type": "install",
-        "source": [ "no-source:" ],
+        "source": [
+          "archive:https://opam.ocaml.org/cache/md5/fb/fbe8c3b1facb206cac3fb8932b5dd5d9#md5:fbe8c3b1facb206cac3fb8932b5dd5d9",
+          "archive:https://github.com/ocaml/dune/releases/download/1.0%2Bbeta20.2/jbuilder-1.0+beta20.2.tbz#md5:fbe8c3b1facb206cac3fb8932b5dd5d9"
+        ],
         "opam": {
           "name": "jbuilder",
-          "version": "transition",
-          "path": "esy.lock/opam/jbuilder.transition"
+          "version": "1.0+beta20.2",
+          "path": "esy.lock/opam/jbuilder.1.0+beta20.2"
         }
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.6.10@d41d8cd9", "@opam/dune@opam:1.9.0@a7408d38",
-        "@esy-ocaml/substs@0.0.1@d41d8cd9"
+        "ocaml@4.6.1000@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
-      "devDependencies": [
-        "ocaml@4.6.10@d41d8cd9", "@opam/dune@opam:1.9.0@a7408d38"
-      ]
+      "devDependencies": [ "ocaml@4.6.1000@d41d8cd9" ]
     },
     "@opam/fpath@opam:0.7.2@45477b93": {
       "id": "@opam/fpath@opam:0.7.2@45477b93",
@@ -588,149 +634,131 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.6.10@d41d8cd9", "@opam/topkg@opam:1.0.0@61f4ccf9",
-        "@opam/result@opam:1.3@bee8bf2e",
-        "@opam/ocamlfind@opam:1.8.0@f744a0c5",
-        "@opam/ocamlbuild@opam:0.14.0@427a2331",
+        "ocaml@4.6.1000@d41d8cd9", "@opam/topkg@opam:1.0.1@a42c631e",
+        "@opam/result@opam:1.4@dc720aef",
+        "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
+        "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@opam/astring@opam:0.8.3@4e5e17d5",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.6.10@d41d8cd9", "@opam/result@opam:1.3@bee8bf2e",
+        "ocaml@4.6.1000@d41d8cd9", "@opam/result@opam:1.4@dc720aef",
         "@opam/astring@opam:0.8.3@4e5e17d5"
       ]
     },
-    "@opam/fmt@opam:0.8.6@a06c130d": {
-      "id": "@opam/fmt@opam:0.8.6@a06c130d",
+    "@opam/fmt@opam:0.8.8@01c3a23c": {
+      "id": "@opam/fmt@opam:0.8.8@01c3a23c",
       "name": "@opam/fmt",
-      "version": "opam:0.8.6",
+      "version": "opam:0.8.8",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/54/5407789e5f0ea42272ca19353b1abfd3#md5:5407789e5f0ea42272ca19353b1abfd3",
-          "archive:https://erratique.ch/software/fmt/releases/fmt-0.8.6.tbz#md5:5407789e5f0ea42272ca19353b1abfd3"
+          "archive:https://opam.ocaml.org/cache/md5/47/473490fcfdf3ff0a8ccee226b873d4b2#md5:473490fcfdf3ff0a8ccee226b873d4b2",
+          "archive:https://erratique.ch/software/fmt/releases/fmt-0.8.8.tbz#md5:473490fcfdf3ff0a8ccee226b873d4b2"
         ],
         "opam": {
           "name": "fmt",
-          "version": "0.8.6",
-          "path": "esy.lock/opam/fmt.0.8.6"
+          "version": "0.8.8",
+          "path": "esy.lock/opam/fmt.0.8.8"
         }
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.6.10@d41d8cd9", "@opam/topkg@opam:1.0.0@61f4ccf9",
-        "@opam/stdlib-shims@opam:0.1.0@b4c63262",
-        "@opam/seq@opam:0.1@93954fa7", "@opam/ocamlfind@opam:1.8.0@f744a0c5",
-        "@opam/ocamlbuild@opam:0.14.0@427a2331",
-        "@opam/cmdliner@opam:1.0.3@96d31520",
+        "ocaml@4.6.1000@d41d8cd9", "@opam/topkg@opam:1.0.1@a42c631e",
+        "@opam/stdlib-shims@opam:0.1.0@d957c903",
+        "@opam/seq@opam:0.2.2@e9144e45",
+        "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
+        "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
+        "@opam/cmdliner@opam:1.0.4@93208aac",
         "@opam/base-unix@opam:base@87d0b2eb",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.6.10@d41d8cd9", "@opam/stdlib-shims@opam:0.1.0@b4c63262",
-        "@opam/seq@opam:0.1@93954fa7"
+        "ocaml@4.6.1000@d41d8cd9", "@opam/stdlib-shims@opam:0.1.0@d957c903",
+        "@opam/seq@opam:0.2.2@e9144e45"
       ]
     },
-    "@opam/easy-format@opam:1.3.1@9abfd4ed": {
-      "id": "@opam/easy-format@opam:1.3.1@9abfd4ed",
+    "@opam/easy-format@opam:1.3.2@0484b3c4": {
+      "id": "@opam/easy-format@opam:1.3.2@0484b3c4",
       "name": "@opam/easy-format",
-      "version": "opam:1.3.1",
+      "version": "opam:1.3.2",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/4e/4e163700fb88fdcd6b8976c3a216c8ea#md5:4e163700fb88fdcd6b8976c3a216c8ea",
-          "archive:https://github.com/mjambon/easy-format/archive/v1.3.1.tar.gz#md5:4e163700fb88fdcd6b8976c3a216c8ea"
+          "archive:https://opam.ocaml.org/cache/sha256/34/3440c2b882d537ae5e9011eb06abb53f5667e651ea4bb3b460ea8230fa8c1926#sha256:3440c2b882d537ae5e9011eb06abb53f5667e651ea4bb3b460ea8230fa8c1926",
+          "archive:https://github.com/mjambon/easy-format/releases/download/1.3.2/easy-format-1.3.2.tbz#sha256:3440c2b882d537ae5e9011eb06abb53f5667e651ea4bb3b460ea8230fa8c1926"
         ],
         "opam": {
           "name": "easy-format",
-          "version": "1.3.1",
-          "path": "esy.lock/opam/easy-format.1.3.1"
+          "version": "1.3.2",
+          "path": "esy.lock/opam/easy-format.1.3.2"
         }
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.6.10@d41d8cd9", "@opam/jbuilder@opam:transition@58bdfe0a",
+        "ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:2.0.1@5dc56bd0",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
-      "devDependencies": [ "ocaml@4.6.10@d41d8cd9" ]
+      "devDependencies": [
+        "ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:2.0.1@5dc56bd0"
+      ]
     },
-    "@opam/dune@opam:1.9.0@a7408d38": {
-      "id": "@opam/dune@opam:1.9.0@a7408d38",
+    "@opam/dune@opam:2.0.1@5dc56bd0": {
+      "id": "@opam/dune@opam:2.0.1@5dc56bd0",
       "name": "@opam/dune",
-      "version": "opam:1.9.0",
+      "version": "opam:2.0.1",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/73/732b2d9d273b3e3d8472a8094ec2e1ad#md5:732b2d9d273b3e3d8472a8094ec2e1ad",
-          "archive:https://github.com/ocaml/dune/releases/download/1.9.0/dune-1.9.0.tbz#md5:732b2d9d273b3e3d8472a8094ec2e1ad"
+          "archive:https://opam.ocaml.org/cache/sha256/e0/e04090c846f005f1cc02c390e963a7efe74c653ce2c5c7fd2e7e30a06ceadcb7#sha256:e04090c846f005f1cc02c390e963a7efe74c653ce2c5c7fd2e7e30a06ceadcb7",
+          "archive:https://github.com/ocaml/dune/releases/download/2.0.1/dune-2.0.1.tbz#sha256:e04090c846f005f1cc02c390e963a7efe74c653ce2c5c7fd2e7e30a06ceadcb7"
         ],
         "opam": {
           "name": "dune",
-          "version": "1.9.0",
-          "path": "esy.lock/opam/dune.1.9.0"
+          "version": "2.0.1",
+          "path": "esy.lock/opam/dune.2.0.1"
         }
       },
-      "overrides": [
-        {
-          "opamoverride":
-            "esy.lock/overrides/opam__s__dune_opam__c__1.9.0_opam_override"
-        }
-      ],
+      "overrides": [],
       "dependencies": [
-        "ocaml@4.6.10@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb",
+        "ocaml@4.6.1000@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb",
         "@opam/base-threads@opam:base@36803084",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.6.10@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb",
+        "ocaml@4.6.1000@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb",
         "@opam/base-threads@opam:base@36803084"
       ]
     },
-    "@opam/cppo@opam:1.6.5@bec3dbd9": {
-      "id": "@opam/cppo@opam:1.6.5@bec3dbd9",
+    "@opam/cppo@opam:1.6.6@f4f83858": {
+      "id": "@opam/cppo@opam:1.6.6@f4f83858",
       "name": "@opam/cppo",
-      "version": "opam:1.6.5",
+      "version": "opam:1.6.6",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/1c/1cd25741d31417995b0973fe0b6f6c82#md5:1cd25741d31417995b0973fe0b6f6c82",
-          "archive:https://github.com/mjambon/cppo/archive/v1.6.5.tar.gz#md5:1cd25741d31417995b0973fe0b6f6c82"
+          "archive:https://opam.ocaml.org/cache/sha256/e7/e7272996a7789175b87bb998efd079794a8db6625aae990d73f7b4484a07b8a0#sha256:e7272996a7789175b87bb998efd079794a8db6625aae990d73f7b4484a07b8a0",
+          "archive:https://github.com/ocaml-community/cppo/releases/download/v1.6.6/cppo-v1.6.6.tbz#sha256:e7272996a7789175b87bb998efd079794a8db6625aae990d73f7b4484a07b8a0"
         ],
         "opam": {
           "name": "cppo",
-          "version": "1.6.5",
-          "path": "esy.lock/opam/cppo.1.6.5"
+          "version": "1.6.6",
+          "path": "esy.lock/opam/cppo.1.6.6"
         }
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.6.10@d41d8cd9", "@opam/jbuilder@opam:transition@58bdfe0a",
+        "ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:2.0.1@5dc56bd0",
         "@opam/base-unix@opam:base@87d0b2eb",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.6.10@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb"
+        "ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:2.0.1@5dc56bd0",
+        "@opam/base-unix@opam:base@87d0b2eb"
       ]
     },
-    "@opam/conf-which@opam:1@56319cdb": {
-      "id": "@opam/conf-which@opam:1@56319cdb",
-      "name": "@opam/conf-which",
-      "version": "opam:1",
-      "source": {
-        "type": "install",
-        "source": [ "no-source:" ],
-        "opam": {
-          "name": "conf-which",
-          "version": "1",
-          "path": "esy.lock/opam/conf-which.1"
-        }
-      },
-      "overrides": [],
-      "dependencies": [ "@esy-ocaml/substs@0.0.1@d41d8cd9" ],
-      "devDependencies": []
-    },
-    "@opam/conf-m4@opam:1@dd7dde42": {
-      "id": "@opam/conf-m4@opam:1@dd7dde42",
+    "@opam/conf-m4@opam:1@3b2b148a": {
+      "id": "@opam/conf-m4@opam:1@3b2b148a",
       "name": "@opam/conf-m4",
       "version": "opam:1",
       "source": {
@@ -746,27 +774,27 @@
       "dependencies": [ "@esy-ocaml/substs@0.0.1@d41d8cd9" ],
       "devDependencies": []
     },
-    "@opam/cmdliner@opam:1.0.3@96d31520": {
-      "id": "@opam/cmdliner@opam:1.0.3@96d31520",
+    "@opam/cmdliner@opam:1.0.4@93208aac": {
+      "id": "@opam/cmdliner@opam:1.0.4@93208aac",
       "name": "@opam/cmdliner",
-      "version": "opam:1.0.3",
+      "version": "opam:1.0.4",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/36/3674ad01d4445424105d33818c78fba8#md5:3674ad01d4445424105d33818c78fba8",
-          "archive:http://erratique.ch/software/cmdliner/releases/cmdliner-1.0.3.tbz#md5:3674ad01d4445424105d33818c78fba8"
+          "archive:https://opam.ocaml.org/cache/md5/fe/fe2213d0bc63b1e10a2d0aa66d2fc8d9#md5:fe2213d0bc63b1e10a2d0aa66d2fc8d9",
+          "archive:http://erratique.ch/software/cmdliner/releases/cmdliner-1.0.4.tbz#md5:fe2213d0bc63b1e10a2d0aa66d2fc8d9"
         ],
         "opam": {
           "name": "cmdliner",
-          "version": "1.0.3",
-          "path": "esy.lock/opam/cmdliner.1.0.3"
+          "version": "1.0.4",
+          "path": "esy.lock/opam/cmdliner.1.0.4"
         }
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.6.10@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9"
+        "ocaml@4.6.1000@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
-      "devDependencies": [ "ocaml@4.6.10@d41d8cd9" ]
+      "devDependencies": [ "ocaml@4.6.1000@d41d8cd9" ]
     },
     "@opam/bos@opam:0.2.0@df49e63f": {
       "id": "@opam/bos@opam:0.2.0@df49e63f",
@@ -786,49 +814,48 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.6.10@d41d8cd9", "@opam/topkg@opam:1.0.0@61f4ccf9",
+        "ocaml@4.6.1000@d41d8cd9", "@opam/topkg@opam:1.0.1@a42c631e",
         "@opam/rresult@opam:0.6.0@4b185e72",
-        "@opam/ocamlfind@opam:1.8.0@f744a0c5",
-        "@opam/ocamlbuild@opam:0.14.0@427a2331",
-        "@opam/logs@opam:0.6.3@80c08d15", "@opam/fpath@opam:0.7.2@45477b93",
-        "@opam/fmt@opam:0.8.6@a06c130d",
+        "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
+        "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
+        "@opam/logs@opam:0.7.0@1d03143e", "@opam/fpath@opam:0.7.2@45477b93",
+        "@opam/fmt@opam:0.8.8@01c3a23c",
         "@opam/base-unix@opam:base@87d0b2eb",
         "@opam/astring@opam:0.8.3@4e5e17d5",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.6.10@d41d8cd9", "@opam/rresult@opam:0.6.0@4b185e72",
-        "@opam/logs@opam:0.6.3@80c08d15", "@opam/fpath@opam:0.7.2@45477b93",
-        "@opam/fmt@opam:0.8.6@a06c130d",
+        "ocaml@4.6.1000@d41d8cd9", "@opam/rresult@opam:0.6.0@4b185e72",
+        "@opam/logs@opam:0.7.0@1d03143e", "@opam/fpath@opam:0.7.2@45477b93",
+        "@opam/fmt@opam:0.8.8@01c3a23c",
         "@opam/base-unix@opam:base@87d0b2eb",
         "@opam/astring@opam:0.8.3@4e5e17d5"
       ]
     },
-    "@opam/biniou@opam:1.2.0@c8516f18": {
-      "id": "@opam/biniou@opam:1.2.0@c8516f18",
+    "@opam/biniou@opam:1.2.1@d7570399": {
+      "id": "@opam/biniou@opam:1.2.1@d7570399",
       "name": "@opam/biniou",
-      "version": "opam:1.2.0",
+      "version": "opam:1.2.1",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/f3/f3e92358e832ed94eaf23ce622ccc2f9#md5:f3e92358e832ed94eaf23ce622ccc2f9",
-          "archive:https://github.com/mjambon/biniou/archive/v1.2.0.tar.gz#md5:f3e92358e832ed94eaf23ce622ccc2f9"
+          "archive:https://opam.ocaml.org/cache/sha256/35/35546c68b1929a8e6d27a3b39ecd17b38303a0d47e65eb9d1480c2061ea84335#sha256:35546c68b1929a8e6d27a3b39ecd17b38303a0d47e65eb9d1480c2061ea84335",
+          "archive:https://github.com/mjambon/biniou/releases/download/1.2.1/biniou-1.2.1.tbz#sha256:35546c68b1929a8e6d27a3b39ecd17b38303a0d47e65eb9d1480c2061ea84335"
         ],
         "opam": {
           "name": "biniou",
-          "version": "1.2.0",
-          "path": "esy.lock/opam/biniou.1.2.0"
+          "version": "1.2.1",
+          "path": "esy.lock/opam/biniou.1.2.1"
         }
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.6.10@d41d8cd9", "@opam/jbuilder@opam:transition@58bdfe0a",
-        "@opam/easy-format@opam:1.3.1@9abfd4ed",
-        "@opam/conf-which@opam:1@56319cdb",
-        "@esy-ocaml/substs@0.0.1@d41d8cd9"
+        "ocaml@4.6.1000@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4",
+        "@opam/dune@opam:2.0.1@5dc56bd0", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.6.10@d41d8cd9", "@opam/easy-format@opam:1.3.1@9abfd4ed"
+        "ocaml@4.6.1000@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4",
+        "@opam/dune@opam:2.0.1@5dc56bd0"
       ]
     },
     "@opam/base-unix@opam:base@87d0b2eb": {
@@ -880,11 +907,101 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.6.10@d41d8cd9", "@opam/ocamlfind@opam:1.8.0@f744a0c5",
+        "ocaml@4.6.1000@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
+        "@esy-ocaml/substs@0.0.1@d41d8cd9"
+      ],
+      "devDependencies": [
+        "ocaml@4.6.1000@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9"
+      ]
+    },
+    "@opam/atdgen-runtime@opam:2.0.0@60f6faab": {
+      "id": "@opam/atdgen-runtime@opam:2.0.0@60f6faab",
+      "name": "@opam/atdgen-runtime",
+      "version": "opam:2.0.0",
+      "source": {
+        "type": "install",
+        "source": [
+          "archive:https://opam.ocaml.org/cache/md5/14/14e47609397c524ea0eae7c3f14f7ccf#md5:14e47609397c524ea0eae7c3f14f7ccf",
+          "archive:https://github.com/mjambon/atd/releases/download/2.0.0/atd-2.0.0.tbz#md5:14e47609397c524ea0eae7c3f14f7ccf"
+        ],
+        "opam": {
+          "name": "atdgen-runtime",
+          "version": "2.0.0",
+          "path": "esy.lock/opam/atdgen-runtime.2.0.0"
+        }
+      },
+      "overrides": [],
+      "dependencies": [
+        "ocaml@4.6.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985",
+        "@opam/jbuilder@opam:1.0+beta20.2@053ddcf2",
+        "@opam/biniou@opam:1.2.1@d7570399",
+        "@esy-ocaml/substs@0.0.1@d41d8cd9"
+      ],
+      "devDependencies": [
+        "ocaml@4.6.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985",
+        "@opam/jbuilder@opam:1.0+beta20.2@053ddcf2",
+        "@opam/biniou@opam:1.2.1@d7570399"
+      ]
+    },
+    "@opam/atdgen@opam:2.0.0@46af0360": {
+      "id": "@opam/atdgen@opam:2.0.0@46af0360",
+      "name": "@opam/atdgen",
+      "version": "opam:2.0.0",
+      "source": {
+        "type": "install",
+        "source": [
+          "archive:https://opam.ocaml.org/cache/md5/14/14e47609397c524ea0eae7c3f14f7ccf#md5:14e47609397c524ea0eae7c3f14f7ccf",
+          "archive:https://github.com/mjambon/atd/releases/download/2.0.0/atd-2.0.0.tbz#md5:14e47609397c524ea0eae7c3f14f7ccf"
+        ],
+        "opam": {
+          "name": "atdgen",
+          "version": "2.0.0",
+          "path": "esy.lock/opam/atdgen.2.0.0"
+        }
+      },
+      "overrides": [],
+      "dependencies": [
+        "ocaml@4.6.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985",
+        "@opam/jbuilder@opam:1.0+beta20.2@053ddcf2",
+        "@opam/biniou@opam:1.2.1@d7570399",
+        "@opam/atdgen-runtime@opam:2.0.0@60f6faab",
+        "@opam/atd@opam:2.0.0@e0ddd12f", "@esy-ocaml/substs@0.0.1@d41d8cd9"
+      ],
+      "devDependencies": [
+        "ocaml@4.6.1000@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985",
+        "@opam/jbuilder@opam:1.0+beta20.2@053ddcf2",
+        "@opam/biniou@opam:1.2.1@d7570399",
+        "@opam/atdgen-runtime@opam:2.0.0@60f6faab",
+        "@opam/atd@opam:2.0.0@e0ddd12f"
+      ]
+    },
+    "@opam/atd@opam:2.0.0@e0ddd12f": {
+      "id": "@opam/atd@opam:2.0.0@e0ddd12f",
+      "name": "@opam/atd",
+      "version": "opam:2.0.0",
+      "source": {
+        "type": "install",
+        "source": [
+          "archive:https://opam.ocaml.org/cache/md5/14/14e47609397c524ea0eae7c3f14f7ccf#md5:14e47609397c524ea0eae7c3f14f7ccf",
+          "archive:https://github.com/mjambon/atd/releases/download/2.0.0/atd-2.0.0.tbz#md5:14e47609397c524ea0eae7c3f14f7ccf"
+        ],
+        "opam": {
+          "name": "atd",
+          "version": "2.0.0",
+          "path": "esy.lock/opam/atd.2.0.0"
+        }
+      },
+      "overrides": [],
+      "dependencies": [
+        "ocaml@4.6.1000@d41d8cd9", "@opam/menhir@opam:20190924@004407ff",
+        "@opam/jbuilder@opam:1.0+beta20.2@053ddcf2",
+        "@opam/easy-format@opam:1.3.2@0484b3c4",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.6.10@d41d8cd9", "@opam/ocamlfind@opam:1.8.0@f744a0c5"
+        "ocaml@4.6.1000@d41d8cd9",
+        "@opam/jbuilder@opam:1.0+beta20.2@053ddcf2",
+        "@opam/easy-format@opam:1.3.2@0484b3c4"
       ]
     },
     "@opam/astring@opam:0.8.3@4e5e17d5": {
@@ -905,14 +1022,14 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.6.10@d41d8cd9", "@opam/topkg@opam:1.0.0@61f4ccf9",
-        "@opam/ocamlfind@opam:1.8.0@f744a0c5",
-        "@opam/ocamlbuild@opam:0.14.0@427a2331",
+        "ocaml@4.6.1000@d41d8cd9", "@opam/topkg@opam:1.0.1@a42c631e",
+        "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
+        "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@opam/base-bytes@opam:base@19d0c2ff",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.6.10@d41d8cd9", "@opam/base-bytes@opam:base@19d0c2ff"
+        "ocaml@4.6.1000@d41d8cd9", "@opam/base-bytes@opam:base@19d0c2ff"
       ]
     },
     "@esy-ocaml/substs@0.0.1@d41d8cd9": {
@@ -929,24 +1046,24 @@
       "dependencies": [],
       "devDependencies": []
     },
-    "@esy-ocaml/reason@3.4.0@d41d8cd9": {
-      "id": "@esy-ocaml/reason@3.4.0@d41d8cd9",
+    "@esy-ocaml/reason@3.5.2@d41d8cd9": {
+      "id": "@esy-ocaml/reason@3.5.2@d41d8cd9",
       "name": "@esy-ocaml/reason",
-      "version": "3.4.0",
+      "version": "3.5.2",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://registry.npmjs.org/@esy-ocaml/reason/-/reason-3.4.0.tgz#sha1:8c84c183a95d489a3e82ff0465effe4b56ff12af"
+          "archive:https://registry.npmjs.org/@esy-ocaml/reason/-/reason-3.5.2.tgz#sha1:ac48b63fd66fbbc1d77ab6a2b7e3a1ba21a8f40b"
         ]
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.6.10@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@0af73a50",
-        "@opam/menhir@opam:20181113@0c8257a8",
-        "@opam/dune@opam:1.9.0@a7408d38"
+        "ocaml@4.6.1000@d41d8cd9", "@opam/result@opam:1.4@dc720aef",
+        "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
+        "@opam/ocaml-migrate-parsetree@opam:1.5.0@3e319dbc",
+        "@opam/merlin-extend@opam:0.5@a5dd7d4b",
+        "@opam/menhir@opam:20190924@004407ff",
+        "@opam/dune@opam:2.0.1@5dc56bd0"
       ],
       "devDependencies": []
     }
diff --git a/esy.lock/opam/atd.2.0.0/opam b/esy.lock/opam/atd.2.0.0/opam
new file mode 100644
index 0000000..2808354
--- /dev/null
+++ b/esy.lock/opam/atd.2.0.0/opam
@@ -0,0 +1,34 @@
+opam-version: "2.0"
+maintainer: "martin@mjambon.com"
+authors: ["Martin Jambon"]
+
+homepage: "https://github.com/mjambon/atd"
+bug-reports: "https://github.com/mjambon/atd/issues"
+dev-repo: "git://github.com/mjambon/atd.git"
+
+build: [
+  ["jbuilder" "subst" "-p" name] {pinned}
+  ["jbuilder" "build" "-p" name "-j" jobs]
+]
+
+# Restore when https://github.com/mjambon/atd/issues/121 is resolved.
+# build-test: [
+#   ["jbuilder" "runtest" "-p" name]
+# ]
+
+depends: [
+  "ocaml" {>= "4.03.0"}
+  "jbuilder"
+  "menhir" {build}
+  "easy-format"
+]
+synopsis: "Parser for the ATD data format description language"
+description: """
+ATD is the OCaml library providing a parser for the ATD language and
+various utilities. ATD stands for Adjustable Type Definitions in
+reference to its main property of supporting annotations that allow a
+good fit with a variety of data formats."""
+url {
+  src: "https://github.com/mjambon/atd/releases/download/2.0.0/atd-2.0.0.tbz"
+  checksum: "md5=14e47609397c524ea0eae7c3f14f7ccf"
+}
diff --git a/esy.lock/opam/atdgen-runtime.2.0.0/opam b/esy.lock/opam/atdgen-runtime.2.0.0/opam
new file mode 100644
index 0000000..7236d93
--- /dev/null
+++ b/esy.lock/opam/atdgen-runtime.2.0.0/opam
@@ -0,0 +1,29 @@
+opam-version: "2.0"
+maintainer: "martin@mjambon.com"
+authors: ["Martin Jambon"]
+
+homepage: "https://github.com/mjambon/atd"
+bug-reports: "https://github.com/mjambon/atd/issues"
+dev-repo: "git://github.com/mjambon/atd.git"
+
+build: [
+  ["jbuilder" "subst" "-p" name] {pinned}
+  ["jbuilder" "build" "-p" name "-j" jobs]
+]
+
+# Restore when https://github.com/mjambon/atd/issues/121 is resolved.
+# build-test: [
+#   ["jbuilder" "runtest" "-p" name]
+# ]
+
+depends: [
+  "ocaml" {>= "4.02.3"}
+  "jbuilder"
+  "biniou" {>= "1.0.6"}
+  "yojson" {>= "1.2.1"}
+]
+synopsis: "Runtime library for code generated by atdgen."
+url {
+  src: "https://github.com/mjambon/atd/releases/download/2.0.0/atd-2.0.0.tbz"
+  checksum: "md5=14e47609397c524ea0eae7c3f14f7ccf"
+}
diff --git a/esy.lock/opam/atdgen.2.0.0/opam b/esy.lock/opam/atdgen.2.0.0/opam
new file mode 100644
index 0000000..d71d304
--- /dev/null
+++ b/esy.lock/opam/atdgen.2.0.0/opam
@@ -0,0 +1,44 @@
+opam-version: "2.0"
+maintainer: "martin@mjambon.com"
+authors: ["Martin Jambon"]
+
+homepage: "https://github.com/mjambon/atd"
+bug-reports: "https://github.com/mjambon/atd/issues"
+dev-repo: "git://github.com/mjambon/atd.git"
+
+build: [
+  ["jbuilder" "subst" "-p" name] {pinned}
+  ["jbuilder" "build" "-p" name "-j" jobs]
+]
+
+# Restore when https://github.com/mjambon/atd/issues/121 is resolved.
+# build-test: [
+#   ["jbuilder" "runtest" "-p" name]
+# ]
+
+depends: [
+  "ocaml" {>= "4.03.0"}
+  "jbuilder"
+  "atd" {>= "2.0.0"}
+  "atdgen-runtime" {>= "2.0.0"}
+  "biniou" {>= "1.0.6"}
+  "yojson" {>= "1.2.1"}
+]
+synopsis:
+  "Generates efficient JSON serializers, deserializers and validators"
+description: """
+Atdgen is a command-line program that takes as input type definitions in the
+ATD syntax and produces OCaml code suitable for data serialization and
+deserialization.
+
+Two data formats are currently supported, these are biniou and JSON.
+Atdgen-biniou and Atdgen-json will refer to Atdgen used in one context or the
+other.
+
+Atdgen was designed with efficiency and durability in mind. Software authors
+are encouraged to use Atdgen directly and to write tools that may reuse part of
+Atdgen’s source code."""
+url {
+  src: "https://github.com/mjambon/atd/releases/download/2.0.0/atd-2.0.0.tbz"
+  checksum: "md5=14e47609397c524ea0eae7c3f14f7ccf"
+}
diff --git a/esy.lock/opam/biniou.1.2.0/opam b/esy.lock/opam/biniou.1.2.0/opam
deleted file mode 100644
index 8c205dc..0000000
--- a/esy.lock/opam/biniou.1.2.0/opam
+++ /dev/null
@@ -1,25 +0,0 @@
-opam-version: "2.0"
-maintainer: "martin@mjambon.com"
-authors: ["Martin Jambon"]
-
-homepage: "https://github.com/mjambon/biniou"
-bug-reports: "https://github.com/mjambon/biniou/issues"
-dev-repo: "git+https://github.com/mjambon/biniou.git"
-license: "BSD-3-Clause"
-
-build: [
-  ["jbuilder" "build" "-p" name "-j" jobs]
-  ["jbuilder" "runtest" "-p" name] {with-test}
-]
-depends: [
-  "ocaml" {>= "4.02.3"}
-  "conf-which" {build}
-  "jbuilder" {build & >= "1.0+beta7"}
-  "easy-format"
-]
-synopsis:
-  "Binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve"
-url {
-  src: "https://github.com/mjambon/biniou/archive/v1.2.0.tar.gz"
-  checksum: "md5=f3e92358e832ed94eaf23ce622ccc2f9"
-}
diff --git a/esy.lock/opam/biniou.1.2.1/opam b/esy.lock/opam/biniou.1.2.1/opam
new file mode 100644
index 0000000..b706b42
--- /dev/null
+++ b/esy.lock/opam/biniou.1.2.1/opam
@@ -0,0 +1,45 @@
+opam-version: "2.0"
+build: [
+  ["dune" "subst"] {pinned}
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+  ["dune" "build" "-p" name "@doc"] {with-doc}
+]
+maintainer: ["martin@mjambon.com"]
+authors: ["Martin Jambon"]
+bug-reports: "https://github.com/mjambon/biniou/issues"
+homepage: "https://github.com/mjambon/biniou"
+doc: "https://mjambon.github.io/biniou/"
+license: "BSD-3-Clause"
+dev-repo: "git+https://github.com/mjambon/biniou.git"
+synopsis:
+  "Binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve"
+description: """
+
+Biniou (pronounced "be new") is a binary data format designed for speed, safety,
+ease of use and backward compatibility as protocols evolve. Biniou is vastly
+equivalent to JSON in terms of functionality but allows implementations several
+times faster (4 times faster than yojson), with 25-35% space savings.
+
+Biniou data can be decoded into human-readable form without knowledge of type
+definitions except for field and variant names which are represented by 31-bit
+hashes. A program named bdump is provided for routine visualization of biniou
+data files.
+
+The program atdgen is used to derive OCaml-Biniou serializers and deserializers
+from type definitions.
+
+Biniou format specification: mjambon.github.io/atdgen-doc/biniou-format.txt"""
+depends: [
+  "easy-format"
+  "dune" {>= "1.10"}
+  "ocaml" {>= "4.02.3"}
+]
+url {
+  src:
+    "https://github.com/mjambon/biniou/releases/download/1.2.1/biniou-1.2.1.tbz"
+  checksum: [
+    "sha256=35546c68b1929a8e6d27a3b39ecd17b38303a0d47e65eb9d1480c2061ea84335"
+    "sha512=82670cc77bf3e869ee26e5fbe5a5affa45a22bc8b6c4bd7e85473912780e0111baca59b34a2c14feae3543ce6e239d7fddaeab24b686a65bfe642cdb91d27ebf"
+  ]
+}
diff --git a/esy.lock/opam/cmdliner.1.0.3/opam b/esy.lock/opam/cmdliner.1.0.4/opam
similarity index 96%
rename from esy.lock/opam/cmdliner.1.0.3/opam
rename to esy.lock/opam/cmdliner.1.0.4/opam
index 661a34b..b2187dc 100644
--- a/esy.lock/opam/cmdliner.1.0.3/opam
+++ b/esy.lock/opam/cmdliner.1.0.4/opam
@@ -31,6 +31,6 @@ Cmdliner has no dependencies and is distributed under the ISC license.
 [2]: http://www.gnu.org/software/libc/manual/html_node/Argument-Syntax.html
 """
 url {
-archive: "http://erratique.ch/software/cmdliner/releases/cmdliner-1.0.3.tbz"
-checksum: "3674ad01d4445424105d33818c78fba8"
+archive: "http://erratique.ch/software/cmdliner/releases/cmdliner-1.0.4.tbz"
+checksum: "fe2213d0bc63b1e10a2d0aa66d2fc8d9"
 }
diff --git a/esy.lock/opam/conf-m4.1/opam b/esy.lock/opam/conf-m4.1/opam
index 981e702..c6feb2a 100644
--- a/esy.lock/opam/conf-m4.1/opam
+++ b/esy.lock/opam/conf-m4.1/opam
@@ -3,11 +3,10 @@ maintainer: "tim@gfxmonk.net"
 homepage: "http://www.gnu.org/software/m4/m4.html"
 bug-reports: "https://github.com/ocaml/opam-repository/issues"
 authors: "GNU Project"
-license: "GPL-3"
+license: "GPL-3.0-only"
 build: [["sh" "-exc" "echo | m4"]]
 depexts: [
-  ["m4"] {os-distribution = "debian"}
-  ["m4"] {os-distribution = "ubuntu"}
+  ["m4"] {os-family = "debian"}
   ["m4"] {os-distribution = "fedora"}
   ["m4"] {os-distribution = "rhel"}
   ["m4"] {os-distribution = "centos"}
diff --git a/esy.lock/opam/conf-which.1/opam b/esy.lock/opam/conf-which.1/opam
deleted file mode 100644
index 802239a..0000000
--- a/esy.lock/opam/conf-which.1/opam
+++ /dev/null
@@ -1,20 +0,0 @@
-opam-version: "2.0"
-maintainer: "unixjunkie@sdf.org"
-homepage: "http://www.gnu.org/software/which/"
-authors: "Carlo Wood"
-bug-reports: "https://github.com/ocaml/opam-repository/issues"
-license: "GPL-2+"
-build: [["which" "which"]]
-depexts: [
-  ["which"] {os-distribution = "centos"}
-  ["which"] {os-distribution = "fedora"}
-  ["which"] {os-family = "suse"}
-  ["debianutils"] {os-distribution = "debian"}
-  ["debianutils"] {os-distribution = "ubuntu"}
-  ["which"] {os-distribution = "nixos"}
-  ["which"] {os-distribution = "arch"}
-]
-synopsis: "Virtual package relying on which"
-description:
-  "This package can only install if the which program is installed on the system."
-flags: conf
diff --git a/esy.lock/opam/cppo.1.6.5/opam b/esy.lock/opam/cppo.1.6.5/opam
deleted file mode 100644
index 74f8e92..0000000
--- a/esy.lock/opam/cppo.1.6.5/opam
+++ /dev/null
@@ -1,23 +0,0 @@
-opam-version: "2.0"
-maintainer: "martin@mjambon.com"
-authors: ["Martin Jambon"]
-homepage: "https://github.com/mjambon/cppo"
-dev-repo: "git+https://github.com/mjambon/cppo.git"
-bug-reports: "https://github.com/mjambon/cppo/issues"
-license: "BSD-3-Clause"
-
-build: [
-  ["jbuilder" "subst" "-p" name] {pinned}
-  ["jbuilder" "build" "-p" name "-j" jobs]
-  ["jbuilder" "runtest" "-p" name] {with-test}
-]
-depends: [
-  "ocaml"
-  "jbuilder" {build & >= "1.0+beta17"}
-  "base-unix"
-]
-synopsis: "Equivalent of the C preprocessor for OCaml programs"
-url {
-  src: "https://github.com/mjambon/cppo/archive/v1.6.5.tar.gz"
-  checksum: "md5=1cd25741d31417995b0973fe0b6f6c82"
-}
diff --git a/esy.lock/opam/cppo.1.6.6/opam b/esy.lock/opam/cppo.1.6.6/opam
new file mode 100644
index 0000000..f683f8b
--- /dev/null
+++ b/esy.lock/opam/cppo.1.6.6/opam
@@ -0,0 +1,37 @@
+opam-version: "2.0"
+maintainer: "martin@mjambon.com"
+authors: "Martin Jambon"
+license: "BSD-3-Clause"
+homepage: "http://mjambon.com/cppo.html"
+doc: "https://ocaml-community.github.io/cppo/"
+bug-reports: "https://github.com/ocaml-community/cppo/issues"
+depends: [
+  "ocaml" {>= "4.03"}
+  "dune" {>= "1.0"}
+  "base-unix"
+]
+build: [
+  ["dune" "subst"] {pinned}
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+]
+dev-repo: "git+https://github.com/ocaml-community/cppo.git"
+synopsis: "Code preprocessor like cpp for OCaml"
+description: """
+Cppo is an equivalent of the C preprocessor for OCaml programs.
+It allows the definition of simple macros and file inclusion.
+
+Cppo is:
+
+* more OCaml-friendly than cpp
+* easy to learn without consulting a manual
+* reasonably fast
+* simple to install and to maintain
+"""
+url {
+  src: "https://github.com/ocaml-community/cppo/releases/download/v1.6.6/cppo-v1.6.6.tbz"
+  checksum: [
+    "sha256=e7272996a7789175b87bb998efd079794a8db6625aae990d73f7b4484a07b8a0"
+    "sha512=44ecf9d225d9e45490a2feac0bde04865ca398dba6c3579e3370fcd1ea255707b8883590852af8b2df87123801062b9f3acce2455c092deabf431f9c4fb8d8eb"
+  ]
+}
diff --git a/esy.lock/opam/dune.1.9.0/opam b/esy.lock/opam/dune.2.0.1/opam
similarity index 53%
rename from esy.lock/opam/dune.1.9.0/opam
rename to esy.lock/opam/dune.2.0.1/opam
index 5f42c05..2bea38a 100644
--- a/esy.lock/opam/dune.1.9.0/opam
+++ b/esy.lock/opam/dune.2.0.1/opam
@@ -1,36 +1,14 @@
 opam-version: "2.0"
-maintainer: "opensource@janestreet.com"
-authors: ["Jane Street Group, LLC <opensource@janestreet.com>"]
-homepage: "https://github.com/ocaml/dune"
-bug-reports: "https://github.com/ocaml/dune/issues"
-dev-repo: "git+https://github.com/ocaml/dune.git"
-license: "MIT"
-depends: [
-  "ocaml" {>= "4.02"}
-  "base-unix"
-  "base-threads"
-]
-build: [
-  # opam 2 sets OPAM_SWITCH_PREFIX, so we don't need a hardcoded path
-  ["ocaml" "configure.ml" "--libdir" lib] {opam-version < "2"}
-  ["ocaml" "bootstrap.ml"]
-  ["./boot.exe" "--release" "--subst"] {pinned}
-  ["./boot.exe" "--release" "-j" jobs]
-]
-conflicts: [
-  "jbuilder" {!= "transition"}
-  "odoc" {< "1.3.0"}
-]
-
-synopsis: "Fast, portable and opinionated build system"
+synopsis: "Fast, portable, and opinionated build system"
 description: """
+
 dune is a build system that was designed to simplify the release of
 Jane Street packages. It reads metadata from "dune" files following a
 very simple s-expression syntax.
 
-dune is fast, it has very low-overhead and support parallel builds on
-all platforms. It has no system dependencies, all you need to build
-dune and packages using dune is OCaml. You don't need or make or bash
+dune is fast, has very low-overhead, and supports parallel builds on
+all platforms. It has no system dependencies; all you need to build
+dune or packages using dune is OCaml. You don't need make or bash
 as long as the packages themselves don't use bash explicitly.
 
 dune supports multi-package development by simply dropping multiple
@@ -41,7 +19,33 @@ several opam roots/switches simultaneously. This helps maintaining
 packages across several versions of OCaml and gives cross-compilation
 for free.
 """
+maintainer: ["Jane Street Group, LLC <opensource@janestreet.com>"]
+authors: ["Jane Street Group, LLC <opensource@janestreet.com>"]
+license: "MIT"
+homepage: "https://github.com/ocaml/dune"
+doc: "https://dune.readthedocs.io/"
+bug-reports: "https://github.com/ocaml/dune/issues"
+depends: [
+  ("ocaml" {>= "4.06"} | ("ocaml" {< "4.06~~"} & "ocamlfind-secondary"))
+  "base-unix"
+  "base-threads"
+]
+conflicts: [
+  "odoc" {< "1.3.0"}
+  "dune-release" {< "1.3.0"}
+  "jbuilder" {= "transition"}
+]
+dev-repo: "git+https://github.com/ocaml/dune.git"
+build: [
+  # opam 2 sets OPAM_SWITCH_PREFIX, so we don't need a hardcoded path
+  ["ocaml" "configure.ml" "--libdir" lib] {opam-version < "2"}
+  ["ocaml" "bootstrap.ml" "-j" jobs]
+  ["./dune.exe" "build" "-p" name "--profile" "dune-bootstrap" "-j" jobs]
+]
 url {
-  src: "https://github.com/ocaml/dune/releases/download/1.9.0/dune-1.9.0.tbz"
-  checksum: "md5=732b2d9d273b3e3d8472a8094ec2e1ad"
+  src: "https://github.com/ocaml/dune/releases/download/2.0.1/dune-2.0.1.tbz"
+  checksum: [
+    "sha256=e04090c846f005f1cc02c390e963a7efe74c653ce2c5c7fd2e7e30a06ceadcb7"
+    "sha512=8c973ccfa1de0ff7173e17dac74ea850446a057866d47c7a100b271c7e440d5e607f1bfaa8fa5b756e0439492276e8c6615fac30cbff9ea900dc8e891f7ba4d3"
+  ]
 }
diff --git a/esy.lock/opam/easy-format.1.3.1/opam b/esy.lock/opam/easy-format.1.3.1/opam
deleted file mode 100644
index 7c36f66..0000000
--- a/esy.lock/opam/easy-format.1.3.1/opam
+++ /dev/null
@@ -1,20 +0,0 @@
-opam-version: "2.0"
-maintainer: "martin@mjambon.com"
-authors: ["Martin Jambon"]
-homepage: "http://mjambon.com/easy-format.html"
-bug-reports: "https://github.com/mjambon/easy-format/issues"
-dev-repo: "git+https://github.com/mjambon/easy-format.git"
-build: [
-  ["jbuilder" "build" "-p" name "-j" jobs]
-  ["jbuilder" "runtest" "-p" name] {with-test}
-]
-depends: [
-  "ocaml" {>= "4.02.3"}
-  "jbuilder" {build}
-]
-synopsis:
-  "High-level and functional interface to the Format module of the OCaml standard library"
-url {
-  src: "https://github.com/mjambon/easy-format/archive/v1.3.1.tar.gz"
-  checksum: "md5=4e163700fb88fdcd6b8976c3a216c8ea"
-}
diff --git a/esy.lock/opam/easy-format.1.3.2/opam b/esy.lock/opam/easy-format.1.3.2/opam
new file mode 100644
index 0000000..138d0fb
--- /dev/null
+++ b/esy.lock/opam/easy-format.1.3.2/opam
@@ -0,0 +1,46 @@
+opam-version: "2.0"
+build: [
+  ["dune" "subst"] {pinned}
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+  ["dune" "build" "-p" name "@doc"] {with-doc}
+]
+maintainer: ["martin@mjambon.com" "rudi.grinberg@gmail.com"]
+authors: ["Martin Jambon"]
+bug-reports: "https://github.com/mjambon/easy-format/issues"
+homepage: "https://github.com/mjambon/easy-format"
+doc: "https://mjambon.github.io/easy-format/"
+license: "BSD-3-Clause"
+dev-repo: "git+https://github.com/mjambon/easy-format.git"
+synopsis:
+  "High-level and functional interface to the Format module of the OCaml standard library"
+description: """
+
+This module offers a high-level and functional interface to the Format module of
+the OCaml standard library. It is a pretty-printing facility, i.e. it takes as
+input some code represented as a tree and formats this code into the most
+visually satisfying result, breaking and indenting lines of code where
+appropriate.
+
+Input data must be first modelled and converted into a tree using 3 kinds of
+nodes:
+
+* atoms
+* lists
+* labelled nodes
+
+Atoms represent any text that is guaranteed to be printed as-is. Lists can model
+any sequence of items such as arrays of data or lists of definitions that are
+labelled with something like "int main", "let x =" or "x:"."""
+depends: [
+  "dune" {>= "1.10"}
+  "ocaml" {>= "4.02.3"}
+]
+url {
+  src:
+    "https://github.com/mjambon/easy-format/releases/download/1.3.2/easy-format-1.3.2.tbz"
+  checksum: [
+    "sha256=3440c2b882d537ae5e9011eb06abb53f5667e651ea4bb3b460ea8230fa8c1926"
+    "sha512=e39377a2ff020ceb9ac29e8515a89d9bdbc91dfcfa871c4e3baafa56753fac2896768e5d9822a050dc1e2ade43c8967afb69391a386c0a8ecd4e1f774e236135"
+  ]
+}
diff --git a/esy.lock/opam/fmt.0.8.6/opam b/esy.lock/opam/fmt.0.8.8/opam
similarity index 90%
rename from esy.lock/opam/fmt.0.8.6/opam
rename to esy.lock/opam/fmt.0.8.8/opam
index 9ca08a6..f493b5f 100644
--- a/esy.lock/opam/fmt.0.8.6/opam
+++ b/esy.lock/opam/fmt.0.8.8/opam
@@ -8,7 +8,7 @@ bug-reports: "https://github.com/dbuenzli/fmt/issues"
 tags: [ "string" "format" "pretty-print" "org:erratique" ]
 license: "ISC"
 depends: [
-  "ocaml" {>= "4.03.0"}
+  "ocaml" {>= "4.05.0"}
   "ocamlfind" {build}
   "ocamlbuild" {build}
   "topkg" {build & >= "0.9.0"}
@@ -39,6 +39,6 @@ Fmt is distributed under the ISC license.
 [cmdliner]: http://erratique.ch/software/cmdliner
 """
 url {
-archive: "https://erratique.ch/software/fmt/releases/fmt-0.8.6.tbz"
-checksum: "5407789e5f0ea42272ca19353b1abfd3"
+archive: "https://erratique.ch/software/fmt/releases/fmt-0.8.8.tbz"
+checksum: "473490fcfdf3ff0a8ccee226b873d4b2"
 }
diff --git a/esy.lock/opam/jbuilder.1.0+beta20.2/opam b/esy.lock/opam/jbuilder.1.0+beta20.2/opam
new file mode 100644
index 0000000..2e411c9
--- /dev/null
+++ b/esy.lock/opam/jbuilder.1.0+beta20.2/opam
@@ -0,0 +1,39 @@
+opam-version: "2.0"
+maintainer: "opensource@janestreet.com"
+authors: ["Jane Street Group, LLC <opensource@janestreet.com>"]
+homepage: "https://github.com/ocaml/dune"
+bug-reports: "https://github.com/ocaml/dune/issues"
+dev-repo: "git+https://github.com/ocaml/dune.git"
+license: "Apache-2.0"
+build: [
+  ["ocaml" "configure.ml" "--libdir" lib]
+  ["ocaml" "bootstrap.ml"]
+  ["./boot.exe" "--subst"] {pinned}
+  ["./boot.exe" "-j" jobs]
+]
+synopsis: "Fast, portable and opinionated build system"
+description: """
+jbuilder is a build system that was designed to simplify the release
+of Jane Street packages. It reads metadata from "jbuild" files
+following a very simple s-expression syntax.
+
+jbuilder is fast, it has very low-overhead and support parallel builds
+on all platforms. It has no system dependencies, all you need to build
+jbuilder and packages using jbuilder is OCaml. You don't need or make
+or bash as long as the packages themselves don't use bash explicitely.
+
+jbuilder supports multi-package development by simply dropping multiple
+repositories into the same directory.
+
+It also supports multi-context builds, such as building against
+several opam roots/switches simultaneously. This helps maintaining
+packages across several versions of OCaml and gives cross-compilation
+for free."""
+depends: [
+  "ocaml" {>= "4.02.3"}
+]
+url {
+  src:
+    "https://github.com/ocaml/dune/releases/download/1.0%2Bbeta20.2/jbuilder-1.0+beta20.2.tbz"
+  checksum: "md5=fbe8c3b1facb206cac3fb8932b5dd5d9"
+}
diff --git a/esy.lock/opam/jbuilder.transition/opam b/esy.lock/opam/jbuilder.transition/opam
deleted file mode 100644
index 3e3174a..0000000
--- a/esy.lock/opam/jbuilder.transition/opam
+++ /dev/null
@@ -1,15 +0,0 @@
-opam-version: "2.0"
-maintainer: "opensource@janestreet.com"
-authors: ["Jane Street Group, LLC <opensource@janestreet.com>"]
-homepage: "https://github.com/ocaml/dune"
-bug-reports: "https://github.com/ocaml/dune/issues"
-dev-repo: "git+https://github.com/ocaml/dune.git"
-license: "MIT"
-depends: ["ocaml" "dune"]
-post-messages: [
-  "Jbuilder has been renamed and the jbuilder package is now a transition \
-   package. Use the dune package instead."
-]
-synopsis:
-  "This is a transition package, jbuilder is now named dune. Use the dune"
-description: "package instead."
diff --git a/esy.lock/opam/logs.0.6.3/opam b/esy.lock/opam/logs.0.7.0/opam
similarity index 88%
rename from esy.lock/opam/logs.0.6.3/opam
rename to esy.lock/opam/logs.0.7.0/opam
index e29c1fe..e69bb7f 100644
--- a/esy.lock/opam/logs.0.6.3/opam
+++ b/esy.lock/opam/logs.0.7.0/opam
@@ -17,7 +17,9 @@ depopts: [
   "js_of_ocaml"
   "fmt"
   "cmdliner"
-  "lwt" ]
+  "lwt"
+  "base-threads"
+]
 conflicts: [
   "js_of_ocaml" { < "3.3.0" } ]
 
@@ -27,7 +29,9 @@ build: [[
           "--with-js_of_ocaml" "%{js_of_ocaml:installed}%"
           "--with-fmt" "%{fmt:installed}%"
           "--with-cmdliner" "%{cmdliner:installed}%"
-          "--with-lwt" "%{lwt:installed}%" ]]
+          "--with-lwt" "%{lwt:installed}%"
+          "--with-base-threads" "%{base-threads:installed}%"
+]]
 
 synopsis: """Logging infrastructure for OCaml"""
 description: """\
@@ -55,6 +59,6 @@ Logs and its reporters are distributed under the ISC license.
 [lwt]: http://ocsigen.org/lwt/
 """
 url {
-archive: "https://erratique.ch/software/logs/releases/logs-0.6.3.tbz"
-checksum: "370e4c802588f73d0777c59bc414b57b"
+archive: "https://erratique.ch/software/logs/releases/logs-0.7.0.tbz"
+checksum: "2bf021ca13331775e33cf34ab60246f7"
 }
diff --git a/esy.lock/opam/menhir.20181113/opam b/esy.lock/opam/menhir.20190924/opam
similarity index 66%
rename from esy.lock/opam/menhir.20181113/opam
rename to esy.lock/opam/menhir.20190924/opam
index d207e08..348967a 100644
--- a/esy.lock/opam/menhir.20181113/opam
+++ b/esy.lock/opam/menhir.20190924/opam
@@ -13,9 +13,6 @@ build: [
 install: [
   [make "-f" "Makefile" "install" "PREFIX=%{prefix}%" "docdir=%{doc}%/menhir" "libdir=%{lib}%/menhir" "mandir=%{man}%/man1"]
 ]
-remove: [
-  [make "-f" "Makefile" "uninstall" "PREFIX=%{prefix}%" "docdir=%{doc}%/menhir" "libdir=%{lib}%/menhir" "mandir=%{man}%/man1"]
-]
 depends: [
   "ocaml" {>= "4.02"}
   "ocamlfind" {build}
@@ -24,9 +21,9 @@ depends: [
 synopsis: "An LR(1) parser generator"
 url {
   src:
-    "https://gitlab.inria.fr/fpottier/menhir/repository/20181113/archive.tar.gz"
+    "https://gitlab.inria.fr/fpottier/menhir/repository/20190924/archive.tar.gz"
   checksum: [
-    "md5=69ce441a06ea131cd43e7b44c4303f3c"
-    "sha512=4ddefcd71d305bfb933a4056da57e36c13c99ec6dfcc4695814798fbbd78b4d65828381ebcb0e58c4c0394105ac763af3d475474e05e408f7080315bc3cf6176"
+    "md5=677f1997fb73177d5a00fa1b8d61c3ef"
+    "sha512=ea8a9a6d773529cf6ac05e4c6c4532770fbb8e574c9b646efcefe90d9f24544741e3e8cfd94c8afea0447e34059a8c79c2829b46764ce3a3d6dcb3e7f75980fc"
   ]
 }
diff --git a/esy.lock/opam/merlin-extend.0.3/opam b/esy.lock/opam/merlin-extend.0.5/opam
similarity index 53%
rename from esy.lock/opam/merlin-extend.0.3/opam
rename to esy.lock/opam/merlin-extend.0.5/opam
index 03ed72e..a3ae0d3 100644
--- a/esy.lock/opam/merlin-extend.0.3/opam
+++ b/esy.lock/opam/merlin-extend.0.5/opam
@@ -5,20 +5,25 @@ homepage: "https://github.com/let-def/merlin-extend"
 bug-reports: "https://github.com/let-def/merlin-extend"
 license: "MIT"
 dev-repo: "git+https://github.com/let-def/merlin-extend.git"
-build: [make]
-install: [make "install"]
-remove: ["ocamlfind" "remove" "merlin_extend"]
+build: [
+  ["dune" "subst"] {pinned}
+  ["dune" "build" "-p" name "-j" jobs]
+]
 depends: [
-  "ocaml" {>= "4.02.3" & < "4.08.0"}
-  "ocamlfind" {build}
+  "dune" {>= "1.0"}
   "cppo" {build}
+  "ocaml" {>= "4.02.3"}
 ]
 synopsis: "A protocol to provide custom frontend to Merlin"
 description: """
 This protocol allows to replace the OCaml frontend of Merlin.
 It extends what used to be done with the `-pp' flag to handle a few more cases."""
-flags: light-uninstall
+doc: "https://let-def.github.io/merlin-extend"
 url {
-  src: "https://github.com/let-def/merlin-extend/archive/v0.3.tar.gz"
-  checksum: "md5=9c6dfd4f53328f02f12fcc265f4e2dda"
+  src:
+    "https://github.com/let-def/merlin-extend/releases/download/v0.5/merlin-extend-v0.5.tbz"
+  checksum: [
+    "sha256=ca3a38c360c7d4827eb4789abf7a6aa4b6e3b4e3c3ef69a5be64dce4601ec227"
+    "sha512=55c5a3637337abb8ca8db679128a81ca8ccce567bc214d55b2e6444dc0e905b74c64d629bdea2457d0fe4be5306414feefcdbc4d4761fdafd59aa107550936b6"
+  ]
 }
diff --git a/esy.lock/opam/merlin.3.2.2/opam b/esy.lock/opam/merlin.3.2.2/opam
deleted file mode 100644
index 6392981..0000000
--- a/esy.lock/opam/merlin.3.2.2/opam
+++ /dev/null
@@ -1,74 +0,0 @@
-opam-version: "2.0"
-name: "merlin"
-synopsis: "Installation with Opam"
-description: """
-If you have a working [Opam](https://opam.ocaml.org/) installation, Merlin is only two commands away:
-
-```shell
-opam install merlin
-opam user-setup install
-```
-
-[opam-user-setup](https://github.com/OCamlPro/opam-user-setup) takes care of configuring Emacs and Vim to make best use of your current install.
-
-You can also [configure the editor](#editor-setup) yourself, if you prefer."""
-maintainer: "defree@gmail.com"
-authors: "The Merlin team"
-homepage: "https://github.com/ocaml/merlin"
-bug-reports: "https://github.com/ocaml/merlin/issues"
-depends: [
-  "ocaml" {>= "4.02.1" & < "4.08"}
-  "dune" {build}
-  "ocamlfind" {>= "1.5.2"}
-  "yojson"
-  "craml" {with-test}
-]
-build: [
-  ["dune" "subst"] {pinned}
-  ["dune" "build" "-p" name "-j" jobs]
-]
-post-messages:
-  """
-merlin installed.
-
-Quick setup for VIM
--------------------
-Append this to your .vimrc to add merlin to vim's runtime-path:
-  let g:opamshare = substitute(system('opam config var share'),'\\n$','','''')
-  execute "set rtp+=" . g:opamshare . "/merlin/vim"
-
-Also run the following line in vim to index the documentation:
-  :execute "helptags " . g:opamshare . "/merlin/vim/doc"
-
-Quick setup for EMACS
--------------------
-Add opam emacs directory to your load-path by appending this to your .emacs:
-  (let ((opam-share (ignore-errors (car (process-lines "opam" "config" "var" "share")))))
-   (when (and opam-share (file-directory-p opam-share))
-    ;; Register Merlin
-    (add-to-list 'load-path (expand-file-name "emacs/site-lisp" opam-share))
-    (autoload 'merlin-mode "merlin" nil t nil)
-    ;; Automatically start it in OCaml buffers
-    (add-hook 'tuareg-mode-hook 'merlin-mode t)
-    (add-hook 'caml-mode-hook 'merlin-mode t)
-    ;; Use opam switch to lookup ocamlmerlin binary
-    (setq merlin-command 'opam)))
-
-Take a look at https://github.com/ocaml/merlin for more information
-
-Quick setup with opam-user-setup
---------------------------------
-
-Opam-user-setup support Merlin.
-
-  $ opam user-setup install
-
-should take care of basic setup.
-See https://github.com/OCamlPro/opam-user-setup"""
-    {success & !user-setup:installed}
-dev-repo: "git+https://github.com/ocaml/merlin.git"
-url {
-  src:
-    "https://github.com/ocaml/merlin/releases/download/v3.2.2/merlin-v3.2.2.tbz"
-  checksum: "md5=ede35b65f8ac9c440cfade5445662c54"
-}
diff --git a/esy.lock/opam/merlin.3.3.3/opam b/esy.lock/opam/merlin.3.3.3/opam
new file mode 100644
index 0000000..f0db8e9
--- /dev/null
+++ b/esy.lock/opam/merlin.3.3.3/opam
@@ -0,0 +1,71 @@
+opam-version: "2.0"
+maintainer:   "defree@gmail.com"
+authors:      "The Merlin team"
+homepage:     "https://github.com/ocaml/merlin"
+bug-reports:  "https://github.com/ocaml/merlin/issues"
+dev-repo: "git+https://github.com/ocaml/merlin.git"
+build: [
+  ["dune" "subst"] {pinned}
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+]
+depends: [
+  "ocaml" {>= "4.02.1" & < "4.10"}
+  "dune" {>= "1.8.0"}
+  "ocamlfind" {>= "1.5.2"}
+  "yojson" {>= "1.6.0"}
+  "mdx" {with-test & >= "1.3.0"}
+  "conf-jq" {with-test}
+]
+synopsis:
+  "Editor helper, provides completion, typing and source browsing in Vim and Emacs"
+description:
+  "Merlin is an assistant for editing OCaml code. It aims to provide the features available in modern IDEs: error reporting, auto completion, source browsing and much more."
+post-messages: [
+  "merlin installed.
+
+Quick setup for VIM
+-------------------
+Append this to your .vimrc to add merlin to vim's runtime-path:
+  let g:opamshare = substitute(system('opam config var share'),'\\n$','','''')
+  execute \"set rtp+=\" . g:opamshare . \"/merlin/vim\"
+
+Also run the following line in vim to index the documentation:
+  :execute \"helptags \" . g:opamshare . \"/merlin/vim/doc\"
+
+Quick setup for EMACS
+-------------------
+Add opam emacs directory to your load-path by appending this to your .emacs:
+  (let ((opam-share (ignore-errors (car (process-lines \"opam\" \"config\" \"var\" \"share\")))))
+   (when (and opam-share (file-directory-p opam-share))
+    ;; Register Merlin
+    (add-to-list 'load-path (expand-file-name \"emacs/site-lisp\" opam-share))
+    (autoload 'merlin-mode \"merlin\" nil t nil)
+    ;; Automatically start it in OCaml buffers
+    (add-hook 'tuareg-mode-hook 'merlin-mode t)
+    (add-hook 'caml-mode-hook 'merlin-mode t)
+    ;; Use opam switch to lookup ocamlmerlin binary
+    (setq merlin-command 'opam)))
+
+Take a look at https://github.com/ocaml/merlin for more information
+
+Quick setup with opam-user-setup
+--------------------------------
+
+Opam-user-setup support Merlin.
+
+  $ opam user-setup install
+
+should take care of basic setup.
+See https://github.com/OCamlPro/opam-user-setup
+"
+  {success & !user-setup:installed}
+]
+url {
+  src:
+    "https://github.com/ocaml/merlin/releases/download/v3.3.3/merlin-v3.3.3.tbz"
+  checksum: [
+    "sha256=72909ef47eea1f6fca13b4109a34dccf8fe3923a3c026f1ed1db9eb5ee9aae15"
+    "sha512=2a5f39d966be56c1322982effc05bc98fd5f66cd12f1f76953f8daa9eca74a58c92a186854f4e601e2f0bb038720691446e7591b4613982accded3e579fedb23"
+  ]
+}
diff --git a/esy.lock/opam/ocaml-migrate-parsetree.1.2.0/opam b/esy.lock/opam/ocaml-migrate-parsetree.1.5.0/opam
similarity index 71%
rename from esy.lock/opam/ocaml-migrate-parsetree.1.2.0/opam
rename to esy.lock/opam/ocaml-migrate-parsetree.1.5.0/opam
index 3795096..aa41104 100644
--- a/esy.lock/opam/ocaml-migrate-parsetree.1.2.0/opam
+++ b/esy.lock/opam/ocaml-migrate-parsetree.1.5.0/opam
@@ -4,7 +4,7 @@ authors: [
   "Frédéric Bour <frederic.bour@lakaban.net>"
   "Jérémie Dimino <jeremie@dimino.org>"
 ]
-license: "LGPL-2.1"
+license: "LGPL-2.1 with OCaml linking exception"
 homepage: "https://github.com/ocaml-ppx/ocaml-migrate-parsetree"
 bug-reports: "https://github.com/ocaml-ppx/ocaml-migrate-parsetree/issues"
 dev-repo: "git+https://github.com/ocaml-ppx/ocaml-migrate-parsetree.git"
@@ -16,8 +16,8 @@ build: [
 depends: [
   "result"
   "ppx_derivers"
-  "dune" {build & >= "1.6.0"}
-  "ocaml" {>= "4.02.3" & < "4.08.0"}
+  "dune" {>= "1.9.0"}
+  "ocaml" {>= "4.02.3"}
 ]
 synopsis: "Convert OCaml parsetrees between different versions"
 description: """
@@ -29,6 +29,9 @@ rewriters independent of a compiler version.
 """
 url {
   src:
-    "https://github.com/ocaml-ppx/ocaml-migrate-parsetree/releases/download/v1.2.0/ocaml-migrate-parsetree-v1.2.0.tbz"
-  checksum: "md5=cc6fb09ad6f99156c7dba47711c62c6f"
+    "https://github.com/ocaml-ppx/ocaml-migrate-parsetree/releases/download/v1.5.0/ocaml-migrate-parsetree-v1.5.0.tbz"
+  checksum: [
+    "sha256=7f56679c9561552762666de5b6b81c8e4cc2e9fd92272e2269878a2eb534e3c0"
+    "sha512=87fdccafae83b0437f1ccd4f3cfbc49e699bc0804596480e0df88510ba33410f31d48c7f677fe72800ed3f442a3a586d82d86aee1d12a964f79892833847b16a"
+  ]
 }
diff --git a/esy.lock/opam/ocamlbuild.0.14.0/opam b/esy.lock/opam/ocamlbuild.0.14.0/opam
index dd4bf68..8deabee 100644
--- a/esy.lock/opam/ocamlbuild.0.14.0/opam
+++ b/esy.lock/opam/ocamlbuild.0.14.0/opam
@@ -3,7 +3,7 @@ maintainer: "Gabriel Scherer <gabriel.scherer@gmail.com>"
 authors: ["Nicolas Pouillard" "Berke Durak"]
 homepage: "https://github.com/ocaml/ocamlbuild/"
 bug-reports: "https://github.com/ocaml/ocamlbuild/issues"
-license: "LGPL-2 with OCaml linking exception"
+license: "LGPL-2.1-only with OCaml-LGPL-linking-exception"
 doc: "https://github.com/ocaml/ocamlbuild/blob/master/manual/manual.adoc"
 dev-repo: "git+https://github.com/ocaml/ocamlbuild.git"
 build: [
diff --git a/esy.lock/opam/ocamlfind.1.8.0/files/no-awk-check.patch b/esy.lock/opam/ocamlfind.1.8.0/files/no-awk-check.patch
deleted file mode 100644
index c9e80da..0000000
--- a/esy.lock/opam/ocamlfind.1.8.0/files/no-awk-check.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 40142bc941e6e308686e86be6fc2da92f346a22f
-Author: Kate <kit.ty.kate@disroot.org>
-Date:   Tue Mar 19 16:29:06 2019 +0000
-
-    Remove awk from the set of checked unix tools as it's not used anywhere
-
-diff --git a/configure b/configure
-index d9b587c..20e8dca 100755
---- a/configure
-+++ b/configure
-@@ -184,7 +184,7 @@ echo "Configuring core..."
- 
- # Some standard Unix tools must be available:
- 
--for tool in sed awk ocaml ocamlc uname rm make cat m4 dirname basename; do
-+for tool in sed ocaml ocamlc uname rm make cat m4 dirname basename; do
-     if in_path $tool; then true; else
- 	echo "configure: $tool not in PATH; this is required" 1>&2
- 	exit 1
diff --git a/esy.lock/opam/ocamlfind.1.8.0/files/ocaml-stub b/esy.lock/opam/ocamlfind.1.8.1/files/ocaml-stub
similarity index 100%
rename from esy.lock/opam/ocamlfind.1.8.0/files/ocaml-stub
rename to esy.lock/opam/ocamlfind.1.8.1/files/ocaml-stub
diff --git a/esy.lock/opam/ocamlfind.1.8.0/files/ocamlfind.install b/esy.lock/opam/ocamlfind.1.8.1/files/ocamlfind.install
similarity index 100%
rename from esy.lock/opam/ocamlfind.1.8.0/files/ocamlfind.install
rename to esy.lock/opam/ocamlfind.1.8.1/files/ocamlfind.install
diff --git a/esy.lock/opam/ocamlfind.1.8.0/opam b/esy.lock/opam/ocamlfind.1.8.1/opam
similarity index 56%
rename from esy.lock/opam/ocamlfind.1.8.0/opam
rename to esy.lock/opam/ocamlfind.1.8.1/opam
index e587a3c..d757d66 100644
--- a/esy.lock/opam/ocamlfind.1.8.0/opam
+++ b/esy.lock/opam/ocamlfind.1.8.1/opam
@@ -1,9 +1,17 @@
 opam-version: "2.0"
-maintainer:   "Thomas Gazagnaire <thomas@gazagnaire.org>"
-homepage:     "http://projects.camlcity.org/projects/findlib.html"
-bug-reports:  "https://gitlab.camlcity.org/gerd/lib-findlib/issues"
+synopsis: "A library manager for OCaml"
+maintainer: "Thomas Gazagnaire <thomas@gazagnaire.org>"
+authors: "Gerd Stolpmann <gerd@gerd-stolpmann.de>"
+homepage: "http://projects.camlcity.org/projects/findlib.html"
+bug-reports: "https://gitlab.camlcity.org/gerd/lib-findlib/issues"
 dev-repo: "git+https://gitlab.camlcity.org/gerd/lib-findlib.git"
-patches: ["no-awk-check.patch"]
+description: """
+Findlib is a library manager for OCaml. It provides a convention how
+to store libraries, and a file format ("META") to describe the
+properties of libraries. There is also a tool (ocamlfind) for
+interpreting the META files, so that it is very easy to use libraries
+in programs and scripts.
+"""
 build: [
   [
     "./configure"
@@ -26,43 +34,17 @@ install: [
   [make "install"]
   ["install" "-m" "0755" "ocaml-stub" "%{bin}%/ocaml"] {ocaml:preinstalled}
 ]
-remove: [
-  ["ocamlfind" "remove" "bytes"]
-  [
-    "./configure"
-    "-bindir"
-    bin
-    "-sitelib"
-    lib
-    "-mandir"
-    man
-    "-config"
-    "%{lib}%/findlib.conf"
-    "-no-camlp4" {!ocaml:preinstalled & ocaml:version >= "4.02.0"}
-    "-no-topfind" {ocaml:preinstalled}
-  ]
-  [make "uninstall"]
-  ["rm" "-f" "%{bin}%/ocaml"] {ocaml:preinstalled}
-]
 depends: [
   "ocaml" {>= "4.00.0"}
   "conf-m4" {build}
 ]
-synopsis: "A library manager for OCaml"
-description: """
-Findlib is a library manager for OCaml. It provides a convention how
-to store libraries, and a file format ("META") to describe the
-properties of libraries. There is also a tool (ocamlfind) for
-interpreting the META files, so that it is very easy to use libraries
-in programs and scripts."""
-authors: "Gerd Stolpmann <gerd@gerd-stolpmann.de>"
 extra-files: [
   ["ocamlfind.install" "md5=06f2c282ab52d93aa6adeeadd82a2543"]
   ["ocaml-stub" "md5=181f259c9e0bad9ef523e7d4abfdf87a"]
-  ["no-awk-check.patch" "md5=0378123bf1a45fccdea434c053ddb687"]
 ]
 url {
-  src: "http://download.camlcity.org/download/findlib-1.8.0.tar.gz"
-  checksum: "md5=a710c559667672077a93d34eb6a42e5b"
-  mirrors: "http://download2.camlcity.org/download/findlib-1.8.0.tar.gz"
+  src: "http://download.camlcity.org/download/findlib-1.8.1.tar.gz"
+  checksum: "md5=18ca650982c15536616dea0e422cbd8c"
+  mirrors: "http://download2.camlcity.org/download/findlib-1.8.1.tar.gz"
 }
+depopts: ["graphics"]
diff --git a/esy.lock/opam/odoc.1.4.0/opam b/esy.lock/opam/odoc.1.4.0/opam
index 3e3f00e..4b7962b 100644
--- a/esy.lock/opam/odoc.1.4.0/opam
+++ b/esy.lock/opam/odoc.1.4.0/opam
@@ -19,16 +19,16 @@ depends: [
   "astring" {build}
   "cmdliner" {build & >= "1.0.0"}
   "cppo" {build}
-  "dune" {build}
+  "dune"
   "fpath" {build}
-  "ocaml" {>= "4.02.0"}
+  "ocaml" {>= "4.02.0" & < "4.09.0"}
   "result" {build}
   "tyxml" {build & >= "4.3.0"}
 
   "alcotest" {dev & >= "0.8.3"}
   "markup" {dev & >= "0.8.0"}
   "ocamlfind" {dev}
-  "sexplib" {dev & >= "113.33.00"}
+  "sexplib" {dev & >= "113.33.00" & < "v0.14"}
 
   "bisect_ppx" {with-test & >= "1.3.0"}
 ]
diff --git a/esy.lock/opam/ppx_derivers.1.2.1/opam b/esy.lock/opam/ppx_derivers.1.2.1/opam
index 19e8b0f..3d10814 100644
--- a/esy.lock/opam/ppx_derivers.1.2.1/opam
+++ b/esy.lock/opam/ppx_derivers.1.2.1/opam
@@ -1,7 +1,7 @@
 opam-version: "2.0"
 maintainer: "jeremie@dimino.org"
 authors: ["Jérémie Dimino"]
-license: "BSD3"
+license: "BSD-3-Clause"
 homepage: "https://github.com/ocaml-ppx/ppx_derivers"
 bug-reports: "https://github.com/ocaml-ppx/ppx_derivers/issues"
 dev-repo: "git://github.com/ocaml-ppx/ppx_derivers.git"
@@ -10,7 +10,7 @@ build: [
 ]
 depends: [
   "ocaml"
-  "dune" {build}
+  "dune"
 ]
 synopsis: "Shared [@@deriving] plugin registry"
 description: """
diff --git a/esy.lock/opam/re.1.9.0/opam b/esy.lock/opam/re.1.9.0/opam
index 28b376f..f798754 100644
--- a/esy.lock/opam/re.1.9.0/opam
+++ b/esy.lock/opam/re.1.9.0/opam
@@ -8,7 +8,7 @@ authors: [
   "Rudi Grinberg"
   "Gabriel Radanne"
 ]
-license: "LGPL-2.0 with OCaml linking exception"
+license: "LGPL-2.0-only with OCaml-LGPL-linking-exception"
 homepage: "https://github.com/ocaml/ocaml-re"
 bug-reports: "https://github.com/ocaml/ocaml-re/issues"
 dev-repo: "git+https://github.com/ocaml/ocaml-re.git"
@@ -21,7 +21,7 @@ build: [
 
 depends: [
   "ocaml" {>= "4.02"}
-  "dune" {build}
+  "dune"
   "ounit" {with-test}
   "seq"
 ]
diff --git a/esy.lock/opam/result.1.3/opam b/esy.lock/opam/result.1.4/opam
similarity index 70%
rename from esy.lock/opam/result.1.3/opam
rename to esy.lock/opam/result.1.4/opam
index 8b156d6..b44aeea 100644
--- a/esy.lock/opam/result.1.3/opam
+++ b/esy.lock/opam/result.1.4/opam
@@ -4,11 +4,11 @@ authors: ["Jane Street Group, LLC <opensource@janestreet.com>"]
 homepage: "https://github.com/janestreet/result"
 dev-repo: "git+https://github.com/janestreet/result.git"
 bug-reports: "https://github.com/janestreet/result/issues"
-license: "BSD3"
-build: [["jbuilder" "build" "-p" name "-j" jobs]]
+license: "BSD-3-Clause"
+build: [["dune" "build" "-p" name "-j" jobs]]
 depends: [
   "ocaml"
-  "jbuilder" {build & >= "1.0+beta11"}
+  "dune" {>= "1.0"}
 ]
 synopsis: "Compatibility Result module"
 description: """
@@ -17,6 +17,6 @@ while staying compatible with older version of OCaml should use the
 Result module defined in this library."""
 url {
   src:
-    "https://github.com/janestreet/result/releases/download/1.3/result-1.3.tbz"
-  checksum: "md5=4beebefd41f7f899b6eeba7414e7ae01"
+    "https://github.com/janestreet/result/archive/1.4.tar.gz"
+  checksum: "md5=d3162dbc501a2af65c8c71e0866541da"
 }
diff --git a/esy.lock/opam/seq.0.1/opam b/esy.lock/opam/seq.0.1/opam
deleted file mode 100644
index 2596b27..0000000
--- a/esy.lock/opam/seq.0.1/opam
+++ /dev/null
@@ -1,23 +0,0 @@
-opam-version: "2.0"
-maintainer: "simon.cruanes.2007@m4x.org"
-authors: "Simon Cruanes"
-homepage: "https://github.com/c-cube/seq/"
-bug-reports: "https://github.com/c-cube/seq/issues"
-license: "GPL"
-tags: ["iterator" "seq" "pure" "list" "compatibility" "cascade"]
-dev-repo: "git+https://github.com/c-cube/seq.git"
-build: [make "build"]
-install: [make "install"]
-remove: [ "ocamlfind" "remove" "seq" ]
-depends: [
-  "ocaml" {< "4.07.0"}
-  "ocamlfind" {build}
-  "ocamlbuild" {build}
-]
-synopsis:
-  "Compatibility package for OCaml's standard iterator type starting from 4.07."
-flags: light-uninstall
-url {
-  src: "https://github.com/c-cube/seq/archive/0.1.tar.gz"
-  checksum: "md5=0e87f9709541ed46ecb6f414bc31458c"
-}
diff --git a/esy.lock/opam/seq.0.2.2/opam b/esy.lock/opam/seq.0.2.2/opam
new file mode 100644
index 0000000..5ed5165
--- /dev/null
+++ b/esy.lock/opam/seq.0.2.2/opam
@@ -0,0 +1,24 @@
+opam-version: "2.0"
+synopsis:
+  "Compatibility package for OCaml's standard iterator type starting from 4.07"
+maintainer: "simon.cruanes.2007@m4x.org"
+license: "LGPL2.1"
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+]
+depends: [
+  "dune" {>= "1.1.0"}
+  "ocaml"
+]
+tags: [ "iterator" "seq" "pure" "list" "compatibility" "cascade" ]
+homepage: "https://github.com/c-cube/seq/"
+bug-reports: "https://github.com/c-cube/seq/issues"
+dev-repo: "git+https://github.com/c-cube/seq.git"
+authors: "Simon Cruanes"
+url {
+  src: "https://github.com/c-cube/seq/archive/0.2.2.tar.gz"
+  checksum: [
+    "md5=9033e02283aa3bde9f97f24e632902e3"
+    "sha512=cab0eb4cb6d9788b7cbd7acbefefc15689d706c97ff7f75dd97faf3c21e466af4d0ff110541a24729db587e7172b1a30a3c2967e17ec2e49cbd923360052c07c"
+  ]
+}
diff --git a/esy.lock/opam/stdlib-shims.0.1.0/opam b/esy.lock/opam/stdlib-shims.0.1.0/opam
index 6c27a70..5839c43 100644
--- a/esy.lock/opam/stdlib-shims.0.1.0/opam
+++ b/esy.lock/opam/stdlib-shims.0.1.0/opam
@@ -8,7 +8,7 @@ bug-reports: "https://github.com/ocaml/stdlib-shims/issues"
 tags: ["stdlib" "compatibility" "org:ocaml"]
 license: ["typeof OCaml system"]
 depends: [
-  "dune" {build}
+  "dune"
   "ocaml" {>= "4.02.3"}
 ]
 build: [ "dune" "build" "-p" name "-j" jobs ]
diff --git a/esy.lock/opam/topkg.1.0.0/opam b/esy.lock/opam/topkg.1.0.1/opam
similarity index 90%
rename from esy.lock/opam/topkg.1.0.0/opam
rename to esy.lock/opam/topkg.1.0.1/opam
index 2276edb..77ae1f4 100644
--- a/esy.lock/opam/topkg.1.0.0/opam
+++ b/esy.lock/opam/topkg.1.0.1/opam
@@ -8,10 +8,9 @@ dev-repo: "git+http://erratique.ch/repos/topkg.git"
 bug-reports: "https://github.com/dbuenzli/topkg/issues"
 tags: ["packaging" "ocamlbuild" "org:erratique"]
 depends: [
-  "ocaml" {>= "4.01.0"}
+  "ocaml" {>= "4.03.0"}
   "ocamlfind" {build & >= "1.6.1"}
-  "ocamlbuild"
-  "result" ]
+  "ocamlbuild" ]
 build: [[
   "ocaml" "pkg/pkg.ml" "build"
           "--pkg-name" name
@@ -44,6 +43,6 @@ Topkg-care is distributed under the ISC license it depends on
 [webbrowser]: http://erratique.ch/software/webbrowser
 """
 url {
-src: "http://erratique.ch/software/topkg/releases/topkg-1.0.0.tbz"
-checksum: "md5=e3d76bda06bf68cb5853caf6627da603"
+archive: "http://erratique.ch/software/topkg/releases/topkg-1.0.1.tbz"
+checksum: "16b90e066d8972a5ef59655e7c28b3e9"
 }
diff --git a/esy.lock/opam/tyxml.4.3.0/opam b/esy.lock/opam/tyxml.4.3.0/opam
index aeac6c9..93872f8 100644
--- a/esy.lock/opam/tyxml.4.3.0/opam
+++ b/esy.lock/opam/tyxml.4.3.0/opam
@@ -4,7 +4,7 @@ homepage: "https://github.com/ocsigen/tyxml/"
 bug-reports: "https://github.com/ocsigen/tyxml/issues"
 doc: "https://ocsigen.org/tyxml/manual/"
 dev-repo: "git+https://github.com/ocsigen/tyxml.git"
-license: "LGPL-2.1 with OCaml linking exception"
+license: "LGPL-2.1-only with OCaml-LGPL-linking-exception"
 
 build: [
   ["dune" "subst"] {pinned}
@@ -16,7 +16,7 @@ depends: [
   "ocaml" {>= "4.02"}
   "re" {>= "1.5.0"}
   ("ocaml" {>= "4.07"} | "re" {>= "1.8.0"})
-  "dune" {build}
+  "dune"
   "alcotest" {with-test}
   "seq"
   "uutf" {>= "1.0.0"}
diff --git a/esy.lock/opam/yojson.1.7.0/opam b/esy.lock/opam/yojson.1.7.0/opam
index 54591c6..ffef068 100644
--- a/esy.lock/opam/yojson.1.7.0/opam
+++ b/esy.lock/opam/yojson.1.7.0/opam
@@ -12,7 +12,7 @@ build: [
 run-test: [["dune" "runtest" "-p" name "-j" jobs]]
 depends: [
   "ocaml" {>= "4.02.3"}
-  "dune" {build}
+  "dune"
   "cppo" {build}
   "easy-format"
   "biniou" {>= "1.2.0"}
diff --git a/esy.lock/overrides/opam__s__dune_opam__c__1.9.0_opam_override/package.json b/esy.lock/overrides/opam__s__dune_opam__c__1.9.0_opam_override/package.json
deleted file mode 100644
index 064c7e3..0000000
--- a/esy.lock/overrides/opam__s__dune_opam__c__1.9.0_opam_override/package.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "build": [
-    [
-      "ocaml",
-      "bootstrap.ml"
-    ],
-    [
-      "./boot.exe",
-      "--release",
-      "-j",
-      "4"
-    ]
-  ]
-}
diff --git a/esy.lock/overrides/opam__s__merlin_extend_opam__c__0.3_opam_override/files/merlin-extend-winfix-4.2.3007.patch b/esy.lock/overrides/opam__s__merlin_extend_opam__c__0.3_opam_override/files/merlin-extend-winfix-4.2.3007.patch
deleted file mode 100644
index 1e59ebb..0000000
--- a/esy.lock/overrides/opam__s__merlin_extend_opam__c__0.3_opam_override/files/merlin-extend-winfix-4.2.3007.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- ./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/esy.lock/overrides/opam__s__merlin_extend_opam__c__0.3_opam_override/files/merlin-extend-winfix.patch b/esy.lock/overrides/opam__s__merlin_extend_opam__c__0.3_opam_override/files/merlin-extend-winfix.patch
deleted file mode 100644
index 40c46b1..0000000
--- a/esy.lock/overrides/opam__s__merlin_extend_opam__c__0.3_opam_override/files/merlin-extend-winfix.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- ./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 (Parsetree.Pconst_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 (Parsetree.Pconst_string (msg, _));
-           }, _);
-       }] -> msg
-     | _ -> "Warning: extension produced an incorrect syntax-error node"
diff --git a/esy.lock/overrides/opam__s__merlin_extend_opam__c__0.3_opam_override/package.json b/esy.lock/overrides/opam__s__merlin_extend_opam__c__0.3_opam_override/package.json
deleted file mode 100644
index acc90eb..0000000
--- a/esy.lock/overrides/opam__s__merlin_extend_opam__c__0.3_opam_override/package.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "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_CMD : 'true'}"
-    ],
-    [
-      "make"
-    ]
-  ]
-}
diff --git a/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.8.0_opam_override/files/findlib-1.8.0.patch b/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.8.1_opam_override/files/findlib-1.8.1.patch
similarity index 89%
rename from esy.lock/overrides/opam__s__ocamlfind_opam__c__1.8.0_opam_override/files/findlib-1.8.0.patch
rename to esy.lock/overrides/opam__s__ocamlfind_opam__c__1.8.1_opam_override/files/findlib-1.8.1.patch
index 5d3d189..3e3ee5a 100644
--- a/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.8.0_opam_override/files/findlib-1.8.0.patch
+++ b/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.8.1_opam_override/files/findlib-1.8.1.patch
@@ -412,8 +412,8 @@
 +    (sl (Findlib.ocaml_ldconf()));
  	flush stdout
      | Some "conf" ->
--	print_endline Findlib_config.config_file
-+  print_endline (sl Findlib_config.config_file)
+-	print_endline (Findlib.config_file())
++  print_endline (sl (Findlib.config_file()))
      | Some "path" ->
 -	List.iter print_endline (Findlib.search_path())
 +  List.iter ( fun x -> print_endline (sl x)) (Findlib.search_path())
@@ -469,21 +469,3 @@
  		sed -e 's;@AUTOLINK@;$(OCAML_AUTOLINK);g' \
  		    -e 's;@SYSTEM@;$(SYSTEM);g' \
  		     >findlib_config.ml
-@@ -113,7 +114,7 @@
- 	$(OCAMLC) -a -o num_top.cma $(NUMTOP_OBJECTS)
- 
- clean:
--	rm -f *.cmi *.cmo *.cma *.cmx *.a *.o *.cmxa \
-+	rm -f *.cmi *.cmo *.cma *.cmx *.lib *.a *.o *.cmxa \
- 	  fl_meta.ml findlib_config.ml findlib.mml topfind.ml topfind \
- 	  ocamlfind$(EXEC_SUFFIX) ocamlfind_opt$(EXEC_SUFFIX)
- 
-@@ -121,7 +122,7 @@
- 	mkdir -p "$(prefix)$(OCAML_SITELIB)/$(NAME)"
- 	mkdir -p "$(prefix)$(OCAMLFIND_BIN)"
- 	test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_CORE_STDLIB)"
--	files=`$(SH) $(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma findlib.cmxa findlib.a findlib.cmxs topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib_top.cmxa findlib_top.a findlib_top.cmxs findlib_dynload.cma findlib_dynload.cmxa findlib_dynload.a findlib_dynload.cmxs fl_dynload.mli fl_dynload.cmi META` && \
-+	files=`$(SH) $(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma findlib.cmxa findlib$(LIB_SUFFIX) findlib.cmxs topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib_top.cmxa findlib_top$(LIB_SUFFIX) findlib_top.cmxs findlib_dynload.cma findlib_dynload.cmxa findlib_dynload$(LIB_SUFFIX) findlib_dynload.cmxs fl_dynload.mli fl_dynload.cmi META` && \
- 	cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)"
- 	f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \
- 	cp $$f "$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)"
diff --git a/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.8.0_opam_override/package.json b/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.8.1_opam_override/package.json
similarity index 92%
rename from esy.lock/overrides/opam__s__ocamlfind_opam__c__1.8.0_opam_override/package.json
rename to esy.lock/overrides/opam__s__ocamlfind_opam__c__1.8.1_opam_override/package.json
index 136b66c..9314f87 100644
--- a/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.8.0_opam_override/package.json
+++ b/esy.lock/overrides/opam__s__ocamlfind_opam__c__1.8.1_opam_override/package.json
@@ -3,7 +3,7 @@
     [
       "bash",
       "-c",
-      "#{os == 'windows' ? 'patch -p1 < findlib-1.8.0.patch' : 'true'}"
+      "#{os == 'windows' ? 'patch -p1 < findlib-1.8.1.patch' : 'true'}"
     ],
     [
       "./configure",
diff --git a/example/src/Util.re b/example/src/Util.re
index 394f91d..797623a 100644
--- a/example/src/Util.re
+++ b/example/src/Util.re
@@ -1,8 +1,7 @@
-
 /**
   A sample type from a module without an interface.
   */
 type t = {
   /** A value */
-  value: int
+  value: int,
 };
diff --git a/yarn.lock b/yarn.lock
deleted file mode 100644
index ffd66e3..0000000
--- a/yarn.lock
+++ /dev/null
@@ -1,15 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@elliottcable/bs-cmdliner@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@elliottcable/bs-cmdliner/-/bs-cmdliner-1.0.2.tgz#825b3351d3beee7def38f7603b81e2a8bb73e939"
-  integrity sha512-jjxxtT/lJO0pQfPbxP3uZKV+E0/WVoT0f8GZvozbZXV19DdNKnFz91yERbI/VhwsY11nkqF6h5FWAWEF8lBj6Q==
-  dependencies:
-    bs-platform "^4.0.1"
-
-bs-platform@^4.0.1, bs-platform@^4.0.11:
-  version "4.0.11"
-  resolved "https://registry.yarnpkg.com/bs-platform/-/bs-platform-4.0.11.tgz#9d195d1ad798a60b872d7612827c70e6f4c0ed05"
-  integrity sha512-p0aYHXbK8ZO4ZHxwyQ1f0LEhbdkAMPB3FCwIY4HZrfrg0PB6Sc4y2L2al3kL+33sp/FOaMyfzuEnaF6HysuJgg==