From 3d3b370fa03e3293de41326b3ca450c1a6460e05 Mon Sep 17 00:00:00 2001
From: Bryan Phelps <bryphe@outlook.com>
Date: Fri, 23 Oct 2020 17:25:46 -0700
Subject: [PATCH 01/21] Experiment with layer for surfaceview

---
 src/Feature/Editor/SurfaceView.re | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Feature/Editor/SurfaceView.re b/src/Feature/Editor/SurfaceView.re
index dbfd9b0c8e..a8d95b1f78 100644
--- a/src/Feature/Editor/SurfaceView.re
+++ b/src/Feature/Editor/SurfaceView.re
@@ -173,7 +173,8 @@ let%component make =
        )
     |> Option.value(~default=React.empty);
 
-  <View
+  <Layer
+    condition=RenderCondition.initial
     onBoundingBoxChanged={bbox => maybeBbox := Some(bbox)}
     style={Styles.bufferViewClipped(
       gutterWidth,
@@ -264,5 +265,5 @@ let%component make =
       windowIsFocused
       colors
     />
-  </View>;
+  </Layer>;
 };

From 5599a2b49eee975f3307ff6fd35d11e44ef3ca1a Mon Sep 17 00:00:00 2001
From: Bryan Phelps <bryphe@outlook.com>
Date: Sun, 25 Oct 2020 09:50:45 -0700
Subject: [PATCH 02/21] Some preparation for compositing layers

---
 src/Feature/Editor/Editor.re      | 14 +++++++++++++-
 src/Feature/Editor/Editor.rei     |  2 ++
 src/Feature/Editor/Minimap.re     | 13 +++++++++++--
 src/Feature/Editor/SurfaceView.re | 11 ++++++++++-
 src/Store/Features.re             |  1 +
 5 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/src/Feature/Editor/Editor.re b/src/Feature/Editor/Editor.re
index 4137864b88..4a8d316005 100644
--- a/src/Feature/Editor/Editor.re
+++ b/src/Feature/Editor/Editor.re
@@ -101,6 +101,16 @@ type t = {
   // Number of lines to preserve before or after the cursor, when scrolling.
   // Like the `scrolloff` vim setting or the `editor.cursorSurroundingLines` VSCode setting.
   verticalScrollMargin: int,
+
+  renderNonce: int,
+};
+
+let shouldRender = (editorA, editorB) => {
+ editorA.key !== editorB.key
+ || editorA.renderNonce != editorB.renderNonce
+ || editorA.scrollX != editorB.scrollX
+ || editorA.scrollY != editorB.scrollY
+ || editorA.buffer !== editorB.buffer
 };
 
 let key = ({key, _}) => key;
@@ -326,6 +336,8 @@ let create = (~config, ~buffer, ()) => {
     wrapMode,
     wrapPadding: None,
     verticalScrollMargin: 1,
+
+    renderNonce: 0,
   };
 };
 
@@ -360,7 +372,7 @@ let copy = editor => {
   let id = GlobalState.generateId();
   let key = Brisk_reconciler.Key.create();
 
-  {...editor, key, editorId: id};
+  {...editor, renderNonce: 0, key, editorId: id};
 };
 
 type scrollbarMetrics = {
diff --git a/src/Feature/Editor/Editor.rei b/src/Feature/Editor/Editor.rei
index 3b45f07bf5..7d3510c19c 100644
--- a/src/Feature/Editor/Editor.rei
+++ b/src/Feature/Editor/Editor.rei
@@ -46,6 +46,8 @@ let getHorizontalScrollbarMetrics: (t, int) => scrollbarMetrics;
 let getCursors: t => list(BytePosition.t);
 let setWrapMode: (~wrapMode: WrapMode.t, t) => t;
 
+let shouldRender: (t, t) => bool;
+
 let mode: t => Vim.Mode.t;
 let setMode: (Vim.Mode.t, t) => t;
 
diff --git a/src/Feature/Editor/Minimap.re b/src/Feature/Editor/Minimap.re
index 743da3e177..2a13541a6e 100644
--- a/src/Feature/Editor/Minimap.re
+++ b/src/Feature/Editor/Minimap.re
@@ -13,6 +13,14 @@ open Revery.UI;
 module BufferHighlights = Oni_Syntax.BufferHighlights;
 module Diagnostic = Feature_Diagnostics.Diagnostic;
 
+let layerCondition = Revery.UI.Layer.Condition.make((previousEditor, newEditor) => {
+    if (Editor.shouldRender(previousEditor, newEditor)) {
+       true 
+    } else {
+       false 
+    }
+});
+
 module Constants = {
   include Constants;
 
@@ -262,7 +270,8 @@ let%component make =
        })
     |> Option.value(~default=React.empty);
 
-  <View
+  <Layer
+    condition=layerCondition(editor)
     style={Styles.container(backgroundColor)}
     onMouseDown
     onMouseMove
@@ -503,5 +512,5 @@ let%component make =
       }}
     />
     yankHighlightElement
-  </View>;
+  </Layer>;
 };
diff --git a/src/Feature/Editor/SurfaceView.re b/src/Feature/Editor/SurfaceView.re
index a8d95b1f78..96a94db2be 100644
--- a/src/Feature/Editor/SurfaceView.re
+++ b/src/Feature/Editor/SurfaceView.re
@@ -40,6 +40,14 @@ let renderRulers = (~context: Draw.context, ~colors: Colors.t, rulers) => {
   |> List.iter(Draw.ruler(~context, ~color=colors.rulerForeground));
 };
 
+let layerCondition = Revery.UI.Layer.Condition.make((previousEditor, newEditor) => {
+    if (Editor.shouldRender(previousEditor, newEditor)) {
+       true 
+    } else {
+       false 
+    }
+})
+
 let%component make =
               (
                 ~buffer,
@@ -174,7 +182,8 @@ let%component make =
     |> Option.value(~default=React.empty);
 
   <Layer
-    condition=RenderCondition.initial
+    key=Editor.key(editor)
+    condition=layerCondition(editor)
     onBoundingBoxChanged={bbox => maybeBbox := Some(bbox)}
     style={Styles.bufferViewClipped(
       gutterWidth,
diff --git a/src/Store/Features.re b/src/Store/Features.re
index 013aaea18a..1531b3e58d 100644
--- a/src/Store/Features.re
+++ b/src/Store/Features.re
@@ -117,6 +117,7 @@ module Internal = {
       ) => {
     switch (scope) {
     | All =>
+  prerr_endline ("Updating all: " ++ Feature_Editor.show_msg(msg));
       let (layout', effects) =
         Feature_Layout.fold(
           (prev, editor) => {

From fc46b36ce4b4b11de003c28dba275818f03c5f1e Mon Sep 17 00:00:00 2001
From: Bryan Phelps <bryphe@outlook.com>
Date: Mon, 26 Oct 2020 07:19:54 -0700
Subject: [PATCH 03/21] WIP: Use layer

---
 package.json                           |  2 +-
 src/Feature/Editor/Minimap.re          |  1 +
 src/Feature/Editor/SurfaceView.re      |  1 +
 src/Feature/Logging/Feature_Logging.re | 27 +++++++++++++++++++++++---
 4 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 00a9b0e9ea..ff406ef213 100644
--- a/package.json
+++ b/package.json
@@ -256,7 +256,7 @@
     "revery-terminal": "*"
   },
   "resolutions": {
-    "revery": "revery-ui/revery#b43852b",
+    "revery": "link:../revery",
     "esy-skia": "revery-ui/esy-skia#60e0260",
     "rench": "bryphe/rench#a976fe5",
     "reasonFuzz": "CrossR/reasonFuzz#1ad6f5d",
diff --git a/src/Feature/Editor/Minimap.re b/src/Feature/Editor/Minimap.re
index 2a13541a6e..073218f327 100644
--- a/src/Feature/Editor/Minimap.re
+++ b/src/Feature/Editor/Minimap.re
@@ -271,6 +271,7 @@ let%component make =
     |> Option.value(~default=React.empty);
 
   <Layer
+    backgroundColor={backgroundColor}
     condition=layerCondition(editor)
     style={Styles.container(backgroundColor)}
     onMouseDown
diff --git a/src/Feature/Editor/SurfaceView.re b/src/Feature/Editor/SurfaceView.re
index 96a94db2be..a9a977a472 100644
--- a/src/Feature/Editor/SurfaceView.re
+++ b/src/Feature/Editor/SurfaceView.re
@@ -183,6 +183,7 @@ let%component make =
 
   <Layer
     key=Editor.key(editor)
+    backgroundColor={Colors.(colors.editorBackground)}
     condition=layerCondition(editor)
     onBoundingBoxChanged={bbox => maybeBbox := Some(bbox)}
     style={Styles.bufferViewClipped(
diff --git a/src/Feature/Logging/Feature_Logging.re b/src/Feature/Logging/Feature_Logging.re
index 450b790501..0f639b5e1d 100644
--- a/src/Feature/Logging/Feature_Logging.re
+++ b/src/Feature/Logging/Feature_Logging.re
@@ -9,7 +9,8 @@ let initial = ();
 
 [@deriving show]
 type command =
-  | LogToTraceFile;
+  | LogToTraceFile
+  | ToggleRenderPerformanceView;
 
 [@deriving show]
 type msg =
@@ -28,6 +29,14 @@ module Effects = {
       Timber.App.setLevel(Timber.Level.trace);
       dispatch(toMsg(logFileName));
     });
+
+  let toggleDebugDraw = Isolinear.Effect.create(~name="Feature.Logging.toggleDebugDraw", () => {
+    if (Revery.Debug.isEnabled()) {
+        Revery.Debug.disable()
+    } else {
+        Revery.Debug.enable()
+    };
+  })
 };
 
 // UPDATE
@@ -44,6 +53,10 @@ let update = (msg, _model) =>
         (),
         Effect(Effects.traceToFile(~toMsg=str => LogFileStarted(str))),
       )
+    | ToggleRenderPerformanceView => (
+        (),
+        Effect(Effects.toggleDebugDraw)
+    )
     }
   | LogFileStarted(filePath) => (
       (),
@@ -54,15 +67,23 @@ let update = (msg, _model) =>
 module Commands = {
   open Feature_Commands.Schema;
 
-  let nextEditor =
+  let logToTraceFile =
     define(
       ~category="Debug",
       ~title="Log to trace file",
       "oni.debug.startTraceLogging",
       Command(LogToTraceFile),
     );
+
+  let showDebugVisualization =
+    define(
+        ~category="Debug",
+        ~title="Render performance",
+        "oni.debug.toggleRenderPerformance",
+        Command(ToggleRenderPerformanceView)
+    )
 };
 
 module Contributions = {
-  let commands = Commands.[nextEditor];
+  let commands = Commands.[logToTraceFile, showDebugVisualization];
 };

From 9abbcd9c7cab66c77de0618f2e46643c26a6b2d4 Mon Sep 17 00:00:00 2001
From: Bryan Phelps <bryphe@outrunlabs.com>
Date: Wed, 28 Oct 2020 02:19:56 -0700
Subject: [PATCH 04/21] Some tweaks

---
 src/Feature/Editor/Editor.re | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Feature/Editor/Editor.re b/src/Feature/Editor/Editor.re
index 4a8d316005..f0bb02d742 100644
--- a/src/Feature/Editor/Editor.re
+++ b/src/Feature/Editor/Editor.re
@@ -106,11 +106,16 @@ type t = {
 };
 
 let shouldRender = (editorA, editorB) => {
+ // TODO: View lines different?
+ // TODO: Diagnostics different?
+ // TODO: Wrapping different?
+ // TODO: Move cursor rendering
+ // TODO: Move definition rendering
  editorA.key !== editorB.key
  || editorA.renderNonce != editorB.renderNonce
  || editorA.scrollX != editorB.scrollX
  || editorA.scrollY != editorB.scrollY
- || editorA.buffer !== editorB.buffer
+ || editorA.buffer !== editorB.buffer;
 };
 
 let key = ({key, _}) => key;

From 9de721a37d79647b93eee32173de0d51538df95c Mon Sep 17 00:00:00 2001
From: Bryan Phelps <bryphe@outrunlabs.com>
Date: Thu, 3 Dec 2020 17:09:33 -0800
Subject: [PATCH 05/21] Use latest layer-development-version

---
 bench.esy.lock/index.json                     | 393 ++++++++----------
 .../opam/bigarray-compat.1.0.0/opam           |   4 +-
 bench.esy.lock/opam/decoders.0.4.0/opam       |  40 --
 bench.esy.lock/opam/decoders.0.5.0/opam       |  40 ++
 .../opam/fix.20201120}/opam                   |   8 +-
 .../opam/menhir.20201201}/opam                |   6 +-
 .../opam/menhirLib.20201201}/opam             |   6 +-
 .../opam                                      |   6 +-
 .../opam/odoc.1.5.2}/opam                     |  13 +-
 .../opam/ppx_deriving.5.1}/opam               |  28 +-
 .../opam/ppx_deriving_yojson.3.6.1}/opam      |  19 +-
 bench.esy.lock/opam/ppx_tools.6.2/opam        |  21 -
 bench.esy.lock/opam/ppxfind.1.4/opam          |  41 --
 bench.esy.lock/opam/ppxlib.0.15.0/opam        |   2 +-
 .../opam/reason.3.6.2}/opam                   |  11 +-
 bench.esy.lock/opam/stdlib-shims.0.1.0/opam   |   4 +-
 esy.lock/index.json                           | 393 ++++++++----------
 esy.lock/opam/bigarray-compat.1.0.0/opam      |   4 +-
 esy.lock/opam/decoders.0.4.0/opam             |  40 --
 esy.lock/opam/decoders.0.5.0/opam             |  40 ++
 .../opam/fix.20201120}/opam                   |   8 +-
 .../{menhir.20200624 => menhir.20201201}/opam |   6 +-
 .../opam                                      |   6 +-
 .../opam/menhirSdk.20201201}/opam             |   6 +-
 .../opam/odoc.1.5.2}/opam                     |  13 +-
 .../opam/ppx_deriving.5.1}/opam               |  28 +-
 .../opam                                      |  19 +-
 esy.lock/opam/ppx_tools.6.2/opam              |  21 -
 esy.lock/opam/ppxfind.1.4/opam                |  41 --
 esy.lock/opam/ppxlib.0.15.0/opam              |   2 +-
 .../opam/{reason.3.6.0 => reason.3.6.2}/opam  |  11 +-
 esy.lock/opam/stdlib-shims.0.1.0/opam         |   4 +-
 integrationtest.esy.lock/index.json           | 393 ++++++++----------
 .../opam/bigarray-compat.1.0.0/opam           |   4 +-
 .../opam/decoders.0.4.0/opam                  |  40 --
 .../opam/decoders.0.5.0/opam                  |  40 ++
 .../opam/{fix.20200131 => fix.20201120}/opam  |   8 +-
 .../opam/menhir.20201201}/opam                |   6 +-
 .../opam/menhirLib.20201201}/opam             |   6 +-
 .../opam/menhirSdk.20201201}/opam             |   6 +-
 .../opam/{odoc.1.5.1 => odoc.1.5.2}/opam      |  13 +-
 .../opam/ppx_deriving.5.1}/opam               |  28 +-
 .../opam/ppx_deriving_yojson.3.6.1}/opam      |  19 +-
 .../opam/ppx_tools.6.2/opam                   |  21 -
 .../opam/ppxfind.1.4/opam                     |  41 --
 .../opam/ppxlib.0.15.0/opam                   |   2 +-
 .../opam/reason.3.6.2}/opam                   |  11 +-
 .../opam/stdlib-shims.0.1.0/opam              |   4 +-
 package.json                                  |   2 +-
 release.esy.lock/index.json                   | 393 ++++++++----------
 .../opam/bigarray-compat.1.0.0/opam           |   4 +-
 release.esy.lock/opam/decoders.0.4.0/opam     |  40 --
 release.esy.lock/opam/decoders.0.5.0/opam     |  40 ++
 .../opam/{fix.20200131 => fix.20201120}/opam  |   8 +-
 .../{menhir.20200624 => menhir.20201201}/opam |   6 +-
 .../opam/menhirLib.20201201}/opam             |   6 +-
 .../opam                                      |   6 +-
 .../opam/{odoc.1.5.1 => odoc.1.5.2}/opam      |  13 +-
 .../opam                                      |  28 +-
 .../opam/ppx_deriving_yojson.3.6.1}/opam      |  19 +-
 release.esy.lock/opam/ppx_tools.6.2/opam      |  21 -
 release.esy.lock/opam/ppxfind.1.4/opam        |  41 --
 release.esy.lock/opam/ppxlib.0.15.0/opam      |   2 +-
 .../opam/{reason.3.6.0 => reason.3.6.2}/opam  |  11 +-
 release.esy.lock/opam/stdlib-shims.0.1.0/opam |   4 +-
 test.esy.lock/index.json                      | 393 ++++++++----------
 test.esy.lock/opam/bigarray-compat.1.0.0/opam |   4 +-
 test.esy.lock/opam/decoders.0.4.0/opam        |  40 --
 test.esy.lock/opam/decoders.0.5.0/opam        |  40 ++
 test.esy.lock/opam/fix.20200131/opam          |  24 --
 test.esy.lock/opam/fix.20201120/opam          |  24 ++
 test.esy.lock/opam/menhir.20200624/opam       |  27 --
 test.esy.lock/opam/menhir.20201201/opam       |  27 ++
 test.esy.lock/opam/menhirLib.20200624/opam    |  28 --
 test.esy.lock/opam/menhirLib.20201201/opam    |  28 ++
 test.esy.lock/opam/menhirSdk.20200624/opam    |  28 --
 test.esy.lock/opam/menhirSdk.20201201/opam    |  28 ++
 test.esy.lock/opam/odoc.1.5.1/opam            |  52 ---
 test.esy.lock/opam/odoc.1.5.2/opam            |  53 +++
 test.esy.lock/opam/ppx_deriving.4.5/opam      |  35 --
 test.esy.lock/opam/ppx_deriving.5.1/opam      |  41 ++
 .../opam/ppx_deriving_yojson.3.5.3/opam       |  38 --
 .../opam/ppx_deriving_yojson.3.6.1/opam       |  37 ++
 test.esy.lock/opam/ppx_tools.6.2/opam         |  21 -
 test.esy.lock/opam/ppxfind.1.4/opam           |  41 --
 test.esy.lock/opam/ppxlib.0.15.0/opam         |   2 +-
 test.esy.lock/opam/reason.3.6.0/opam          |  32 --
 test.esy.lock/opam/reason.3.6.2/opam          |  31 ++
 test.esy.lock/opam/stdlib-shims.0.1.0/opam    |   4 +-
 89 files changed, 1549 insertions(+), 2099 deletions(-)
 delete mode 100644 bench.esy.lock/opam/decoders.0.4.0/opam
 create mode 100644 bench.esy.lock/opam/decoders.0.5.0/opam
 rename {esy.lock/opam/fix.20200131 => bench.esy.lock/opam/fix.20201120}/opam (62%)
 rename {integrationtest.esy.lock/opam/menhir.20200624 => bench.esy.lock/opam/menhir.20201201}/opam (69%)
 rename {integrationtest.esy.lock/opam/menhirLib.20200624 => bench.esy.lock/opam/menhirLib.20201201}/opam (70%)
 rename bench.esy.lock/opam/{menhirSdk.20200624 => menhirSdk.20201201}/opam (70%)
 rename {esy.lock/opam/odoc.1.5.1 => bench.esy.lock/opam/odoc.1.5.2}/opam (67%)
 rename {esy.lock/opam/ppx_deriving.4.5 => bench.esy.lock/opam/ppx_deriving.5.1}/opam (52%)
 rename {integrationtest.esy.lock/opam/ppx_deriving_yojson.3.5.3 => bench.esy.lock/opam/ppx_deriving_yojson.3.6.1}/opam (57%)
 delete mode 100644 bench.esy.lock/opam/ppx_tools.6.2/opam
 delete mode 100644 bench.esy.lock/opam/ppxfind.1.4/opam
 rename {integrationtest.esy.lock/opam/reason.3.6.0 => bench.esy.lock/opam/reason.3.6.2}/opam (78%)
 delete mode 100644 esy.lock/opam/decoders.0.4.0/opam
 create mode 100644 esy.lock/opam/decoders.0.5.0/opam
 rename {bench.esy.lock/opam/fix.20200131 => esy.lock/opam/fix.20201120}/opam (62%)
 rename esy.lock/opam/{menhir.20200624 => menhir.20201201}/opam (69%)
 rename esy.lock/opam/{menhirLib.20200624 => menhirLib.20201201}/opam (70%)
 rename {integrationtest.esy.lock/opam/menhirSdk.20200624 => esy.lock/opam/menhirSdk.20201201}/opam (70%)
 rename {bench.esy.lock/opam/odoc.1.5.1 => esy.lock/opam/odoc.1.5.2}/opam (67%)
 rename {integrationtest.esy.lock/opam/ppx_deriving.4.5 => esy.lock/opam/ppx_deriving.5.1}/opam (52%)
 rename esy.lock/opam/{ppx_deriving_yojson.3.5.3 => ppx_deriving_yojson.3.6.1}/opam (57%)
 delete mode 100644 esy.lock/opam/ppx_tools.6.2/opam
 delete mode 100644 esy.lock/opam/ppxfind.1.4/opam
 rename esy.lock/opam/{reason.3.6.0 => reason.3.6.2}/opam (78%)
 delete mode 100644 integrationtest.esy.lock/opam/decoders.0.4.0/opam
 create mode 100644 integrationtest.esy.lock/opam/decoders.0.5.0/opam
 rename integrationtest.esy.lock/opam/{fix.20200131 => fix.20201120}/opam (62%)
 rename {bench.esy.lock/opam/menhir.20200624 => integrationtest.esy.lock/opam/menhir.20201201}/opam (69%)
 rename {release.esy.lock/opam/menhirLib.20200624 => integrationtest.esy.lock/opam/menhirLib.20201201}/opam (70%)
 rename {esy.lock/opam/menhirSdk.20200624 => integrationtest.esy.lock/opam/menhirSdk.20201201}/opam (70%)
 rename integrationtest.esy.lock/opam/{odoc.1.5.1 => odoc.1.5.2}/opam (67%)
 rename {bench.esy.lock/opam/ppx_deriving.4.5 => integrationtest.esy.lock/opam/ppx_deriving.5.1}/opam (52%)
 rename {release.esy.lock/opam/ppx_deriving_yojson.3.5.3 => integrationtest.esy.lock/opam/ppx_deriving_yojson.3.6.1}/opam (57%)
 delete mode 100644 integrationtest.esy.lock/opam/ppx_tools.6.2/opam
 delete mode 100644 integrationtest.esy.lock/opam/ppxfind.1.4/opam
 rename {bench.esy.lock/opam/reason.3.6.0 => integrationtest.esy.lock/opam/reason.3.6.2}/opam (78%)
 delete mode 100644 release.esy.lock/opam/decoders.0.4.0/opam
 create mode 100644 release.esy.lock/opam/decoders.0.5.0/opam
 rename release.esy.lock/opam/{fix.20200131 => fix.20201120}/opam (62%)
 rename release.esy.lock/opam/{menhir.20200624 => menhir.20201201}/opam (69%)
 rename {bench.esy.lock/opam/menhirLib.20200624 => release.esy.lock/opam/menhirLib.20201201}/opam (70%)
 rename release.esy.lock/opam/{menhirSdk.20200624 => menhirSdk.20201201}/opam (70%)
 rename release.esy.lock/opam/{odoc.1.5.1 => odoc.1.5.2}/opam (67%)
 rename release.esy.lock/opam/{ppx_deriving.4.5 => ppx_deriving.5.1}/opam (52%)
 rename {bench.esy.lock/opam/ppx_deriving_yojson.3.5.3 => release.esy.lock/opam/ppx_deriving_yojson.3.6.1}/opam (57%)
 delete mode 100644 release.esy.lock/opam/ppx_tools.6.2/opam
 delete mode 100644 release.esy.lock/opam/ppxfind.1.4/opam
 rename release.esy.lock/opam/{reason.3.6.0 => reason.3.6.2}/opam (78%)
 delete mode 100644 test.esy.lock/opam/decoders.0.4.0/opam
 create mode 100644 test.esy.lock/opam/decoders.0.5.0/opam
 delete mode 100644 test.esy.lock/opam/fix.20200131/opam
 create mode 100644 test.esy.lock/opam/fix.20201120/opam
 delete mode 100644 test.esy.lock/opam/menhir.20200624/opam
 create mode 100644 test.esy.lock/opam/menhir.20201201/opam
 delete mode 100644 test.esy.lock/opam/menhirLib.20200624/opam
 create mode 100644 test.esy.lock/opam/menhirLib.20201201/opam
 delete mode 100644 test.esy.lock/opam/menhirSdk.20200624/opam
 create mode 100644 test.esy.lock/opam/menhirSdk.20201201/opam
 delete mode 100644 test.esy.lock/opam/odoc.1.5.1/opam
 create mode 100644 test.esy.lock/opam/odoc.1.5.2/opam
 delete mode 100644 test.esy.lock/opam/ppx_deriving.4.5/opam
 create mode 100644 test.esy.lock/opam/ppx_deriving.5.1/opam
 delete mode 100644 test.esy.lock/opam/ppx_deriving_yojson.3.5.3/opam
 create mode 100644 test.esy.lock/opam/ppx_deriving_yojson.3.6.1/opam
 delete mode 100644 test.esy.lock/opam/ppx_tools.6.2/opam
 delete mode 100644 test.esy.lock/opam/ppxfind.1.4/opam
 delete mode 100644 test.esy.lock/opam/reason.3.6.0/opam
 create mode 100644 test.esy.lock/opam/reason.3.6.2/opam

diff --git a/bench.esy.lock/index.json b/bench.esy.lock/index.json
index b17e129936..17e7c9b317 100644
--- a/bench.esy.lock/index.json
+++ b/bench.esy.lock/index.json
@@ -1,5 +1,5 @@
 {
-  "checksum": "57439db1dbe17866bcd1a2b95a3aca47",
+  "checksum": "8e9a335adbd446c4504db3cf8b88ac94",
   "root": "Oni2@link-dev:./package.json",
   "node": {
     "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": {
@@ -118,7 +118,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "revery@github:revery-ui/revery#4d2dae6@d41d8cd9",
+        "revery@github:revery-ui/revery#19467ad@d41d8cd9",
         "isolinear@github:revery-ui/isolinear#53fc4eb@d41d8cd9",
         "@revery/timber@2.0.0@d41d8cd9",
         "@revery/esy-libvterm@1.0.3@d41d8cd9",
@@ -126,13 +126,13 @@
       ],
       "devDependencies": []
     },
-    "revery@github:revery-ui/revery#4d2dae6@d41d8cd9": {
-      "id": "revery@github:revery-ui/revery#4d2dae6@d41d8cd9",
+    "revery@github:revery-ui/revery#19467ad@d41d8cd9": {
+      "id": "revery@github:revery-ui/revery#19467ad@d41d8cd9",
       "name": "revery",
-      "version": "github:revery-ui/revery#4d2dae6",
+      "version": "github:revery-ui/revery#19467ad",
       "source": {
         "type": "install",
-        "source": [ "github:revery-ui/revery#4d2dae6" ]
+        "source": [ "github:revery-ui/revery#19467ad" ]
       },
       "overrides": [],
       "dependencies": [
@@ -147,7 +147,7 @@
         "@revery/esy-harfbuzz@2.6.8001@d41d8cd9",
         "@opam/uutf@opam:1.0.2@4440868f", "@opam/uucp@opam:13.0.0@e9b515e0",
         "@opam/ppx_optcomp@opam:v0.14.0@47cec200",
-        "@opam/ppx_deriving@opam:4.5@d89f2934",
+        "@opam/ppx_deriving@opam:5.1@3037236f",
         "@opam/omd@github:ocaml/omd:omd.opam#1535e3c@d41d8cd9",
         "@opam/markup@opam:0.8.2@87975241",
         "@opam/lwt_ppx@opam:2.0.1@e6a764a0", "@opam/lwt@opam:4.5.0@542100aa",
@@ -161,19 +161,19 @@
       ],
       "devDependencies": []
     },
-    "resolve@1.18.1@d41d8cd9": {
-      "id": "resolve@1.18.1@d41d8cd9",
+    "resolve@1.19.0@d41d8cd9": {
+      "id": "resolve@1.19.0@d41d8cd9",
       "name": "resolve",
-      "version": "1.18.1",
+      "version": "1.19.0",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://registry.npmjs.org/resolve/-/resolve-1.18.1.tgz#sha1:018fcb2c5b207d2a6424aee361c5a266da8f4130"
+          "archive:https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz#sha1:1af5bf630409734a067cae29318aac7fa29a267c"
         ]
       },
       "overrides": [],
       "dependencies": [
-        "path-parse@1.0.6@d41d8cd9", "is-core-module@2.0.0@d41d8cd9"
+        "path-parse@1.0.6@d41d8cd9", "is-core-module@2.2.0@d41d8cd9"
       ],
       "devDependencies": []
     },
@@ -246,7 +246,7 @@
         ]
       },
       "overrides": [],
-      "dependencies": [ "resolve@1.18.1@d41d8cd9" ],
+      "dependencies": [ "resolve@1.19.0@d41d8cd9" ],
       "devDependencies": []
     },
     "rebez@github:jchavarri/rebez#03fa3b7@d41d8cd9": {
@@ -293,7 +293,7 @@
       "dependencies": [
         "refmterr@3.3.2@d41d8cd9", "ocaml@4.10.0@d41d8cd9",
         "esy-fzy@github:CrossR/esy-fzy#8176cee@d41d8cd9",
-        "@opam/reason@opam:3.6.0@58adb39a",
+        "@opam/reason@opam:3.6.2@1a34f8a4",
         "@opam/dune-configurator@opam:2.5.1@aeb9d8d5",
         "@opam/dune@opam:2.5.0@e0bac278"
       ],
@@ -326,7 +326,7 @@
       "overrides": [],
       "dependencies": [
         "xmldom@0.1.31@d41d8cd9", "xmlbuilder@9.0.7@d41d8cd9",
-        "base64-js@1.3.1@d41d8cd9"
+        "base64-js@1.5.1@d41d8cd9"
       ],
       "devDependencies": []
     },
@@ -471,14 +471,14 @@
       ],
       "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ]
     },
-    "is-core-module@2.0.0@d41d8cd9": {
-      "id": "is-core-module@2.0.0@d41d8cd9",
+    "is-core-module@2.2.0@d41d8cd9": {
+      "id": "is-core-module@2.2.0@d41d8cd9",
       "name": "is-core-module",
-      "version": "2.0.0",
+      "version": "2.2.0",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://registry.npmjs.org/is-core-module/-/is-core-module-2.0.0.tgz#sha1:58531b70aed1db7c0e8d4eb1a0a2d1ddd64bd12d"
+          "archive:https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz#sha1:97037ef3d52224d85163f5597b2b63d9afed981a"
         ]
       },
       "overrides": [],
@@ -919,14 +919,14 @@
       ],
       "devDependencies": []
     },
-    "base64-js@1.3.1@d41d8cd9": {
-      "id": "base64-js@1.3.1@d41d8cd9",
+    "base64-js@1.5.1@d41d8cd9": {
+      "id": "base64-js@1.5.1@d41d8cd9",
       "name": "base64-js",
-      "version": "1.3.1",
+      "version": "1.5.1",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz#sha1:58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"
+          "archive:https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz#sha1:1b1b440160a5bf7ad40b650f095963481903930a"
         ]
       },
       "overrides": [],
@@ -1009,7 +1009,7 @@
       "overrides": [ "bench.json" ],
       "dependencies": [
         "revery-terminal@github:revery-ui/revery-terminal#a9cb168@d41d8cd9",
-        "revery@github:revery-ui/revery#4d2dae6@d41d8cd9",
+        "revery@github:revery-ui/revery#19467ad@d41d8cd9",
         "reperf@1.5.0@d41d8cd9",
         "rench@github:bryphe/rench#a976fe5@d41d8cd9",
         "refmterr@3.3.2@d41d8cd9",
@@ -1027,13 +1027,13 @@
         "@reason-native-web/esy-openssl@1.1.1007@d41d8cd9",
         "@opam/yojson@github:onivim/yojson:yojson.opam#f480aef@d41d8cd9",
         "@opam/uutf@opam:1.0.2@4440868f", "@opam/uucp@opam:13.0.0@e9b515e0",
-        "@opam/reason@opam:3.6.0@58adb39a", "@opam/re@opam:1.9.0@d4d5e13d",
-        "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "@opam/reason@opam:3.6.2@1a34f8a4", "@opam/re@opam:1.9.0@d4d5e13d",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/ppx_optcomp@opam:v0.14.0@47cec200",
         "@opam/ppx_let@opam:v0.14.0@eb9b93e0",
         "@opam/ppx_inline_test@opam:v0.14.1@2e4fdd8d",
-        "@opam/ppx_deriving_yojson@opam:3.5.3@253e094d",
-        "@opam/ppx_deriving@opam:4.5@d89f2934",
+        "@opam/ppx_deriving_yojson@opam:3.6.1@faf11a7c",
+        "@opam/ppx_deriving@opam:5.1@3037236f",
         "@opam/ocamlformat@opam:0.15.0@8e036963",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@opam/markup@opam:0.8.2@87975241", "@opam/lwt@opam:4.5.0@542100aa",
@@ -1501,8 +1501,8 @@
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
       ]
     },
-    "@opam/stdlib-shims@opam:0.1.0@8c116481": {
-      "id": "@opam/stdlib-shims@opam:0.1.0@8c116481",
+    "@opam/stdlib-shims@opam:0.1.0@148f22ac": {
+      "id": "@opam/stdlib-shims@opam:0.1.0@148f22ac",
       "name": "@opam/stdlib-shims",
       "version": "opam:0.1.0",
       "source": {
@@ -1650,38 +1650,38 @@
         "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
-    "@opam/reason@opam:3.6.0@58adb39a": {
-      "id": "@opam/reason@opam:3.6.0@58adb39a",
+    "@opam/reason@opam:3.6.2@1a34f8a4": {
+      "id": "@opam/reason@opam:3.6.2@1a34f8a4",
       "name": "@opam/reason",
-      "version": "opam:3.6.0",
+      "version": "opam:3.6.2",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/d4/d4d729804bc509bca0ac6223e06f7314#md5:d4d729804bc509bca0ac6223e06f7314",
-          "archive:https://registry.npmjs.org/@esy-ocaml/reason/-/reason-3.6.0.tgz#md5:d4d729804bc509bca0ac6223e06f7314"
+          "archive:https://opam.ocaml.org/cache/md5/d6/d6de40f280f1c229f9cb26eb4015f1c5#md5:d6de40f280f1c229f9cb26eb4015f1c5",
+          "archive:https://registry.npmjs.org/@esy-ocaml/reason/-/reason-3.6.2.tgz#md5:d6de40f280f1c229f9cb26eb4015f1c5"
         ],
         "opam": {
           "name": "reason",
-          "version": "3.6.0",
-          "path": "bench.esy.lock/opam/reason.3.6.0"
+          "version": "3.6.2",
+          "path": "bench.esy.lock/opam/reason.3.6.2"
         }
       },
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82",
+        "@opam/ppx_derivers@opam:1.2.1@ecf0aa45",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
-        "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173",
         "@opam/merlin-extend@opam:0.6@404f814c",
-        "@opam/menhir@opam:20200624@8629ff13",
-        "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.5.0@e0bac278",
+        "@opam/menhir@opam:20201201@a7ee0741",
+        "@opam/fix@opam:20201120@5c318621", "@opam/dune@opam:2.5.0@e0bac278",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82",
-        "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173",
+        "@opam/ppx_derivers@opam:1.2.1@ecf0aa45",
         "@opam/merlin-extend@opam:0.6@404f814c",
-        "@opam/menhir@opam:20200624@8629ff13",
-        "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.5.0@e0bac278"
+        "@opam/menhir@opam:20201201@a7ee0741",
+        "@opam/fix@opam:20201120@5c318621", "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
     "@opam/react@opam:1.2.1@0e11855f": {
@@ -1818,8 +1818,8 @@
         "@opam/base-bytes@opam:base@19d0c2ff"
       ]
     },
-    "@opam/ppxlib@opam:0.15.0@a90ae385": {
-      "id": "@opam/ppxlib@opam:0.15.0@a90ae385",
+    "@opam/ppxlib@opam:0.15.0@6a9d8126": {
+      "id": "@opam/ppxlib@opam:0.15.0@6a9d8126",
       "name": "@opam/ppxlib",
       "version": "opam:0.15.0",
       "source": {
@@ -1836,7 +1836,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/stdlib-shims@opam:0.1.0@8c116481",
+        "ocaml@4.10.0@d41d8cd9", "@opam/stdlib-shims@opam:0.1.0@148f22ac",
         "@opam/sexplib0@opam:v0.14.0@ddeb6438",
         "@opam/ppx_derivers@opam:1.2.1@ecf0aa45",
         "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173",
@@ -1844,7 +1844,7 @@
         "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/stdlib-shims@opam:0.1.0@8c116481",
+        "ocaml@4.10.0@d41d8cd9", "@opam/stdlib-shims@opam:0.1.0@148f22ac",
         "@opam/sexplib0@opam:v0.14.0@ddeb6438",
         "@opam/ppx_derivers@opam:1.2.1@ecf0aa45",
         "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173",
@@ -1852,34 +1852,6 @@
         "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
-    "@opam/ppxfind@opam:1.4@d75848d2": {
-      "id": "@opam/ppxfind@opam:1.4@d75848d2",
-      "name": "@opam/ppxfind",
-      "version": "opam:1.4",
-      "source": {
-        "type": "install",
-        "source": [
-          "archive:https://opam.ocaml.org/cache/sha256/98/98291c69f04f7f7b7cdad1b5d786c70fc595559d4663cc04cb711ac132db4971#sha256:98291c69f04f7f7b7cdad1b5d786c70fc595559d4663cc04cb711ac132db4971",
-          "archive:https://github.com/jeremiedimino/ppxfind/releases/download/1.4/ppxfind-1.4.tbz#sha256:98291c69f04f7f7b7cdad1b5d786c70fc595559d4663cc04cb711ac132db4971"
-        ],
-        "opam": {
-          "name": "ppxfind",
-          "version": "1.4",
-          "path": "bench.esy.lock/opam/ppxfind.1.4"
-        }
-      },
-      "overrides": [],
-      "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
-        "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173",
-        "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/substs@0.0.1@d41d8cd9"
-      ],
-      "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
-        "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173",
-        "@opam/dune@opam:2.5.0@e0bac278"
-      ]
-    },
     "@opam/ppx_yojson_conv_lib@opam:v0.14.0@116b53d6": {
       "id": "@opam/ppx_yojson_conv_lib@opam:v0.14.0@116b53d6",
       "name": "@opam/ppx_yojson_conv_lib",
@@ -1936,31 +1908,6 @@
         "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
-    "@opam/ppx_tools@opam:6.2@62a3aff2": {
-      "id": "@opam/ppx_tools@opam:6.2@62a3aff2",
-      "name": "@opam/ppx_tools",
-      "version": "opam:6.2",
-      "source": {
-        "type": "install",
-        "source": [
-          "archive:https://opam.ocaml.org/cache/md5/68/68b05e0794c475c384b9285d1156d1f3#md5:68b05e0794c475c384b9285d1156d1f3",
-          "archive:https://github.com/ocaml-ppx/ppx_tools/archive/6.2.tar.gz#md5:68b05e0794c475c384b9285d1156d1f3"
-        ],
-        "opam": {
-          "name": "ppx_tools",
-          "version": "6.2",
-          "path": "bench.esy.lock/opam/ppx_tools.6.2"
-        }
-      },
-      "overrides": [],
-      "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@e0bac278",
-        "@esy-ocaml/substs@0.0.1@d41d8cd9"
-      ],
-      "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@e0bac278"
-      ]
-    },
     "@opam/ppx_sexp_conv@opam:v0.14.1@5fc4da3c": {
       "id": "@opam/ppx_sexp_conv@opam:v0.14.1@5fc4da3c",
       "name": "@opam/ppx_sexp_conv",
@@ -1980,13 +1927,13 @@
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/sexplib0@opam:v0.14.0@ddeb6438",
-        "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/sexplib0@opam:v0.14.0@ddeb6438",
-        "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
       ]
     },
@@ -2009,13 +1956,13 @@
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/stdio@opam:v0.14.0@a624e254",
-        "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/stdio@opam:v0.14.0@a624e254",
-        "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
       ]
     },
@@ -2037,12 +1984,12 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
       ]
     },
@@ -2064,13 +2011,13 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/octavius@opam:1.2.2@b328d1f1",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/octavius@opam:1.2.2@b328d1f1",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
       ]
@@ -2094,13 +2041,13 @@
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/time_now@opam:v0.14.0@5e4046b3",
-        "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/time_now@opam:v0.14.0@5e4046b3",
-        "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
       ]
     },
@@ -2122,12 +2069,12 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
       ]
     },
@@ -2149,14 +2096,14 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/ppx_sexp_conv@opam:v0.14.1@5fc4da3c",
         "@opam/ppx_compare@opam:v0.14.0@615de7a6",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/ppx_sexp_conv@opam:v0.14.1@5fc4da3c",
         "@opam/ppx_compare@opam:v0.14.0@615de7a6",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
@@ -2180,80 +2127,80 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
       ]
     },
-    "@opam/ppx_deriving_yojson@opam:3.5.3@253e094d": {
-      "id": "@opam/ppx_deriving_yojson@opam:3.5.3@253e094d",
+    "@opam/ppx_deriving_yojson@opam:3.6.1@faf11a7c": {
+      "id": "@opam/ppx_deriving_yojson@opam:3.6.1@faf11a7c",
       "name": "@opam/ppx_deriving_yojson",
-      "version": "opam:3.5.3",
+      "version": "opam:3.6.1",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/e5/e5185e4ac9d149a332566139df55d408#md5:e5185e4ac9d149a332566139df55d408",
-          "archive:https://github.com/ocaml-ppx/ppx_deriving_yojson/archive/v3.5.3.tar.gz#md5:e5185e4ac9d149a332566139df55d408"
+          "archive:https://opam.ocaml.org/cache/sha256/71/712ee9207c70dd144e72cd689bee2d2beb120b804e77c74ec6f7b843a88944e6#sha256:712ee9207c70dd144e72cd689bee2d2beb120b804e77c74ec6f7b843a88944e6",
+          "archive:https://github.com/ocaml-ppx/ppx_deriving_yojson/releases/download/v3.6.1/ppx_deriving_yojson-v3.6.1.tbz#sha256:712ee9207c70dd144e72cd689bee2d2beb120b804e77c74ec6f7b843a88944e6"
         ],
         "opam": {
           "name": "ppx_deriving_yojson",
-          "version": "3.5.3",
-          "path": "bench.esy.lock/opam/ppx_deriving_yojson.3.5.3"
+          "version": "3.6.1",
+          "path": "bench.esy.lock/opam/ppx_deriving_yojson.3.6.1"
         }
       },
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9",
         "@opam/yojson@github:onivim/yojson:yojson.opam#f480aef@d41d8cd9",
-        "@opam/result@opam:1.5@6b753c82", "@opam/ppxfind@opam:1.4@d75848d2",
-        "@opam/ppx_tools@opam:6.2@62a3aff2",
-        "@opam/ppx_deriving@opam:4.5@d89f2934",
-        "@opam/dune@opam:2.5.0@e0bac278", "@opam/cppo@opam:1.6.6@f4f83858",
-        "@esy-ocaml/substs@0.0.1@d41d8cd9"
+        "@opam/result@opam:1.5@6b753c82",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
+        "@opam/ppx_deriving@opam:5.1@3037236f",
+        "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9",
         "@opam/yojson@github:onivim/yojson:yojson.opam#f480aef@d41d8cd9",
         "@opam/result@opam:1.5@6b753c82",
-        "@opam/ppx_tools@opam:6.2@62a3aff2",
-        "@opam/ppx_deriving@opam:4.5@d89f2934",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
+        "@opam/ppx_deriving@opam:5.1@3037236f",
         "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
-    "@opam/ppx_deriving@opam:4.5@d89f2934": {
-      "id": "@opam/ppx_deriving@opam:4.5@d89f2934",
+    "@opam/ppx_deriving@opam:5.1@3037236f": {
+      "id": "@opam/ppx_deriving@opam:5.1@3037236f",
       "name": "@opam/ppx_deriving",
-      "version": "opam:4.5",
+      "version": "opam:5.1",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/sha512/f7/f79153c5231ba1e03a3491fde95ca82ecb62fe05b60a649a374d2fbc5ea5dd9242126de7dfbe917c22fd7077c026c940e18c6b36c5ce0ec4bb6e07f11d2b710b#sha512:f79153c5231ba1e03a3491fde95ca82ecb62fe05b60a649a374d2fbc5ea5dd9242126de7dfbe917c22fd7077c026c940e18c6b36c5ce0ec4bb6e07f11d2b710b",
-          "archive:https://github.com/ocaml-ppx/ppx_deriving/archive/v4.5.tar.gz#sha512:f79153c5231ba1e03a3491fde95ca82ecb62fe05b60a649a374d2fbc5ea5dd9242126de7dfbe917c22fd7077c026c940e18c6b36c5ce0ec4bb6e07f11d2b710b"
+          "archive:https://opam.ocaml.org/cache/sha256/b0/b04f3b22b754e65af50812730695863192ae410e802e074b55ebbb8c4f73c4c4#sha256:b04f3b22b754e65af50812730695863192ae410e802e074b55ebbb8c4f73c4c4",
+          "archive:https://github.com/ocaml-ppx/ppx_deriving/releases/download/v5.1/ppx_deriving-v5.1.tbz#sha256:b04f3b22b754e65af50812730695863192ae410e802e074b55ebbb8c4f73c4c4"
         ],
         "opam": {
           "name": "ppx_deriving",
-          "version": "4.5",
-          "path": "bench.esy.lock/opam/ppx_deriving.4.5"
+          "version": "5.1",
+          "path": "bench.esy.lock/opam/ppx_deriving.5.1"
         }
       },
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82",
-        "@opam/ppxfind@opam:1.4@d75848d2",
-        "@opam/ppx_tools@opam:6.2@62a3aff2",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/ppx_derivers@opam:1.2.1@ecf0aa45",
+        "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/cppo@opam:1.6.6@f4f83858",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82",
-        "@opam/ppx_tools@opam:6.2@62a3aff2",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/ppx_derivers@opam:1.2.1@ecf0aa45",
+        "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173",
         "@opam/dune@opam:2.5.0@e0bac278"
       ]
@@ -2301,12 +2248,12 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
       ]
     },
@@ -2328,12 +2275,12 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
       ]
     },
@@ -2355,7 +2302,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/ppx_sexp_conv@opam:v0.14.1@5fc4da3c",
         "@opam/ppx_js_style@opam:v0.14.0@10b020a8",
         "@opam/ppx_hash@opam:v0.14.0@8e9618e4",
@@ -2365,7 +2312,7 @@
         "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/ppx_sexp_conv@opam:v0.14.1@5fc4da3c",
         "@opam/ppx_js_style@opam:v0.14.0@10b020a8",
         "@opam/ppx_hash@opam:v0.14.0@8e9618e4",
@@ -2393,7 +2340,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/ppx_sexp_conv@opam:v0.14.1@5fc4da3c",
         "@opam/ppx_here@opam:v0.14.0@5ccc1c01",
         "@opam/ppx_compare@opam:v0.14.0@615de7a6",
@@ -2402,7 +2349,7 @@
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/ppx_sexp_conv@opam:v0.14.1@5fc4da3c",
         "@opam/ppx_here@opam:v0.14.0@5ccc1c01",
         "@opam/ppx_compare@opam:v0.14.0@615de7a6",
@@ -2431,20 +2378,20 @@
         "@opam/base-bigarray@opam:base@b03491b0"
       ]
     },
-    "@opam/odoc@opam:1.5.1@52a58c0b": {
-      "id": "@opam/odoc@opam:1.5.1@52a58c0b",
+    "@opam/odoc@opam:1.5.2@236518eb": {
+      "id": "@opam/odoc@opam:1.5.2@236518eb",
       "name": "@opam/odoc",
-      "version": "opam:1.5.1",
+      "version": "opam:1.5.2",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/sha256/ea/ea14721344e2aab6b63f2884782d37e94a1ed8ab91147a1c08a29710d99d354f#sha256:ea14721344e2aab6b63f2884782d37e94a1ed8ab91147a1c08a29710d99d354f",
-          "archive:https://github.com/ocaml/odoc/releases/download/1.5.1/odoc-1.5.1.tbz#sha256:ea14721344e2aab6b63f2884782d37e94a1ed8ab91147a1c08a29710d99d354f"
+          "archive:https://opam.ocaml.org/cache/sha256/d2/d24463f2660bc28c72cda001478360158e953721c9e23fb361ec4783113c4871#sha256:d24463f2660bc28c72cda001478360158e953721c9e23fb361ec4783113c4871",
+          "archive:https://github.com/ocaml/odoc/releases/download/1.5.2/odoc-1.5.2.tbz#sha256:d24463f2660bc28c72cda001478360158e953721c9e23fb361ec4783113c4871"
         ],
         "opam": {
           "name": "odoc",
-          "version": "1.5.1",
-          "path": "bench.esy.lock/opam/odoc.1.5.1"
+          "version": "1.5.2",
+          "path": "bench.esy.lock/opam/odoc.1.5.2"
         }
       },
       "overrides": [],
@@ -2538,11 +2485,11 @@
         "ocaml@4.10.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f",
         "@opam/uuseg@opam:13.0.0@f60712a7",
         "@opam/stdio@opam:v0.14.0@a624e254", "@opam/re@opam:1.9.0@d4d5e13d",
-        "@opam/odoc@opam:1.5.1@52a58c0b",
+        "@opam/odoc@opam:1.5.2@236518eb",
         "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173",
-        "@opam/menhir@opam:20200624@8629ff13",
+        "@opam/menhir@opam:20201201@a7ee0741",
         "@opam/fpath@opam:0.7.3@674d8125",
-        "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.5.0@e0bac278",
+        "@opam/fix@opam:20201120@5c318621", "@opam/dune@opam:2.5.0@e0bac278",
         "@opam/cmdliner@opam:1.0.4@93208aac",
         "@opam/base-unix@opam:base@87d0b2eb",
         "@opam/base@opam:v0.14.0@8bc55fce",
@@ -2552,11 +2499,11 @@
         "ocaml@4.10.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f",
         "@opam/uuseg@opam:13.0.0@f60712a7",
         "@opam/stdio@opam:v0.14.0@a624e254", "@opam/re@opam:1.9.0@d4d5e13d",
-        "@opam/odoc@opam:1.5.1@52a58c0b",
+        "@opam/odoc@opam:1.5.2@236518eb",
         "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173",
-        "@opam/menhir@opam:20200624@8629ff13",
+        "@opam/menhir@opam:20201201@a7ee0741",
         "@opam/fpath@opam:0.7.3@674d8125",
-        "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.5.0@e0bac278",
+        "@opam/fix@opam:20201120@5c318621", "@opam/dune@opam:2.5.0@e0bac278",
         "@opam/cmdliner@opam:1.0.4@93208aac",
         "@opam/base-unix@opam:base@87d0b2eb",
         "@opam/base@opam:v0.14.0@8bc55fce"
@@ -2684,20 +2631,20 @@
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9",
         "@opam/yojson@github:onivim/yojson:yojson.opam#f480aef@d41d8cd9",
-        "@opam/stdlib-shims@opam:0.1.0@8c116481",
+        "@opam/stdlib-shims@opam:0.1.0@148f22ac",
         "@opam/ppx_yojson_conv_lib@opam:v0.14.0@116b53d6",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
-        "@opam/menhir@opam:20200624@8629ff13",
+        "@opam/menhir@opam:20201201@a7ee0741",
         "@opam/dune-build-info@opam:2.6.2@03ffe168",
         "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9",
         "@opam/yojson@github:onivim/yojson:yojson.opam#f480aef@d41d8cd9",
-        "@opam/stdlib-shims@opam:0.1.0@8c116481",
+        "@opam/stdlib-shims@opam:0.1.0@148f22ac",
         "@opam/ppx_yojson_conv_lib@opam:v0.14.0@116b53d6",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
-        "@opam/menhir@opam:20200624@8629ff13",
+        "@opam/menhir@opam:20201201@a7ee0741",
         "@opam/dune-build-info@opam:2.6.2@03ffe168",
         "@opam/dune@opam:2.5.0@e0bac278"
       ]
@@ -2831,20 +2778,20 @@
         "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
-    "@opam/menhirSdk@opam:20200624@2a05b5a7": {
-      "id": "@opam/menhirSdk@opam:20200624@2a05b5a7",
+    "@opam/menhirSdk@opam:20201201@4b828f46": {
+      "id": "@opam/menhirSdk@opam:20201201@4b828f46",
       "name": "@opam/menhirSdk",
-      "version": "opam:20200624",
+      "version": "opam:20201201",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/c3/c37ff53a4a69059e1f8223067b91bb8b#md5:c37ff53a4a69059e1f8223067b91bb8b",
-          "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz#md5:c37ff53a4a69059e1f8223067b91bb8b"
+          "archive:https://opam.ocaml.org/cache/md5/ca/ca1047954bfe8c857425dc67eee46272#md5:ca1047954bfe8c857425dc67eee46272",
+          "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20201201/archive.tar.gz#md5:ca1047954bfe8c857425dc67eee46272"
         ],
         "opam": {
           "name": "menhirSdk",
-          "version": "20200624",
-          "path": "bench.esy.lock/opam/menhirSdk.20200624"
+          "version": "20201201",
+          "path": "bench.esy.lock/opam/menhirSdk.20201201"
         }
       },
       "overrides": [],
@@ -2856,20 +2803,20 @@
         "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
-    "@opam/menhirLib@opam:20200624@8bdd2b0e": {
-      "id": "@opam/menhirLib@opam:20200624@8bdd2b0e",
+    "@opam/menhirLib@opam:20201201@901a3013": {
+      "id": "@opam/menhirLib@opam:20201201@901a3013",
       "name": "@opam/menhirLib",
-      "version": "opam:20200624",
+      "version": "opam:20201201",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/c3/c37ff53a4a69059e1f8223067b91bb8b#md5:c37ff53a4a69059e1f8223067b91bb8b",
-          "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz#md5:c37ff53a4a69059e1f8223067b91bb8b"
+          "archive:https://opam.ocaml.org/cache/md5/ca/ca1047954bfe8c857425dc67eee46272#md5:ca1047954bfe8c857425dc67eee46272",
+          "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20201201/archive.tar.gz#md5:ca1047954bfe8c857425dc67eee46272"
         ],
         "opam": {
           "name": "menhirLib",
-          "version": "20200624",
-          "path": "bench.esy.lock/opam/menhirLib.20200624"
+          "version": "20201201",
+          "path": "bench.esy.lock/opam/menhirLib.20201201"
         }
       },
       "overrides": [],
@@ -2881,31 +2828,31 @@
         "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
-    "@opam/menhir@opam:20200624@8629ff13": {
-      "id": "@opam/menhir@opam:20200624@8629ff13",
+    "@opam/menhir@opam:20201201@a7ee0741": {
+      "id": "@opam/menhir@opam:20201201@a7ee0741",
       "name": "@opam/menhir",
-      "version": "opam:20200624",
+      "version": "opam:20201201",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/c3/c37ff53a4a69059e1f8223067b91bb8b#md5:c37ff53a4a69059e1f8223067b91bb8b",
-          "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz#md5:c37ff53a4a69059e1f8223067b91bb8b"
+          "archive:https://opam.ocaml.org/cache/md5/ca/ca1047954bfe8c857425dc67eee46272#md5:ca1047954bfe8c857425dc67eee46272",
+          "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20201201/archive.tar.gz#md5:ca1047954bfe8c857425dc67eee46272"
         ],
         "opam": {
           "name": "menhir",
-          "version": "20200624",
-          "path": "bench.esy.lock/opam/menhir.20200624"
+          "version": "20201201",
+          "path": "bench.esy.lock/opam/menhir.20201201"
         }
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200624@2a05b5a7",
-        "@opam/menhirLib@opam:20200624@8bdd2b0e",
+        "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20201201@4b828f46",
+        "@opam/menhirLib@opam:20201201@901a3013",
         "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200624@2a05b5a7",
-        "@opam/menhirLib@opam:20200624@8bdd2b0e",
+        "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20201201@4b828f46",
+        "@opam/menhirLib@opam:20201201@901a3013",
         "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
@@ -3278,12 +3225,12 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.0@58adb39a",
+        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.2@1a34f8a4",
         "@opam/fp@github:bryphe/reason-native:fp.opam#5a7a756@d41d8cd9",
         "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.0@58adb39a",
+        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.2@1a34f8a4",
         "@opam/fp@github:bryphe/reason-native:fp.opam#5a7a756@d41d8cd9",
         "@opam/dune@opam:2.5.0@e0bac278"
       ]
@@ -3326,11 +3273,11 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.0@58adb39a",
+        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.2@1a34f8a4",
         "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.0@58adb39a",
+        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.2@1a34f8a4",
         "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
@@ -3353,7 +3300,7 @@
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c",
-        "@opam/stdlib-shims@opam:0.1.0@8c116481",
+        "@opam/stdlib-shims@opam:0.1.0@148f22ac",
         "@opam/seq@opam:base@d8d7de1d",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
@@ -3362,24 +3309,24 @@
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/stdlib-shims@opam:0.1.0@8c116481",
+        "ocaml@4.10.0@d41d8cd9", "@opam/stdlib-shims@opam:0.1.0@148f22ac",
         "@opam/seq@opam:base@d8d7de1d"
       ]
     },
-    "@opam/fix@opam:20200131@0ecd2f01": {
-      "id": "@opam/fix@opam:20200131@0ecd2f01",
+    "@opam/fix@opam:20201120@5c318621": {
+      "id": "@opam/fix@opam:20201120@5c318621",
       "name": "@opam/fix",
-      "version": "opam:20200131",
+      "version": "opam:20201120",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/99/991ff031666c662eaab638d2e0f4ac1d#md5:991ff031666c662eaab638d2e0f4ac1d",
-          "archive:https://gitlab.inria.fr/fpottier/fix/repository/20200131/archive.tar.gz#md5:991ff031666c662eaab638d2e0f4ac1d"
+          "archive:https://opam.ocaml.org/cache/md5/7e/7eb570b759635fe66f3556d2b1cc88e3#md5:7eb570b759635fe66f3556d2b1cc88e3",
+          "archive:https://gitlab.inria.fr/fpottier/fix/repository/20201120/archive.tar.gz#md5:7eb570b759635fe66f3556d2b1cc88e3"
         ],
         "opam": {
           "name": "fix",
-          "version": "20200131",
-          "path": "bench.esy.lock/opam/fix.20200131"
+          "version": "20201120",
+          "path": "bench.esy.lock/opam/fix.20201120"
         }
       },
       "overrides": [],
@@ -3526,12 +3473,12 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.0@58adb39a",
+        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.2@1a34f8a4",
         "@opam/fp@github:bryphe/reason-native:fp.opam#5a7a756@d41d8cd9",
         "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.0@58adb39a",
+        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.2@1a34f8a4",
         "@opam/fp@github:bryphe/reason-native:fp.opam#5a7a756@d41d8cd9",
         "@opam/dune@opam:2.5.0@e0bac278"
       ]
@@ -3557,30 +3504,30 @@
         "ocaml@4.10.0@d41d8cd9",
         "@opam/yojson@github:onivim/yojson:yojson.opam#f480aef@d41d8cd9",
         "@opam/dune@opam:2.5.0@e0bac278",
-        "@opam/decoders@opam:0.4.0@b66e1fb4",
+        "@opam/decoders@opam:0.5.0@9df01185",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9",
         "@opam/yojson@github:onivim/yojson:yojson.opam#f480aef@d41d8cd9",
         "@opam/dune@opam:2.5.0@e0bac278",
-        "@opam/decoders@opam:0.4.0@b66e1fb4"
+        "@opam/decoders@opam:0.5.0@9df01185"
       ]
     },
-    "@opam/decoders@opam:0.4.0@b66e1fb4": {
-      "id": "@opam/decoders@opam:0.4.0@b66e1fb4",
+    "@opam/decoders@opam:0.5.0@9df01185": {
+      "id": "@opam/decoders@opam:0.5.0@9df01185",
       "name": "@opam/decoders",
-      "version": "opam:0.4.0",
+      "version": "opam:0.5.0",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/sha256/18/18ebbd98901dff67c9944d465ed508df018c8ee8e13bfe037d5ad780584eebf7#sha256:18ebbd98901dff67c9944d465ed508df018c8ee8e13bfe037d5ad780584eebf7",
-          "archive:https://github.com/mattjbray/ocaml-decoders/releases/download/v0.4.0/decoders-v0.4.0.tbz#sha256:18ebbd98901dff67c9944d465ed508df018c8ee8e13bfe037d5ad780584eebf7"
+          "archive:https://opam.ocaml.org/cache/sha256/fc/fc0b672a2ebcb1cfb7575384c5033b14985b26fe90ab517749ba77ed7fc0f11a#sha256:fc0b672a2ebcb1cfb7575384c5033b14985b26fe90ab517749ba77ed7fc0f11a",
+          "archive:https://github.com/mattjbray/ocaml-decoders/releases/download/v0.5.0/decoders-v0.5.0.tbz#sha256:fc0b672a2ebcb1cfb7575384c5033b14985b26fe90ab517749ba77ed7fc0f11a"
         ],
         "opam": {
           "name": "decoders",
-          "version": "0.4.0",
-          "path": "bench.esy.lock/opam/decoders.0.4.0"
+          "version": "0.5.0",
+          "path": "bench.esy.lock/opam/decoders.0.5.0"
         }
       },
       "overrides": [],
@@ -3885,16 +3832,16 @@
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@e0bac278",
-        "@opam/bigarray-compat@opam:1.0.0@1faefa97",
+        "@opam/bigarray-compat@opam:1.0.0@3a87ad65",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@e0bac278",
-        "@opam/bigarray-compat@opam:1.0.0@1faefa97"
+        "@opam/bigarray-compat@opam:1.0.0@3a87ad65"
       ]
     },
-    "@opam/bigarray-compat@opam:1.0.0@1faefa97": {
-      "id": "@opam/bigarray-compat@opam:1.0.0@1faefa97",
+    "@opam/bigarray-compat@opam:1.0.0@3a87ad65": {
+      "id": "@opam/bigarray-compat@opam:1.0.0@3a87ad65",
       "name": "@opam/bigarray-compat",
       "version": "opam:1.0.0",
       "source": {
@@ -4101,13 +4048,13 @@
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d",
-        "@opam/menhir@opam:20200624@8629ff13",
+        "@opam/menhir@opam:20201201@a7ee0741",
         "@opam/easy-format@opam:1.3.2@0484b3c4",
         "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d",
-        "@opam/menhir@opam:20200624@8629ff13",
+        "@opam/menhir@opam:20201201@a7ee0741",
         "@opam/easy-format@opam:1.3.2@0484b3c4",
         "@opam/dune@opam:2.5.0@e0bac278"
       ]
@@ -4215,8 +4162,8 @@
         "@opam/ppx_derivers@opam:1.2.1@ecf0aa45",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/merlin-extend@opam:0.6@404f814c",
-        "@opam/menhir@opam:20200624@8629ff13",
-        "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.5.0@e0bac278"
+        "@opam/menhir@opam:20201201@a7ee0741",
+        "@opam/fix@opam:20201120@5c318621", "@opam/dune@opam:2.5.0@e0bac278"
       ],
       "devDependencies": []
     },
@@ -4245,7 +4192,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/reason@3.6.2@d41d8cd9"
       ],
       "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ]
diff --git a/bench.esy.lock/opam/bigarray-compat.1.0.0/opam b/bench.esy.lock/opam/bigarray-compat.1.0.0/opam
index 93751514d6..24a122d43f 100644
--- a/bench.esy.lock/opam/bigarray-compat.1.0.0/opam
+++ b/bench.esy.lock/opam/bigarray-compat.1.0.0/opam
@@ -6,7 +6,7 @@ license: "ISC"
 homepage: "https://github.com/mirage/bigarray-compat"
 bug-reports: "https://github.com/mirage/bigarray-compat/issues"
 depends: [
-  "ocaml" {>= "4.03.0"}
+  "ocaml" {>= "4.02.3"}
   "dune" {>= "1.0"}
 ]
 build: [
@@ -20,4 +20,4 @@ url {
     "md5=1cc7c25382a8900bada34aadfd66632e"
     "sha512=c365fee15582aca35d7b05268cde29e54774ad7df7be56762b4aad78ca1409d4326ad3b34af0f1cc2c7b872837290a9cd9ff43b47987c03bba7bba32fe8a030f"
   ]
-}
\ No newline at end of file
+}
diff --git a/bench.esy.lock/opam/decoders.0.4.0/opam b/bench.esy.lock/opam/decoders.0.4.0/opam
deleted file mode 100644
index bc1e810302..0000000000
--- a/bench.esy.lock/opam/decoders.0.4.0/opam
+++ /dev/null
@@ -1,40 +0,0 @@
-opam-version: "2.0"
-synopsis: "Elm-inspired decoders for Ocaml"
-description: """
-A combinator library for "decoding" JSON-like values into your own Ocaml types, inspired by Elm's `Json.Decode` and `Json.Encode`.
-
-> Eh?
-
-An Ocaml program having a JSON (or YAML) data source usually goes something like this:
-
-1. Get your data from somewhere. Now you have a `string`.
-2. *Parse* the `string` as JSON (or YAML). Now you have a `Yojson.Basic.json`, or maybe an `Ezjsonm.value`, or perhaps a `Ocyaml.yaml`.
-3. *Decode* the JSON value to an Ocaml type that's actually useful for your program's domain.
-
-This library helps with step 3.
-"""
-maintainer: "Matt Bray <matt@aestheticintegration.com>"
-authors: ["Matt Bray <matt@aestheticintegration.com>"]
-homepage: "https://github.com/mattjbray/ocaml-decoders"
-doc: "https://mattjbray.github.io/ocaml-decoders/decoders"
-bug-reports: "https://github.com/mattjbray/ocaml-decoders/issues"
-license: "ISC"
-dev-repo: "git+https://github.com/mattjbray/ocaml-decoders.git"
-build: [
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-  ["dune" "build" "@doc" "-p" name "-j" jobs] {with-doc}
-]
-depends: [
-  "dune" {>= "1.0"}
-  "containers" {with-test}
-  "ocaml" { >= "4.03.0" }
-]
-url {
-  src:
-    "https://github.com/mattjbray/ocaml-decoders/releases/download/v0.4.0/decoders-v0.4.0.tbz"
-  checksum: [
-    "sha256=18ebbd98901dff67c9944d465ed508df018c8ee8e13bfe037d5ad780584eebf7"
-    "sha512=a6221b40cc1c3d9ea46c5e7cec6c5992b923e390ce004c23d7f36e99974c10f6d4a690113255b85d3895f357e0dd44562e9bc03ba8708223cb1e56ba182c10d3"
-  ]
-}
diff --git a/bench.esy.lock/opam/decoders.0.5.0/opam b/bench.esy.lock/opam/decoders.0.5.0/opam
new file mode 100644
index 0000000000..171215090b
--- /dev/null
+++ b/bench.esy.lock/opam/decoders.0.5.0/opam
@@ -0,0 +1,40 @@
+opam-version: "2.0"
+synopsis: "Elm-inspired decoders for Ocaml"
+description:
+  "A combinator library for \"decoding\" JSON-like values into your own Ocaml types, inspired by Elm's `Json.Decode` and `Json.Encode`."
+maintainer: ["Matt Bray <mattjbray@gmail.com>"]
+authors: ["Matt Bray <mattjbray@gmail.com>"]
+license: "ISC"
+homepage: "https://github.com/mattjbray/ocaml-decoders"
+doc: "https://mattjbray.github.io/ocaml-decoders/"
+bug-reports: "https://github.com/mattjbray/ocaml-decoders/issues"
+depends: [
+  "ocaml" {>= "4.03.0"}
+  "dune" {>= "2.0"}
+  "odoc" {with-doc}
+  "containers" {with-test}
+]
+build: [
+  ["dune" "subst"] {pinned}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+]
+dev-repo: "git+https://github.com/mattjbray/ocaml-decoders.git"
+x-commit-hash: "19200c6221a834098306620234310de514f6301c"
+url {
+  src:
+    "https://github.com/mattjbray/ocaml-decoders/releases/download/v0.5.0/decoders-v0.5.0.tbz"
+  checksum: [
+    "sha256=fc0b672a2ebcb1cfb7575384c5033b14985b26fe90ab517749ba77ed7fc0f11a"
+    "sha512=908f8cc12267344cb10319cf8ce05308734980093581791da07365e9986cbe96a1bc420da9eb6057930cbe37255824d76ee8c96d68e31f13bd3361834a6c7e10"
+  ]
+}
diff --git a/esy.lock/opam/fix.20200131/opam b/bench.esy.lock/opam/fix.20201120/opam
similarity index 62%
rename from esy.lock/opam/fix.20200131/opam
rename to bench.esy.lock/opam/fix.20201120/opam
index 4babcba82a..31c8a641a2 100644
--- a/esy.lock/opam/fix.20200131/opam
+++ b/bench.esy.lock/opam/fix.20201120/opam
@@ -11,14 +11,14 @@ build: [
 ]
 depends: [
   "ocaml" { >= "4.03" }
-  "dune" { >= "1.3" }
+  "dune" {>=  "1.3" }
 ]
 synopsis: "Facilities for memoization and fixed points"
 url {
   src:
-    "https://gitlab.inria.fr/fpottier/fix/repository/20200131/archive.tar.gz"
+    "https://gitlab.inria.fr/fpottier/fix/repository/20201120/archive.tar.gz"
   checksum: [
-    "md5=991ff031666c662eaab638d2e0f4ac1d"
-    "sha512=01c45a1d90b02ec0939e968b185a6a373ac6117e2287b9a26d3db9d71e9569d086cea50da60710fcab5c2ed9d3b4c72b76839c0651e436f1fb39c77dc7c04b5e"
+    "md5=7eb570b759635fe66f3556d2b1cc88e3"
+    "sha512=344dcc619f9e8b8a6c998775b6d2dab2ea5253e6a67abe4797f76dc5dd30bc776568abce1e90477422e9db447821579889737e3531c42139708f813e983ea5d4"
   ]
 }
diff --git a/integrationtest.esy.lock/opam/menhir.20200624/opam b/bench.esy.lock/opam/menhir.20201201/opam
similarity index 69%
rename from integrationtest.esy.lock/opam/menhir.20200624/opam
rename to bench.esy.lock/opam/menhir.20201201/opam
index 37637fcf60..8bf0aabeeb 100644
--- a/integrationtest.esy.lock/opam/menhir.20200624/opam
+++ b/bench.esy.lock/opam/menhir.20201201/opam
@@ -19,9 +19,9 @@ depends: [
 synopsis: "An LR(1) parser generator"
 url {
   src:
-    "https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz"
+    "https://gitlab.inria.fr/fpottier/menhir/repository/20201201/archive.tar.gz"
   checksum: [
-    "md5=c37ff53a4a69059e1f8223067b91bb8b"
-    "sha512=68cd165bd65c93fc9b14820a032b6d760674b3e811d8536c2e26e10f9fc5892720564f109484f12f8d08d849c2983c2eaf350d76ab1122a5b8a3c7674ab2bd39"
+    "md5=ca1047954bfe8c857425dc67eee46272"
+    "sha512=571e7de852a2ea7d1cbb27fb9fd0b716b6ba1f112d4aedf4548d41f907c9a9b74e1b557a26a7515c2a0e5407de6c2614cea17d51a088d845d4c6ceaec85a0ecb"
   ]
 }
diff --git a/integrationtest.esy.lock/opam/menhirLib.20200624/opam b/bench.esy.lock/opam/menhirLib.20201201/opam
similarity index 70%
rename from integrationtest.esy.lock/opam/menhirLib.20200624/opam
rename to bench.esy.lock/opam/menhirLib.20201201/opam
index afcbe5d5e7..3d5290fd0f 100644
--- a/integrationtest.esy.lock/opam/menhirLib.20200624/opam
+++ b/bench.esy.lock/opam/menhirLib.20201201/opam
@@ -20,9 +20,9 @@ conflicts: [
 synopsis: "Runtime support library for parsers generated by Menhir"
 url {
   src:
-    "https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz"
+    "https://gitlab.inria.fr/fpottier/menhir/repository/20201201/archive.tar.gz"
   checksum: [
-    "md5=c37ff53a4a69059e1f8223067b91bb8b"
-    "sha512=68cd165bd65c93fc9b14820a032b6d760674b3e811d8536c2e26e10f9fc5892720564f109484f12f8d08d849c2983c2eaf350d76ab1122a5b8a3c7674ab2bd39"
+    "md5=ca1047954bfe8c857425dc67eee46272"
+    "sha512=571e7de852a2ea7d1cbb27fb9fd0b716b6ba1f112d4aedf4548d41f907c9a9b74e1b557a26a7515c2a0e5407de6c2614cea17d51a088d845d4c6ceaec85a0ecb"
   ]
 }
diff --git a/bench.esy.lock/opam/menhirSdk.20200624/opam b/bench.esy.lock/opam/menhirSdk.20201201/opam
similarity index 70%
rename from bench.esy.lock/opam/menhirSdk.20200624/opam
rename to bench.esy.lock/opam/menhirSdk.20201201/opam
index af12216336..46afb20f24 100644
--- a/bench.esy.lock/opam/menhirSdk.20200624/opam
+++ b/bench.esy.lock/opam/menhirSdk.20201201/opam
@@ -20,9 +20,9 @@ conflicts: [
 synopsis: "Compile-time library for auxiliary tools related to Menhir"
 url {
   src:
-    "https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz"
+    "https://gitlab.inria.fr/fpottier/menhir/repository/20201201/archive.tar.gz"
   checksum: [
-    "md5=c37ff53a4a69059e1f8223067b91bb8b"
-    "sha512=68cd165bd65c93fc9b14820a032b6d760674b3e811d8536c2e26e10f9fc5892720564f109484f12f8d08d849c2983c2eaf350d76ab1122a5b8a3c7674ab2bd39"
+    "md5=ca1047954bfe8c857425dc67eee46272"
+    "sha512=571e7de852a2ea7d1cbb27fb9fd0b716b6ba1f112d4aedf4548d41f907c9a9b74e1b557a26a7515c2a0e5407de6c2614cea17d51a088d845d4c6ceaec85a0ecb"
   ]
 }
diff --git a/esy.lock/opam/odoc.1.5.1/opam b/bench.esy.lock/opam/odoc.1.5.2/opam
similarity index 67%
rename from esy.lock/opam/odoc.1.5.1/opam
rename to bench.esy.lock/opam/odoc.1.5.2/opam
index a7ccb1dca0..f59e640771 100644
--- a/esy.lock/opam/odoc.1.5.1/opam
+++ b/bench.esy.lock/opam/odoc.1.5.2/opam
@@ -12,7 +12,7 @@ authors: [
   "Anton Bachin <antonbachin@yahoo.com>"
   "Jon Ludlam <jon@recoil.org>"
 ]
-maintainer: "Jon Ludlam <jon@recoil.org>"
+maintainer: "Anton Bachin <antonbachin@yahoo.com>"
 dev-repo: "git+https://github.com/ocaml/odoc.git"
 
 synopsis: "OCaml documentation generator"
@@ -27,12 +27,12 @@ depends: [
   "cppo" {build}
   "dune"
   "fpath"
-  "ocaml" {>= "4.02.0" & < "4.12"}
+  "ocaml" {>= "4.02.0"}
   "result"
   "tyxml" {>= "4.3.0"}
 
   "alcotest" {dev & >= "0.8.3"}
-  "markup" {dev & >= "0.8.0"}
+  "markup" {dev & >= "1.0.0"}
   "ocamlfind" {dev}
   "sexplib" {dev & >= "113.33.00"}
 
@@ -43,10 +43,11 @@ build: [
   ["dune" "subst"] {pinned}
   ["dune" "build" "-p" name "-j" jobs]
 ]
+x-commit-hash: "c0df8ce2171fa9645a41f371429aa3ddc16de5c1"
 url {
-  src: "https://github.com/ocaml/odoc/releases/download/1.5.1/odoc-1.5.1.tbz"
+  src: "https://github.com/ocaml/odoc/releases/download/1.5.2/odoc-1.5.2.tbz"
   checksum: [
-    "sha256=ea14721344e2aab6b63f2884782d37e94a1ed8ab91147a1c08a29710d99d354f"
-    "sha512=b2d12277d61e1e52354128d459d2ad49bea24a4d46db89790769c2843c4b00beaee3ea7d0215211079174c0bd893de6bf52dcbb71e46622728be7491d91058b2"
+    "sha256=d24463f2660bc28c72cda001478360158e953721c9e23fb361ec4783113c4871"
+    "sha512=e6c83630325de422f31cda8f88c038d213969f8b98e989593c057658f3956c0855860c9bc38f61b6479929516ca95aee689ddfba3ad8c47d821c4fdf54524cf9"
   ]
 }
diff --git a/esy.lock/opam/ppx_deriving.4.5/opam b/bench.esy.lock/opam/ppx_deriving.5.1/opam
similarity index 52%
rename from esy.lock/opam/ppx_deriving.4.5/opam
rename to bench.esy.lock/opam/ppx_deriving.5.1/opam
index 62efe36445..0396de61ca 100644
--- a/esy.lock/opam/ppx_deriving.4.5/opam
+++ b/bench.esy.lock/opam/ppx_deriving.5.1/opam
@@ -1,5 +1,5 @@
 opam-version: "2.0"
-maintainer: "thierry.martinez@inria.fr"
+maintainer: "whitequark <whitequark@whitequark.org>"
 authors: [ "whitequark <whitequark@whitequark.org>" ]
 license: "MIT"
 homepage: "https://github.com/ocaml-ppx/ppx_deriving"
@@ -8,28 +8,34 @@ bug-reports: "https://github.com/ocaml-ppx/ppx_deriving/issues"
 dev-repo: "git+https://github.com/ocaml-ppx/ppx_deriving.git"
 tags: [ "syntax" ]
 build: [
-  ["dune" "subst"] {pinned}
+  ["dune" "subst"] {dev}
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
   ["dune" "build" "@doc" "-p" name "-j" jobs] {with-doc}
 ]
 depends: [
-  "dune"     {>= "1.6.3"}
-  "cppo"     {build}
-  "ppxfind"  {build}
+  "ocaml" {>= "4.07.0" & < "4.12"}
+  "dune" {>= "1.6.3"}
+  "cppo" {build}
+  "ocamlfind"
   "ocaml-migrate-parsetree" {< "2.0.0"}
   "ppx_derivers"
-  "ppx_tools"  {>= "4.02.3"}
+  "ppxlib" {>= "0.14.0" & < "0.16.0"}
   "result"
-  "ounit"      {with-test}
-  "ocaml" {>= "4.02" & < "4.12.0"}
+  "ounit" {with-test}
 ]
-synopsis: "Type-driven code generation for OCaml >=4.02.2"
+synopsis: "Type-driven code generation for OCaml"
 description: """
 ppx_deriving provides common infrastructure for generating
 code based on type definitions, and a set of useful plugins
 for common tasks.
 """
 url {
-  src: "https://github.com/ocaml-ppx/ppx_deriving/archive/v4.5.tar.gz"
-  checksum: "sha512=f79153c5231ba1e03a3491fde95ca82ecb62fe05b60a649a374d2fbc5ea5dd9242126de7dfbe917c22fd7077c026c940e18c6b36c5ce0ec4bb6e07f11d2b710b"}
+  src:
+    "https://github.com/ocaml-ppx/ppx_deriving/releases/download/v5.1/ppx_deriving-v5.1.tbz"
+  checksum: [
+    "sha256=b04f3b22b754e65af50812730695863192ae410e802e074b55ebbb8c4f73c4c4"
+    "sha512=abcccda4878a82b0d0eedcc23127da6ae5c10bface59335a226a714752a46b987bff01f48fbe432910b26bfc7b332b301d191da71a9da0db593d86335bc83cd9"
+  ]
+}
+x-commit-hash: "b29509ff51f79f0f47dd85d60ab837ded5d2c6e4"
diff --git a/integrationtest.esy.lock/opam/ppx_deriving_yojson.3.5.3/opam b/bench.esy.lock/opam/ppx_deriving_yojson.3.6.1/opam
similarity index 57%
rename from integrationtest.esy.lock/opam/ppx_deriving_yojson.3.5.3/opam
rename to bench.esy.lock/opam/ppx_deriving_yojson.3.6.1/opam
index 289dd8327d..2f5c6c245d 100644
--- a/integrationtest.esy.lock/opam/ppx_deriving_yojson.3.5.3/opam
+++ b/bench.esy.lock/opam/ppx_deriving_yojson.3.6.1/opam
@@ -4,7 +4,7 @@ authors: [ "whitequark <whitequark@whitequark.org>" ]
 license: "MIT"
 homepage: "https://github.com/ocaml-ppx/ppx_deriving_yojson"
 bug-reports: "https://github.com/ocaml-ppx/ppx_deriving_yojson/issues"
-dev-repo: "git://github.com/ocaml-ppx/ppx_deriving_yojson.git"
+dev-repo: "git+https://github.com/ocaml-ppx/ppx_deriving_yojson.git"
 tags: [ "syntax" "json" ]
 build: [
   ["dune" "subst"] {dev}
@@ -12,14 +12,12 @@ build: [
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
 depends: [
-  "ocaml" {>= "4.04.0"}
+  "ocaml" {>= "4.05.0"}
+  "dune" {>= "1.0"}
   "yojson" {>= "1.6.0" & < "2.0.0"}
   "result"
-  "ppx_deriving" {>= "4.5" & < "5.0"}
-  "ppx_tools"
-  "ppxfind" {build}
-  "dune" {>= "1.0"}
-  "cppo" {build}
+  "ppx_deriving" {>= "5.1"}
+  "ppxlib" {>= "0.14.0"}
   "ounit" {with-test & >= "2.0.0"}
 ]
 synopsis:
@@ -30,9 +28,10 @@ a JSON codec generator.
 """
 url {
   src:
-    "https://github.com/ocaml-ppx/ppx_deriving_yojson/archive/v3.5.3.tar.gz"
+    "https://github.com/ocaml-ppx/ppx_deriving_yojson/releases/download/v3.6.1/ppx_deriving_yojson-v3.6.1.tbz"
   checksum: [
-    "md5=e5185e4ac9d149a332566139df55d408"
-    "sha512=550fe8c400fa57f3f33f4cec509df061db0d62353e0d05ffb64e02aaef74324369840297507553d9b8a8cba81f980c210d23177bf184dbe58b952a7df4aa2176"
+    "sha256=712ee9207c70dd144e72cd689bee2d2beb120b804e77c74ec6f7b843a88944e6"
+    "sha512=d8c828902b8441f73e08fc03e2173ce81a09cccfe091471fbcffe098b2272739b98a05e8308016da3efeb3d4d1abd7d941bfaac42c85961ea40915ddce526577"
   ]
 }
+x-commit-hash: "d0abe462de8bab52d763eeafd751e8ea1ba211ac"
diff --git a/bench.esy.lock/opam/ppx_tools.6.2/opam b/bench.esy.lock/opam/ppx_tools.6.2/opam
deleted file mode 100644
index 9e8b874706..0000000000
--- a/bench.esy.lock/opam/ppx_tools.6.2/opam
+++ /dev/null
@@ -1,21 +0,0 @@
-opam-version: "2.0"
-synopsis: "Tools for authors of ppx rewriters and other syntactic tools"
-maintainer: "Kate <kit.ty.kate@disroot.org>"
-authors: "Alain Frisch <alain.frisch@lexifi.com>"
-license: "MIT"
-tags: [ "syntax" ]
-homepage: "https://github.com/ocaml-ppx/ppx_tools"
-bug-reports: "https://github.com/ocaml-ppx/ppx_tools/issues"
-dev-repo: "git://github.com/ocaml-ppx/ppx_tools.git"
-build: ["dune" "build" "-p" name "-j" jobs]
-depends: [
-  "ocaml" {>= "4.08.0" & < "4.12.0"}
-  "dune" {>= "1.6"}
-]
-url {
-  src: "https://github.com/ocaml-ppx/ppx_tools/archive/6.2.tar.gz"
-  checksum: [
-    "md5=68b05e0794c475c384b9285d1156d1f3"
-    "sha512=fc3943c69901ef46843355c3482d5a1481d05ee94fb0a344ec04101059a02cbaa76fed5742cfae82730edf378f2e140d859a5cf590653f85359255d451f07dc8"
-  ]
-}
diff --git a/bench.esy.lock/opam/ppxfind.1.4/opam b/bench.esy.lock/opam/ppxfind.1.4/opam
deleted file mode 100644
index 57eefe4e65..0000000000
--- a/bench.esy.lock/opam/ppxfind.1.4/opam
+++ /dev/null
@@ -1,41 +0,0 @@
-opam-version: "2.0"
-synopsis: "Tool combining ocamlfind and ppx"
-description: """
-Ppxfind is a small command line tool that among other things allows
-to use old style ppx rewriters with jbuilder.
-"""
-maintainer: ["Jérémie Dimino <jeremie@dimino.org>"]
-authors: ["Jérémie Dimino <jeremie@dimino.org>"]
-license: "BSD3"
-homepage: "https://github.com/jeremiedimino/ppxfind"
-doc: "https://jeremiedimino.github.io/ppxfind/"
-bug-reports: "https://github.com/jeremiedimino/ppxfind/issues"
-depends: [
-  "dune" {>= "2.0"}
-  "ocaml-migrate-parsetree" {>= "1.6.0" & < "2.0.0"}
-  "ocamlfind"
-  "ocaml" {>= "4.02.3"}
-]
-build: [
-  ["dune" "subst"] {pinned}
-  [
-    "dune"
-    "build"
-    "-p"
-    name
-    "-j"
-    jobs
-    "@install"
-    "@runtest" {with-test}
-    "@doc" {with-doc}
-  ]
-]
-dev-repo: "git+https://github.com/jeremiedimino/ppxfind.git"
-url {
-  src:
-    "https://github.com/jeremiedimino/ppxfind/releases/download/1.4/ppxfind-1.4.tbz"
-  checksum: [
-    "sha256=98291c69f04f7f7b7cdad1b5d786c70fc595559d4663cc04cb711ac132db4971"
-    "sha512=f80b0ee09fb536aa9f154da80d06a1b68ba3b10605fb7338bd6449beb5c8d00e983bf66b4a63e12659ae1410fea56d0a2c4cfd43584616438504628035bcb981"
-  ]
-}
diff --git a/bench.esy.lock/opam/ppxlib.0.15.0/opam b/bench.esy.lock/opam/ppxlib.0.15.0/opam
index 084b18884c..f32985ad85 100644
--- a/bench.esy.lock/opam/ppxlib.0.15.0/opam
+++ b/bench.esy.lock/opam/ppxlib.0.15.0/opam
@@ -14,7 +14,7 @@ run-test: [
   ["dune" "runtest" "-p" name "-j" jobs] { ocaml:version >= "4.10" }
 ]
 depends: [
-  "ocaml"                   {>= "4.04.1" & < "4.12"}
+  "ocaml"                   {>= "4.04.1"}
   "dune"                    {>= "1.11"}
   "ocaml-compiler-libs"     {>= "v0.11.0"}
   "ocaml-migrate-parsetree" {>= "1.5.0" & < "2.0.0"}
diff --git a/integrationtest.esy.lock/opam/reason.3.6.0/opam b/bench.esy.lock/opam/reason.3.6.2/opam
similarity index 78%
rename from integrationtest.esy.lock/opam/reason.3.6.0/opam
rename to bench.esy.lock/opam/reason.3.6.2/opam
index 3e9119724e..9408643bc9 100644
--- a/integrationtest.esy.lock/opam/reason.3.6.0/opam
+++ b/bench.esy.lock/opam/reason.3.6.2/opam
@@ -9,17 +9,16 @@ dev-repo: "git://github.com/facebook/reason.git"
 tags: [ "syntax" ]
 build: [
   ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
 depends: [
-  "ocaml"         {>= "4.03" & < "4.11"}
+  "ocaml"         {>= "4.03" & < "4.12"}
   "dune"          {>= "1.4"}
   "ocamlfind"     {build}
   "menhir"        {>= "20170418"}
-  "merlin-extend" {>= "0.4"}
+  "merlin-extend" {>= "0.6"}
+  "ppx_derivers" {< "2.0"}
   "fix"
   "result"
-  "ocaml-migrate-parsetree" {< "2.0.0"}
 ]
 synopsis: "Reason: Syntax & Toolchain for OCaml"
 description: """
@@ -27,6 +26,6 @@ Reason gives OCaml a new syntax that is remniscient of languages like
 JavaScript. It's also the umbrella project for a set of tools for the OCaml &
 JavaScript ecosystem."""
 url {
-  src: "https://registry.npmjs.org/@esy-ocaml/reason/-/reason-3.6.0.tgz"
-  checksum: "md5=d4d729804bc509bca0ac6223e06f7314"
+  src: "https://registry.npmjs.org/@esy-ocaml/reason/-/reason-3.6.2.tgz"
+  checksum: "md5=d6de40f280f1c229f9cb26eb4015f1c5"
 }
diff --git a/bench.esy.lock/opam/stdlib-shims.0.1.0/opam b/bench.esy.lock/opam/stdlib-shims.0.1.0/opam
index 0d1079d893..c6f3529a33 100644
--- a/bench.esy.lock/opam/stdlib-shims.0.1.0/opam
+++ b/bench.esy.lock/opam/stdlib-shims.0.1.0/opam
@@ -8,9 +8,9 @@ bug-reports: "https://github.com/ocaml/stdlib-shims/issues"
 tags: ["stdlib" "compatibility" "org:ocaml"]
 license: ["typeof OCaml system"]
 depends: [
-  "ocaml" {>="4.02.3"}
+  "ocaml" {>= "4.02.3"}
   "dune"
- ("dune" {>= "2.7.0"} | "dune" & "ocaml" {<"4.12.0~~"})
+ ("dune" {>= "2.8.0"} | "ocaml" {< "4.12.0~~"})
 ]
 build: [ "dune" "build" "-p" name "-j" jobs ]
 synopsis: "Backport some of the new stdlib features to older compiler"
diff --git a/esy.lock/index.json b/esy.lock/index.json
index 0b07a93864..a8078b2660 100644
--- a/esy.lock/index.json
+++ b/esy.lock/index.json
@@ -1,5 +1,5 @@
 {
-  "checksum": "57439db1dbe17866bcd1a2b95a3aca47",
+  "checksum": "8e9a335adbd446c4504db3cf8b88ac94",
   "root": "Oni2@link-dev:./package.json",
   "node": {
     "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": {
@@ -118,7 +118,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "revery@github:revery-ui/revery#4d2dae6@d41d8cd9",
+        "revery@github:revery-ui/revery#19467ad@d41d8cd9",
         "isolinear@github:revery-ui/isolinear#53fc4eb@d41d8cd9",
         "@revery/timber@2.0.0@d41d8cd9",
         "@revery/esy-libvterm@1.0.3@d41d8cd9",
@@ -126,13 +126,13 @@
       ],
       "devDependencies": []
     },
-    "revery@github:revery-ui/revery#4d2dae6@d41d8cd9": {
-      "id": "revery@github:revery-ui/revery#4d2dae6@d41d8cd9",
+    "revery@github:revery-ui/revery#19467ad@d41d8cd9": {
+      "id": "revery@github:revery-ui/revery#19467ad@d41d8cd9",
       "name": "revery",
-      "version": "github:revery-ui/revery#4d2dae6",
+      "version": "github:revery-ui/revery#19467ad",
       "source": {
         "type": "install",
-        "source": [ "github:revery-ui/revery#4d2dae6" ]
+        "source": [ "github:revery-ui/revery#19467ad" ]
       },
       "overrides": [],
       "dependencies": [
@@ -147,7 +147,7 @@
         "@revery/esy-harfbuzz@2.6.8001@d41d8cd9",
         "@opam/uutf@opam:1.0.2@4440868f", "@opam/uucp@opam:13.0.0@e9b515e0",
         "@opam/ppx_optcomp@opam:v0.14.0@47cec200",
-        "@opam/ppx_deriving@opam:4.5@d89f2934",
+        "@opam/ppx_deriving@opam:5.1@3037236f",
         "@opam/omd@github:ocaml/omd:omd.opam#1535e3c@d41d8cd9",
         "@opam/markup@opam:0.8.2@87975241",
         "@opam/lwt_ppx@opam:2.0.1@e6a764a0", "@opam/lwt@opam:4.5.0@542100aa",
@@ -161,19 +161,19 @@
       ],
       "devDependencies": []
     },
-    "resolve@1.18.1@d41d8cd9": {
-      "id": "resolve@1.18.1@d41d8cd9",
+    "resolve@1.19.0@d41d8cd9": {
+      "id": "resolve@1.19.0@d41d8cd9",
       "name": "resolve",
-      "version": "1.18.1",
+      "version": "1.19.0",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://registry.npmjs.org/resolve/-/resolve-1.18.1.tgz#sha1:018fcb2c5b207d2a6424aee361c5a266da8f4130"
+          "archive:https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz#sha1:1af5bf630409734a067cae29318aac7fa29a267c"
         ]
       },
       "overrides": [],
       "dependencies": [
-        "path-parse@1.0.6@d41d8cd9", "is-core-module@2.0.0@d41d8cd9"
+        "path-parse@1.0.6@d41d8cd9", "is-core-module@2.2.0@d41d8cd9"
       ],
       "devDependencies": []
     },
@@ -246,7 +246,7 @@
         ]
       },
       "overrides": [],
-      "dependencies": [ "resolve@1.18.1@d41d8cd9" ],
+      "dependencies": [ "resolve@1.19.0@d41d8cd9" ],
       "devDependencies": []
     },
     "rebez@github:jchavarri/rebez#03fa3b7@d41d8cd9": {
@@ -293,7 +293,7 @@
       "dependencies": [
         "refmterr@3.3.2@d41d8cd9", "ocaml@4.10.0@d41d8cd9",
         "esy-fzy@github:CrossR/esy-fzy#8176cee@d41d8cd9",
-        "@opam/reason@opam:3.6.0@58adb39a",
+        "@opam/reason@opam:3.6.2@1a34f8a4",
         "@opam/dune-configurator@opam:2.5.1@aeb9d8d5",
         "@opam/dune@opam:2.5.0@e0bac278"
       ],
@@ -326,7 +326,7 @@
       "overrides": [],
       "dependencies": [
         "xmldom@0.1.31@d41d8cd9", "xmlbuilder@9.0.7@d41d8cd9",
-        "base64-js@1.3.1@d41d8cd9"
+        "base64-js@1.5.1@d41d8cd9"
       ],
       "devDependencies": []
     },
@@ -471,14 +471,14 @@
       ],
       "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ]
     },
-    "is-core-module@2.0.0@d41d8cd9": {
-      "id": "is-core-module@2.0.0@d41d8cd9",
+    "is-core-module@2.2.0@d41d8cd9": {
+      "id": "is-core-module@2.2.0@d41d8cd9",
       "name": "is-core-module",
-      "version": "2.0.0",
+      "version": "2.2.0",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://registry.npmjs.org/is-core-module/-/is-core-module-2.0.0.tgz#sha1:58531b70aed1db7c0e8d4eb1a0a2d1ddd64bd12d"
+          "archive:https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz#sha1:97037ef3d52224d85163f5597b2b63d9afed981a"
         ]
       },
       "overrides": [],
@@ -919,14 +919,14 @@
       ],
       "devDependencies": []
     },
-    "base64-js@1.3.1@d41d8cd9": {
-      "id": "base64-js@1.3.1@d41d8cd9",
+    "base64-js@1.5.1@d41d8cd9": {
+      "id": "base64-js@1.5.1@d41d8cd9",
       "name": "base64-js",
-      "version": "1.3.1",
+      "version": "1.5.1",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz#sha1:58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"
+          "archive:https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz#sha1:1b1b440160a5bf7ad40b650f095963481903930a"
         ]
       },
       "overrides": [],
@@ -1009,7 +1009,7 @@
       "overrides": [],
       "dependencies": [
         "revery-terminal@github:revery-ui/revery-terminal#a9cb168@d41d8cd9",
-        "revery@github:revery-ui/revery#4d2dae6@d41d8cd9",
+        "revery@github:revery-ui/revery#19467ad@d41d8cd9",
         "rench@github:bryphe/rench#a976fe5@d41d8cd9",
         "refmterr@3.3.2@d41d8cd9",
         "reason-native-crash-utils@github:onivim/reason-native-crash-utils#38c8f00@d41d8cd9",
@@ -1026,13 +1026,13 @@
         "@reason-native-web/esy-openssl@1.1.1007@d41d8cd9",
         "@opam/yojson@github:onivim/yojson:yojson.opam#f480aef@d41d8cd9",
         "@opam/uutf@opam:1.0.2@4440868f", "@opam/uucp@opam:13.0.0@e9b515e0",
-        "@opam/reason@opam:3.6.0@58adb39a", "@opam/re@opam:1.9.0@d4d5e13d",
-        "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "@opam/reason@opam:3.6.2@1a34f8a4", "@opam/re@opam:1.9.0@d4d5e13d",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/ppx_optcomp@opam:v0.14.0@47cec200",
         "@opam/ppx_let@opam:v0.14.0@eb9b93e0",
         "@opam/ppx_inline_test@opam:v0.14.1@2e4fdd8d",
-        "@opam/ppx_deriving_yojson@opam:3.5.3@253e094d",
-        "@opam/ppx_deriving@opam:4.5@d89f2934",
+        "@opam/ppx_deriving_yojson@opam:3.6.1@faf11a7c",
+        "@opam/ppx_deriving@opam:5.1@3037236f",
         "@opam/ocamlformat@opam:0.15.0@8e036963",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@opam/markup@opam:0.8.2@87975241", "@opam/lwt@opam:4.5.0@542100aa",
@@ -1500,8 +1500,8 @@
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
       ]
     },
-    "@opam/stdlib-shims@opam:0.1.0@8c116481": {
-      "id": "@opam/stdlib-shims@opam:0.1.0@8c116481",
+    "@opam/stdlib-shims@opam:0.1.0@148f22ac": {
+      "id": "@opam/stdlib-shims@opam:0.1.0@148f22ac",
       "name": "@opam/stdlib-shims",
       "version": "opam:0.1.0",
       "source": {
@@ -1649,38 +1649,38 @@
         "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
-    "@opam/reason@opam:3.6.0@58adb39a": {
-      "id": "@opam/reason@opam:3.6.0@58adb39a",
+    "@opam/reason@opam:3.6.2@1a34f8a4": {
+      "id": "@opam/reason@opam:3.6.2@1a34f8a4",
       "name": "@opam/reason",
-      "version": "opam:3.6.0",
+      "version": "opam:3.6.2",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/d4/d4d729804bc509bca0ac6223e06f7314#md5:d4d729804bc509bca0ac6223e06f7314",
-          "archive:https://registry.npmjs.org/@esy-ocaml/reason/-/reason-3.6.0.tgz#md5:d4d729804bc509bca0ac6223e06f7314"
+          "archive:https://opam.ocaml.org/cache/md5/d6/d6de40f280f1c229f9cb26eb4015f1c5#md5:d6de40f280f1c229f9cb26eb4015f1c5",
+          "archive:https://registry.npmjs.org/@esy-ocaml/reason/-/reason-3.6.2.tgz#md5:d6de40f280f1c229f9cb26eb4015f1c5"
         ],
         "opam": {
           "name": "reason",
-          "version": "3.6.0",
-          "path": "esy.lock/opam/reason.3.6.0"
+          "version": "3.6.2",
+          "path": "esy.lock/opam/reason.3.6.2"
         }
       },
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82",
+        "@opam/ppx_derivers@opam:1.2.1@ecf0aa45",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
-        "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173",
         "@opam/merlin-extend@opam:0.6@404f814c",
-        "@opam/menhir@opam:20200624@8629ff13",
-        "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.5.0@e0bac278",
+        "@opam/menhir@opam:20201201@a7ee0741",
+        "@opam/fix@opam:20201120@5c318621", "@opam/dune@opam:2.5.0@e0bac278",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82",
-        "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173",
+        "@opam/ppx_derivers@opam:1.2.1@ecf0aa45",
         "@opam/merlin-extend@opam:0.6@404f814c",
-        "@opam/menhir@opam:20200624@8629ff13",
-        "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.5.0@e0bac278"
+        "@opam/menhir@opam:20201201@a7ee0741",
+        "@opam/fix@opam:20201120@5c318621", "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
     "@opam/react@opam:1.2.1@0e11855f": {
@@ -1817,8 +1817,8 @@
         "@opam/base-bytes@opam:base@19d0c2ff"
       ]
     },
-    "@opam/ppxlib@opam:0.15.0@a90ae385": {
-      "id": "@opam/ppxlib@opam:0.15.0@a90ae385",
+    "@opam/ppxlib@opam:0.15.0@6a9d8126": {
+      "id": "@opam/ppxlib@opam:0.15.0@6a9d8126",
       "name": "@opam/ppxlib",
       "version": "opam:0.15.0",
       "source": {
@@ -1835,7 +1835,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/stdlib-shims@opam:0.1.0@8c116481",
+        "ocaml@4.10.0@d41d8cd9", "@opam/stdlib-shims@opam:0.1.0@148f22ac",
         "@opam/sexplib0@opam:v0.14.0@ddeb6438",
         "@opam/ppx_derivers@opam:1.2.1@ecf0aa45",
         "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173",
@@ -1843,7 +1843,7 @@
         "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/stdlib-shims@opam:0.1.0@8c116481",
+        "ocaml@4.10.0@d41d8cd9", "@opam/stdlib-shims@opam:0.1.0@148f22ac",
         "@opam/sexplib0@opam:v0.14.0@ddeb6438",
         "@opam/ppx_derivers@opam:1.2.1@ecf0aa45",
         "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173",
@@ -1851,34 +1851,6 @@
         "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
-    "@opam/ppxfind@opam:1.4@d75848d2": {
-      "id": "@opam/ppxfind@opam:1.4@d75848d2",
-      "name": "@opam/ppxfind",
-      "version": "opam:1.4",
-      "source": {
-        "type": "install",
-        "source": [
-          "archive:https://opam.ocaml.org/cache/sha256/98/98291c69f04f7f7b7cdad1b5d786c70fc595559d4663cc04cb711ac132db4971#sha256:98291c69f04f7f7b7cdad1b5d786c70fc595559d4663cc04cb711ac132db4971",
-          "archive:https://github.com/jeremiedimino/ppxfind/releases/download/1.4/ppxfind-1.4.tbz#sha256:98291c69f04f7f7b7cdad1b5d786c70fc595559d4663cc04cb711ac132db4971"
-        ],
-        "opam": {
-          "name": "ppxfind",
-          "version": "1.4",
-          "path": "esy.lock/opam/ppxfind.1.4"
-        }
-      },
-      "overrides": [],
-      "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
-        "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173",
-        "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/substs@0.0.1@d41d8cd9"
-      ],
-      "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
-        "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173",
-        "@opam/dune@opam:2.5.0@e0bac278"
-      ]
-    },
     "@opam/ppx_yojson_conv_lib@opam:v0.14.0@116b53d6": {
       "id": "@opam/ppx_yojson_conv_lib@opam:v0.14.0@116b53d6",
       "name": "@opam/ppx_yojson_conv_lib",
@@ -1935,31 +1907,6 @@
         "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
-    "@opam/ppx_tools@opam:6.2@62a3aff2": {
-      "id": "@opam/ppx_tools@opam:6.2@62a3aff2",
-      "name": "@opam/ppx_tools",
-      "version": "opam:6.2",
-      "source": {
-        "type": "install",
-        "source": [
-          "archive:https://opam.ocaml.org/cache/md5/68/68b05e0794c475c384b9285d1156d1f3#md5:68b05e0794c475c384b9285d1156d1f3",
-          "archive:https://github.com/ocaml-ppx/ppx_tools/archive/6.2.tar.gz#md5:68b05e0794c475c384b9285d1156d1f3"
-        ],
-        "opam": {
-          "name": "ppx_tools",
-          "version": "6.2",
-          "path": "esy.lock/opam/ppx_tools.6.2"
-        }
-      },
-      "overrides": [],
-      "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@e0bac278",
-        "@esy-ocaml/substs@0.0.1@d41d8cd9"
-      ],
-      "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@e0bac278"
-      ]
-    },
     "@opam/ppx_sexp_conv@opam:v0.14.1@5fc4da3c": {
       "id": "@opam/ppx_sexp_conv@opam:v0.14.1@5fc4da3c",
       "name": "@opam/ppx_sexp_conv",
@@ -1979,13 +1926,13 @@
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/sexplib0@opam:v0.14.0@ddeb6438",
-        "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/sexplib0@opam:v0.14.0@ddeb6438",
-        "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
       ]
     },
@@ -2008,13 +1955,13 @@
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/stdio@opam:v0.14.0@a624e254",
-        "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/stdio@opam:v0.14.0@a624e254",
-        "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
       ]
     },
@@ -2036,12 +1983,12 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
       ]
     },
@@ -2063,13 +2010,13 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/octavius@opam:1.2.2@b328d1f1",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/octavius@opam:1.2.2@b328d1f1",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
       ]
@@ -2093,13 +2040,13 @@
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/time_now@opam:v0.14.0@5e4046b3",
-        "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/time_now@opam:v0.14.0@5e4046b3",
-        "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
       ]
     },
@@ -2121,12 +2068,12 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
       ]
     },
@@ -2148,14 +2095,14 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/ppx_sexp_conv@opam:v0.14.1@5fc4da3c",
         "@opam/ppx_compare@opam:v0.14.0@615de7a6",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/ppx_sexp_conv@opam:v0.14.1@5fc4da3c",
         "@opam/ppx_compare@opam:v0.14.0@615de7a6",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
@@ -2179,80 +2126,80 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
       ]
     },
-    "@opam/ppx_deriving_yojson@opam:3.5.3@253e094d": {
-      "id": "@opam/ppx_deriving_yojson@opam:3.5.3@253e094d",
+    "@opam/ppx_deriving_yojson@opam:3.6.1@faf11a7c": {
+      "id": "@opam/ppx_deriving_yojson@opam:3.6.1@faf11a7c",
       "name": "@opam/ppx_deriving_yojson",
-      "version": "opam:3.5.3",
+      "version": "opam:3.6.1",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/e5/e5185e4ac9d149a332566139df55d408#md5:e5185e4ac9d149a332566139df55d408",
-          "archive:https://github.com/ocaml-ppx/ppx_deriving_yojson/archive/v3.5.3.tar.gz#md5:e5185e4ac9d149a332566139df55d408"
+          "archive:https://opam.ocaml.org/cache/sha256/71/712ee9207c70dd144e72cd689bee2d2beb120b804e77c74ec6f7b843a88944e6#sha256:712ee9207c70dd144e72cd689bee2d2beb120b804e77c74ec6f7b843a88944e6",
+          "archive:https://github.com/ocaml-ppx/ppx_deriving_yojson/releases/download/v3.6.1/ppx_deriving_yojson-v3.6.1.tbz#sha256:712ee9207c70dd144e72cd689bee2d2beb120b804e77c74ec6f7b843a88944e6"
         ],
         "opam": {
           "name": "ppx_deriving_yojson",
-          "version": "3.5.3",
-          "path": "esy.lock/opam/ppx_deriving_yojson.3.5.3"
+          "version": "3.6.1",
+          "path": "esy.lock/opam/ppx_deriving_yojson.3.6.1"
         }
       },
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9",
         "@opam/yojson@github:onivim/yojson:yojson.opam#f480aef@d41d8cd9",
-        "@opam/result@opam:1.5@6b753c82", "@opam/ppxfind@opam:1.4@d75848d2",
-        "@opam/ppx_tools@opam:6.2@62a3aff2",
-        "@opam/ppx_deriving@opam:4.5@d89f2934",
-        "@opam/dune@opam:2.5.0@e0bac278", "@opam/cppo@opam:1.6.6@f4f83858",
-        "@esy-ocaml/substs@0.0.1@d41d8cd9"
+        "@opam/result@opam:1.5@6b753c82",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
+        "@opam/ppx_deriving@opam:5.1@3037236f",
+        "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9",
         "@opam/yojson@github:onivim/yojson:yojson.opam#f480aef@d41d8cd9",
         "@opam/result@opam:1.5@6b753c82",
-        "@opam/ppx_tools@opam:6.2@62a3aff2",
-        "@opam/ppx_deriving@opam:4.5@d89f2934",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
+        "@opam/ppx_deriving@opam:5.1@3037236f",
         "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
-    "@opam/ppx_deriving@opam:4.5@d89f2934": {
-      "id": "@opam/ppx_deriving@opam:4.5@d89f2934",
+    "@opam/ppx_deriving@opam:5.1@3037236f": {
+      "id": "@opam/ppx_deriving@opam:5.1@3037236f",
       "name": "@opam/ppx_deriving",
-      "version": "opam:4.5",
+      "version": "opam:5.1",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/sha512/f7/f79153c5231ba1e03a3491fde95ca82ecb62fe05b60a649a374d2fbc5ea5dd9242126de7dfbe917c22fd7077c026c940e18c6b36c5ce0ec4bb6e07f11d2b710b#sha512:f79153c5231ba1e03a3491fde95ca82ecb62fe05b60a649a374d2fbc5ea5dd9242126de7dfbe917c22fd7077c026c940e18c6b36c5ce0ec4bb6e07f11d2b710b",
-          "archive:https://github.com/ocaml-ppx/ppx_deriving/archive/v4.5.tar.gz#sha512:f79153c5231ba1e03a3491fde95ca82ecb62fe05b60a649a374d2fbc5ea5dd9242126de7dfbe917c22fd7077c026c940e18c6b36c5ce0ec4bb6e07f11d2b710b"
+          "archive:https://opam.ocaml.org/cache/sha256/b0/b04f3b22b754e65af50812730695863192ae410e802e074b55ebbb8c4f73c4c4#sha256:b04f3b22b754e65af50812730695863192ae410e802e074b55ebbb8c4f73c4c4",
+          "archive:https://github.com/ocaml-ppx/ppx_deriving/releases/download/v5.1/ppx_deriving-v5.1.tbz#sha256:b04f3b22b754e65af50812730695863192ae410e802e074b55ebbb8c4f73c4c4"
         ],
         "opam": {
           "name": "ppx_deriving",
-          "version": "4.5",
-          "path": "esy.lock/opam/ppx_deriving.4.5"
+          "version": "5.1",
+          "path": "esy.lock/opam/ppx_deriving.5.1"
         }
       },
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82",
-        "@opam/ppxfind@opam:1.4@d75848d2",
-        "@opam/ppx_tools@opam:6.2@62a3aff2",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/ppx_derivers@opam:1.2.1@ecf0aa45",
+        "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/cppo@opam:1.6.6@f4f83858",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82",
-        "@opam/ppx_tools@opam:6.2@62a3aff2",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/ppx_derivers@opam:1.2.1@ecf0aa45",
+        "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173",
         "@opam/dune@opam:2.5.0@e0bac278"
       ]
@@ -2300,12 +2247,12 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
       ]
     },
@@ -2327,12 +2274,12 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
       ]
     },
@@ -2354,7 +2301,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/ppx_sexp_conv@opam:v0.14.1@5fc4da3c",
         "@opam/ppx_js_style@opam:v0.14.0@10b020a8",
         "@opam/ppx_hash@opam:v0.14.0@8e9618e4",
@@ -2364,7 +2311,7 @@
         "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/ppx_sexp_conv@opam:v0.14.1@5fc4da3c",
         "@opam/ppx_js_style@opam:v0.14.0@10b020a8",
         "@opam/ppx_hash@opam:v0.14.0@8e9618e4",
@@ -2392,7 +2339,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/ppx_sexp_conv@opam:v0.14.1@5fc4da3c",
         "@opam/ppx_here@opam:v0.14.0@5ccc1c01",
         "@opam/ppx_compare@opam:v0.14.0@615de7a6",
@@ -2401,7 +2348,7 @@
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/ppx_sexp_conv@opam:v0.14.1@5fc4da3c",
         "@opam/ppx_here@opam:v0.14.0@5ccc1c01",
         "@opam/ppx_compare@opam:v0.14.0@615de7a6",
@@ -2430,20 +2377,20 @@
         "@opam/base-bigarray@opam:base@b03491b0"
       ]
     },
-    "@opam/odoc@opam:1.5.1@52a58c0b": {
-      "id": "@opam/odoc@opam:1.5.1@52a58c0b",
+    "@opam/odoc@opam:1.5.2@236518eb": {
+      "id": "@opam/odoc@opam:1.5.2@236518eb",
       "name": "@opam/odoc",
-      "version": "opam:1.5.1",
+      "version": "opam:1.5.2",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/sha256/ea/ea14721344e2aab6b63f2884782d37e94a1ed8ab91147a1c08a29710d99d354f#sha256:ea14721344e2aab6b63f2884782d37e94a1ed8ab91147a1c08a29710d99d354f",
-          "archive:https://github.com/ocaml/odoc/releases/download/1.5.1/odoc-1.5.1.tbz#sha256:ea14721344e2aab6b63f2884782d37e94a1ed8ab91147a1c08a29710d99d354f"
+          "archive:https://opam.ocaml.org/cache/sha256/d2/d24463f2660bc28c72cda001478360158e953721c9e23fb361ec4783113c4871#sha256:d24463f2660bc28c72cda001478360158e953721c9e23fb361ec4783113c4871",
+          "archive:https://github.com/ocaml/odoc/releases/download/1.5.2/odoc-1.5.2.tbz#sha256:d24463f2660bc28c72cda001478360158e953721c9e23fb361ec4783113c4871"
         ],
         "opam": {
           "name": "odoc",
-          "version": "1.5.1",
-          "path": "esy.lock/opam/odoc.1.5.1"
+          "version": "1.5.2",
+          "path": "esy.lock/opam/odoc.1.5.2"
         }
       },
       "overrides": [],
@@ -2537,11 +2484,11 @@
         "ocaml@4.10.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f",
         "@opam/uuseg@opam:13.0.0@f60712a7",
         "@opam/stdio@opam:v0.14.0@a624e254", "@opam/re@opam:1.9.0@d4d5e13d",
-        "@opam/odoc@opam:1.5.1@52a58c0b",
+        "@opam/odoc@opam:1.5.2@236518eb",
         "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173",
-        "@opam/menhir@opam:20200624@8629ff13",
+        "@opam/menhir@opam:20201201@a7ee0741",
         "@opam/fpath@opam:0.7.3@674d8125",
-        "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.5.0@e0bac278",
+        "@opam/fix@opam:20201120@5c318621", "@opam/dune@opam:2.5.0@e0bac278",
         "@opam/cmdliner@opam:1.0.4@93208aac",
         "@opam/base-unix@opam:base@87d0b2eb",
         "@opam/base@opam:v0.14.0@8bc55fce",
@@ -2551,11 +2498,11 @@
         "ocaml@4.10.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f",
         "@opam/uuseg@opam:13.0.0@f60712a7",
         "@opam/stdio@opam:v0.14.0@a624e254", "@opam/re@opam:1.9.0@d4d5e13d",
-        "@opam/odoc@opam:1.5.1@52a58c0b",
+        "@opam/odoc@opam:1.5.2@236518eb",
         "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173",
-        "@opam/menhir@opam:20200624@8629ff13",
+        "@opam/menhir@opam:20201201@a7ee0741",
         "@opam/fpath@opam:0.7.3@674d8125",
-        "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.5.0@e0bac278",
+        "@opam/fix@opam:20201120@5c318621", "@opam/dune@opam:2.5.0@e0bac278",
         "@opam/cmdliner@opam:1.0.4@93208aac",
         "@opam/base-unix@opam:base@87d0b2eb",
         "@opam/base@opam:v0.14.0@8bc55fce"
@@ -2683,20 +2630,20 @@
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9",
         "@opam/yojson@github:onivim/yojson:yojson.opam#f480aef@d41d8cd9",
-        "@opam/stdlib-shims@opam:0.1.0@8c116481",
+        "@opam/stdlib-shims@opam:0.1.0@148f22ac",
         "@opam/ppx_yojson_conv_lib@opam:v0.14.0@116b53d6",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
-        "@opam/menhir@opam:20200624@8629ff13",
+        "@opam/menhir@opam:20201201@a7ee0741",
         "@opam/dune-build-info@opam:2.6.2@03ffe168",
         "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9",
         "@opam/yojson@github:onivim/yojson:yojson.opam#f480aef@d41d8cd9",
-        "@opam/stdlib-shims@opam:0.1.0@8c116481",
+        "@opam/stdlib-shims@opam:0.1.0@148f22ac",
         "@opam/ppx_yojson_conv_lib@opam:v0.14.0@116b53d6",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
-        "@opam/menhir@opam:20200624@8629ff13",
+        "@opam/menhir@opam:20201201@a7ee0741",
         "@opam/dune-build-info@opam:2.6.2@03ffe168",
         "@opam/dune@opam:2.5.0@e0bac278"
       ]
@@ -2830,20 +2777,20 @@
         "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
-    "@opam/menhirSdk@opam:20200624@2a05b5a7": {
-      "id": "@opam/menhirSdk@opam:20200624@2a05b5a7",
+    "@opam/menhirSdk@opam:20201201@4b828f46": {
+      "id": "@opam/menhirSdk@opam:20201201@4b828f46",
       "name": "@opam/menhirSdk",
-      "version": "opam:20200624",
+      "version": "opam:20201201",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/c3/c37ff53a4a69059e1f8223067b91bb8b#md5:c37ff53a4a69059e1f8223067b91bb8b",
-          "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz#md5:c37ff53a4a69059e1f8223067b91bb8b"
+          "archive:https://opam.ocaml.org/cache/md5/ca/ca1047954bfe8c857425dc67eee46272#md5:ca1047954bfe8c857425dc67eee46272",
+          "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20201201/archive.tar.gz#md5:ca1047954bfe8c857425dc67eee46272"
         ],
         "opam": {
           "name": "menhirSdk",
-          "version": "20200624",
-          "path": "esy.lock/opam/menhirSdk.20200624"
+          "version": "20201201",
+          "path": "esy.lock/opam/menhirSdk.20201201"
         }
       },
       "overrides": [],
@@ -2855,20 +2802,20 @@
         "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
-    "@opam/menhirLib@opam:20200624@8bdd2b0e": {
-      "id": "@opam/menhirLib@opam:20200624@8bdd2b0e",
+    "@opam/menhirLib@opam:20201201@901a3013": {
+      "id": "@opam/menhirLib@opam:20201201@901a3013",
       "name": "@opam/menhirLib",
-      "version": "opam:20200624",
+      "version": "opam:20201201",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/c3/c37ff53a4a69059e1f8223067b91bb8b#md5:c37ff53a4a69059e1f8223067b91bb8b",
-          "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz#md5:c37ff53a4a69059e1f8223067b91bb8b"
+          "archive:https://opam.ocaml.org/cache/md5/ca/ca1047954bfe8c857425dc67eee46272#md5:ca1047954bfe8c857425dc67eee46272",
+          "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20201201/archive.tar.gz#md5:ca1047954bfe8c857425dc67eee46272"
         ],
         "opam": {
           "name": "menhirLib",
-          "version": "20200624",
-          "path": "esy.lock/opam/menhirLib.20200624"
+          "version": "20201201",
+          "path": "esy.lock/opam/menhirLib.20201201"
         }
       },
       "overrides": [],
@@ -2880,31 +2827,31 @@
         "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
-    "@opam/menhir@opam:20200624@8629ff13": {
-      "id": "@opam/menhir@opam:20200624@8629ff13",
+    "@opam/menhir@opam:20201201@a7ee0741": {
+      "id": "@opam/menhir@opam:20201201@a7ee0741",
       "name": "@opam/menhir",
-      "version": "opam:20200624",
+      "version": "opam:20201201",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/c3/c37ff53a4a69059e1f8223067b91bb8b#md5:c37ff53a4a69059e1f8223067b91bb8b",
-          "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz#md5:c37ff53a4a69059e1f8223067b91bb8b"
+          "archive:https://opam.ocaml.org/cache/md5/ca/ca1047954bfe8c857425dc67eee46272#md5:ca1047954bfe8c857425dc67eee46272",
+          "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20201201/archive.tar.gz#md5:ca1047954bfe8c857425dc67eee46272"
         ],
         "opam": {
           "name": "menhir",
-          "version": "20200624",
-          "path": "esy.lock/opam/menhir.20200624"
+          "version": "20201201",
+          "path": "esy.lock/opam/menhir.20201201"
         }
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200624@2a05b5a7",
-        "@opam/menhirLib@opam:20200624@8bdd2b0e",
+        "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20201201@4b828f46",
+        "@opam/menhirLib@opam:20201201@901a3013",
         "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200624@2a05b5a7",
-        "@opam/menhirLib@opam:20200624@8bdd2b0e",
+        "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20201201@4b828f46",
+        "@opam/menhirLib@opam:20201201@901a3013",
         "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
@@ -3277,12 +3224,12 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.0@58adb39a",
+        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.2@1a34f8a4",
         "@opam/fp@github:bryphe/reason-native:fp.opam#5a7a756@d41d8cd9",
         "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.0@58adb39a",
+        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.2@1a34f8a4",
         "@opam/fp@github:bryphe/reason-native:fp.opam#5a7a756@d41d8cd9",
         "@opam/dune@opam:2.5.0@e0bac278"
       ]
@@ -3325,11 +3272,11 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.0@58adb39a",
+        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.2@1a34f8a4",
         "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.0@58adb39a",
+        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.2@1a34f8a4",
         "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
@@ -3352,7 +3299,7 @@
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c",
-        "@opam/stdlib-shims@opam:0.1.0@8c116481",
+        "@opam/stdlib-shims@opam:0.1.0@148f22ac",
         "@opam/seq@opam:base@d8d7de1d",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
@@ -3361,24 +3308,24 @@
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/stdlib-shims@opam:0.1.0@8c116481",
+        "ocaml@4.10.0@d41d8cd9", "@opam/stdlib-shims@opam:0.1.0@148f22ac",
         "@opam/seq@opam:base@d8d7de1d"
       ]
     },
-    "@opam/fix@opam:20200131@0ecd2f01": {
-      "id": "@opam/fix@opam:20200131@0ecd2f01",
+    "@opam/fix@opam:20201120@5c318621": {
+      "id": "@opam/fix@opam:20201120@5c318621",
       "name": "@opam/fix",
-      "version": "opam:20200131",
+      "version": "opam:20201120",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/99/991ff031666c662eaab638d2e0f4ac1d#md5:991ff031666c662eaab638d2e0f4ac1d",
-          "archive:https://gitlab.inria.fr/fpottier/fix/repository/20200131/archive.tar.gz#md5:991ff031666c662eaab638d2e0f4ac1d"
+          "archive:https://opam.ocaml.org/cache/md5/7e/7eb570b759635fe66f3556d2b1cc88e3#md5:7eb570b759635fe66f3556d2b1cc88e3",
+          "archive:https://gitlab.inria.fr/fpottier/fix/repository/20201120/archive.tar.gz#md5:7eb570b759635fe66f3556d2b1cc88e3"
         ],
         "opam": {
           "name": "fix",
-          "version": "20200131",
-          "path": "esy.lock/opam/fix.20200131"
+          "version": "20201120",
+          "path": "esy.lock/opam/fix.20201120"
         }
       },
       "overrides": [],
@@ -3525,12 +3472,12 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.0@58adb39a",
+        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.2@1a34f8a4",
         "@opam/fp@github:bryphe/reason-native:fp.opam#5a7a756@d41d8cd9",
         "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.0@58adb39a",
+        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.2@1a34f8a4",
         "@opam/fp@github:bryphe/reason-native:fp.opam#5a7a756@d41d8cd9",
         "@opam/dune@opam:2.5.0@e0bac278"
       ]
@@ -3556,30 +3503,30 @@
         "ocaml@4.10.0@d41d8cd9",
         "@opam/yojson@github:onivim/yojson:yojson.opam#f480aef@d41d8cd9",
         "@opam/dune@opam:2.5.0@e0bac278",
-        "@opam/decoders@opam:0.4.0@b66e1fb4",
+        "@opam/decoders@opam:0.5.0@9df01185",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9",
         "@opam/yojson@github:onivim/yojson:yojson.opam#f480aef@d41d8cd9",
         "@opam/dune@opam:2.5.0@e0bac278",
-        "@opam/decoders@opam:0.4.0@b66e1fb4"
+        "@opam/decoders@opam:0.5.0@9df01185"
       ]
     },
-    "@opam/decoders@opam:0.4.0@b66e1fb4": {
-      "id": "@opam/decoders@opam:0.4.0@b66e1fb4",
+    "@opam/decoders@opam:0.5.0@9df01185": {
+      "id": "@opam/decoders@opam:0.5.0@9df01185",
       "name": "@opam/decoders",
-      "version": "opam:0.4.0",
+      "version": "opam:0.5.0",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/sha256/18/18ebbd98901dff67c9944d465ed508df018c8ee8e13bfe037d5ad780584eebf7#sha256:18ebbd98901dff67c9944d465ed508df018c8ee8e13bfe037d5ad780584eebf7",
-          "archive:https://github.com/mattjbray/ocaml-decoders/releases/download/v0.4.0/decoders-v0.4.0.tbz#sha256:18ebbd98901dff67c9944d465ed508df018c8ee8e13bfe037d5ad780584eebf7"
+          "archive:https://opam.ocaml.org/cache/sha256/fc/fc0b672a2ebcb1cfb7575384c5033b14985b26fe90ab517749ba77ed7fc0f11a#sha256:fc0b672a2ebcb1cfb7575384c5033b14985b26fe90ab517749ba77ed7fc0f11a",
+          "archive:https://github.com/mattjbray/ocaml-decoders/releases/download/v0.5.0/decoders-v0.5.0.tbz#sha256:fc0b672a2ebcb1cfb7575384c5033b14985b26fe90ab517749ba77ed7fc0f11a"
         ],
         "opam": {
           "name": "decoders",
-          "version": "0.4.0",
-          "path": "esy.lock/opam/decoders.0.4.0"
+          "version": "0.5.0",
+          "path": "esy.lock/opam/decoders.0.5.0"
         }
       },
       "overrides": [],
@@ -3884,16 +3831,16 @@
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@e0bac278",
-        "@opam/bigarray-compat@opam:1.0.0@1faefa97",
+        "@opam/bigarray-compat@opam:1.0.0@3a87ad65",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@e0bac278",
-        "@opam/bigarray-compat@opam:1.0.0@1faefa97"
+        "@opam/bigarray-compat@opam:1.0.0@3a87ad65"
       ]
     },
-    "@opam/bigarray-compat@opam:1.0.0@1faefa97": {
-      "id": "@opam/bigarray-compat@opam:1.0.0@1faefa97",
+    "@opam/bigarray-compat@opam:1.0.0@3a87ad65": {
+      "id": "@opam/bigarray-compat@opam:1.0.0@3a87ad65",
       "name": "@opam/bigarray-compat",
       "version": "opam:1.0.0",
       "source": {
@@ -4100,13 +4047,13 @@
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d",
-        "@opam/menhir@opam:20200624@8629ff13",
+        "@opam/menhir@opam:20201201@a7ee0741",
         "@opam/easy-format@opam:1.3.2@0484b3c4",
         "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d",
-        "@opam/menhir@opam:20200624@8629ff13",
+        "@opam/menhir@opam:20201201@a7ee0741",
         "@opam/easy-format@opam:1.3.2@0484b3c4",
         "@opam/dune@opam:2.5.0@e0bac278"
       ]
@@ -4214,8 +4161,8 @@
         "@opam/ppx_derivers@opam:1.2.1@ecf0aa45",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/merlin-extend@opam:0.6@404f814c",
-        "@opam/menhir@opam:20200624@8629ff13",
-        "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.5.0@e0bac278"
+        "@opam/menhir@opam:20201201@a7ee0741",
+        "@opam/fix@opam:20201120@5c318621", "@opam/dune@opam:2.5.0@e0bac278"
       ],
       "devDependencies": []
     },
@@ -4244,7 +4191,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/reason@3.6.2@d41d8cd9"
       ],
       "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ]
diff --git a/esy.lock/opam/bigarray-compat.1.0.0/opam b/esy.lock/opam/bigarray-compat.1.0.0/opam
index 93751514d6..24a122d43f 100644
--- a/esy.lock/opam/bigarray-compat.1.0.0/opam
+++ b/esy.lock/opam/bigarray-compat.1.0.0/opam
@@ -6,7 +6,7 @@ license: "ISC"
 homepage: "https://github.com/mirage/bigarray-compat"
 bug-reports: "https://github.com/mirage/bigarray-compat/issues"
 depends: [
-  "ocaml" {>= "4.03.0"}
+  "ocaml" {>= "4.02.3"}
   "dune" {>= "1.0"}
 ]
 build: [
@@ -20,4 +20,4 @@ url {
     "md5=1cc7c25382a8900bada34aadfd66632e"
     "sha512=c365fee15582aca35d7b05268cde29e54774ad7df7be56762b4aad78ca1409d4326ad3b34af0f1cc2c7b872837290a9cd9ff43b47987c03bba7bba32fe8a030f"
   ]
-}
\ No newline at end of file
+}
diff --git a/esy.lock/opam/decoders.0.4.0/opam b/esy.lock/opam/decoders.0.4.0/opam
deleted file mode 100644
index bc1e810302..0000000000
--- a/esy.lock/opam/decoders.0.4.0/opam
+++ /dev/null
@@ -1,40 +0,0 @@
-opam-version: "2.0"
-synopsis: "Elm-inspired decoders for Ocaml"
-description: """
-A combinator library for "decoding" JSON-like values into your own Ocaml types, inspired by Elm's `Json.Decode` and `Json.Encode`.
-
-> Eh?
-
-An Ocaml program having a JSON (or YAML) data source usually goes something like this:
-
-1. Get your data from somewhere. Now you have a `string`.
-2. *Parse* the `string` as JSON (or YAML). Now you have a `Yojson.Basic.json`, or maybe an `Ezjsonm.value`, or perhaps a `Ocyaml.yaml`.
-3. *Decode* the JSON value to an Ocaml type that's actually useful for your program's domain.
-
-This library helps with step 3.
-"""
-maintainer: "Matt Bray <matt@aestheticintegration.com>"
-authors: ["Matt Bray <matt@aestheticintegration.com>"]
-homepage: "https://github.com/mattjbray/ocaml-decoders"
-doc: "https://mattjbray.github.io/ocaml-decoders/decoders"
-bug-reports: "https://github.com/mattjbray/ocaml-decoders/issues"
-license: "ISC"
-dev-repo: "git+https://github.com/mattjbray/ocaml-decoders.git"
-build: [
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-  ["dune" "build" "@doc" "-p" name "-j" jobs] {with-doc}
-]
-depends: [
-  "dune" {>= "1.0"}
-  "containers" {with-test}
-  "ocaml" { >= "4.03.0" }
-]
-url {
-  src:
-    "https://github.com/mattjbray/ocaml-decoders/releases/download/v0.4.0/decoders-v0.4.0.tbz"
-  checksum: [
-    "sha256=18ebbd98901dff67c9944d465ed508df018c8ee8e13bfe037d5ad780584eebf7"
-    "sha512=a6221b40cc1c3d9ea46c5e7cec6c5992b923e390ce004c23d7f36e99974c10f6d4a690113255b85d3895f357e0dd44562e9bc03ba8708223cb1e56ba182c10d3"
-  ]
-}
diff --git a/esy.lock/opam/decoders.0.5.0/opam b/esy.lock/opam/decoders.0.5.0/opam
new file mode 100644
index 0000000000..171215090b
--- /dev/null
+++ b/esy.lock/opam/decoders.0.5.0/opam
@@ -0,0 +1,40 @@
+opam-version: "2.0"
+synopsis: "Elm-inspired decoders for Ocaml"
+description:
+  "A combinator library for \"decoding\" JSON-like values into your own Ocaml types, inspired by Elm's `Json.Decode` and `Json.Encode`."
+maintainer: ["Matt Bray <mattjbray@gmail.com>"]
+authors: ["Matt Bray <mattjbray@gmail.com>"]
+license: "ISC"
+homepage: "https://github.com/mattjbray/ocaml-decoders"
+doc: "https://mattjbray.github.io/ocaml-decoders/"
+bug-reports: "https://github.com/mattjbray/ocaml-decoders/issues"
+depends: [
+  "ocaml" {>= "4.03.0"}
+  "dune" {>= "2.0"}
+  "odoc" {with-doc}
+  "containers" {with-test}
+]
+build: [
+  ["dune" "subst"] {pinned}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+]
+dev-repo: "git+https://github.com/mattjbray/ocaml-decoders.git"
+x-commit-hash: "19200c6221a834098306620234310de514f6301c"
+url {
+  src:
+    "https://github.com/mattjbray/ocaml-decoders/releases/download/v0.5.0/decoders-v0.5.0.tbz"
+  checksum: [
+    "sha256=fc0b672a2ebcb1cfb7575384c5033b14985b26fe90ab517749ba77ed7fc0f11a"
+    "sha512=908f8cc12267344cb10319cf8ce05308734980093581791da07365e9986cbe96a1bc420da9eb6057930cbe37255824d76ee8c96d68e31f13bd3361834a6c7e10"
+  ]
+}
diff --git a/bench.esy.lock/opam/fix.20200131/opam b/esy.lock/opam/fix.20201120/opam
similarity index 62%
rename from bench.esy.lock/opam/fix.20200131/opam
rename to esy.lock/opam/fix.20201120/opam
index 4babcba82a..31c8a641a2 100644
--- a/bench.esy.lock/opam/fix.20200131/opam
+++ b/esy.lock/opam/fix.20201120/opam
@@ -11,14 +11,14 @@ build: [
 ]
 depends: [
   "ocaml" { >= "4.03" }
-  "dune" { >= "1.3" }
+  "dune" {>=  "1.3" }
 ]
 synopsis: "Facilities for memoization and fixed points"
 url {
   src:
-    "https://gitlab.inria.fr/fpottier/fix/repository/20200131/archive.tar.gz"
+    "https://gitlab.inria.fr/fpottier/fix/repository/20201120/archive.tar.gz"
   checksum: [
-    "md5=991ff031666c662eaab638d2e0f4ac1d"
-    "sha512=01c45a1d90b02ec0939e968b185a6a373ac6117e2287b9a26d3db9d71e9569d086cea50da60710fcab5c2ed9d3b4c72b76839c0651e436f1fb39c77dc7c04b5e"
+    "md5=7eb570b759635fe66f3556d2b1cc88e3"
+    "sha512=344dcc619f9e8b8a6c998775b6d2dab2ea5253e6a67abe4797f76dc5dd30bc776568abce1e90477422e9db447821579889737e3531c42139708f813e983ea5d4"
   ]
 }
diff --git a/esy.lock/opam/menhir.20200624/opam b/esy.lock/opam/menhir.20201201/opam
similarity index 69%
rename from esy.lock/opam/menhir.20200624/opam
rename to esy.lock/opam/menhir.20201201/opam
index 37637fcf60..8bf0aabeeb 100644
--- a/esy.lock/opam/menhir.20200624/opam
+++ b/esy.lock/opam/menhir.20201201/opam
@@ -19,9 +19,9 @@ depends: [
 synopsis: "An LR(1) parser generator"
 url {
   src:
-    "https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz"
+    "https://gitlab.inria.fr/fpottier/menhir/repository/20201201/archive.tar.gz"
   checksum: [
-    "md5=c37ff53a4a69059e1f8223067b91bb8b"
-    "sha512=68cd165bd65c93fc9b14820a032b6d760674b3e811d8536c2e26e10f9fc5892720564f109484f12f8d08d849c2983c2eaf350d76ab1122a5b8a3c7674ab2bd39"
+    "md5=ca1047954bfe8c857425dc67eee46272"
+    "sha512=571e7de852a2ea7d1cbb27fb9fd0b716b6ba1f112d4aedf4548d41f907c9a9b74e1b557a26a7515c2a0e5407de6c2614cea17d51a088d845d4c6ceaec85a0ecb"
   ]
 }
diff --git a/esy.lock/opam/menhirLib.20200624/opam b/esy.lock/opam/menhirLib.20201201/opam
similarity index 70%
rename from esy.lock/opam/menhirLib.20200624/opam
rename to esy.lock/opam/menhirLib.20201201/opam
index afcbe5d5e7..3d5290fd0f 100644
--- a/esy.lock/opam/menhirLib.20200624/opam
+++ b/esy.lock/opam/menhirLib.20201201/opam
@@ -20,9 +20,9 @@ conflicts: [
 synopsis: "Runtime support library for parsers generated by Menhir"
 url {
   src:
-    "https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz"
+    "https://gitlab.inria.fr/fpottier/menhir/repository/20201201/archive.tar.gz"
   checksum: [
-    "md5=c37ff53a4a69059e1f8223067b91bb8b"
-    "sha512=68cd165bd65c93fc9b14820a032b6d760674b3e811d8536c2e26e10f9fc5892720564f109484f12f8d08d849c2983c2eaf350d76ab1122a5b8a3c7674ab2bd39"
+    "md5=ca1047954bfe8c857425dc67eee46272"
+    "sha512=571e7de852a2ea7d1cbb27fb9fd0b716b6ba1f112d4aedf4548d41f907c9a9b74e1b557a26a7515c2a0e5407de6c2614cea17d51a088d845d4c6ceaec85a0ecb"
   ]
 }
diff --git a/integrationtest.esy.lock/opam/menhirSdk.20200624/opam b/esy.lock/opam/menhirSdk.20201201/opam
similarity index 70%
rename from integrationtest.esy.lock/opam/menhirSdk.20200624/opam
rename to esy.lock/opam/menhirSdk.20201201/opam
index af12216336..46afb20f24 100644
--- a/integrationtest.esy.lock/opam/menhirSdk.20200624/opam
+++ b/esy.lock/opam/menhirSdk.20201201/opam
@@ -20,9 +20,9 @@ conflicts: [
 synopsis: "Compile-time library for auxiliary tools related to Menhir"
 url {
   src:
-    "https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz"
+    "https://gitlab.inria.fr/fpottier/menhir/repository/20201201/archive.tar.gz"
   checksum: [
-    "md5=c37ff53a4a69059e1f8223067b91bb8b"
-    "sha512=68cd165bd65c93fc9b14820a032b6d760674b3e811d8536c2e26e10f9fc5892720564f109484f12f8d08d849c2983c2eaf350d76ab1122a5b8a3c7674ab2bd39"
+    "md5=ca1047954bfe8c857425dc67eee46272"
+    "sha512=571e7de852a2ea7d1cbb27fb9fd0b716b6ba1f112d4aedf4548d41f907c9a9b74e1b557a26a7515c2a0e5407de6c2614cea17d51a088d845d4c6ceaec85a0ecb"
   ]
 }
diff --git a/bench.esy.lock/opam/odoc.1.5.1/opam b/esy.lock/opam/odoc.1.5.2/opam
similarity index 67%
rename from bench.esy.lock/opam/odoc.1.5.1/opam
rename to esy.lock/opam/odoc.1.5.2/opam
index a7ccb1dca0..f59e640771 100644
--- a/bench.esy.lock/opam/odoc.1.5.1/opam
+++ b/esy.lock/opam/odoc.1.5.2/opam
@@ -12,7 +12,7 @@ authors: [
   "Anton Bachin <antonbachin@yahoo.com>"
   "Jon Ludlam <jon@recoil.org>"
 ]
-maintainer: "Jon Ludlam <jon@recoil.org>"
+maintainer: "Anton Bachin <antonbachin@yahoo.com>"
 dev-repo: "git+https://github.com/ocaml/odoc.git"
 
 synopsis: "OCaml documentation generator"
@@ -27,12 +27,12 @@ depends: [
   "cppo" {build}
   "dune"
   "fpath"
-  "ocaml" {>= "4.02.0" & < "4.12"}
+  "ocaml" {>= "4.02.0"}
   "result"
   "tyxml" {>= "4.3.0"}
 
   "alcotest" {dev & >= "0.8.3"}
-  "markup" {dev & >= "0.8.0"}
+  "markup" {dev & >= "1.0.0"}
   "ocamlfind" {dev}
   "sexplib" {dev & >= "113.33.00"}
 
@@ -43,10 +43,11 @@ build: [
   ["dune" "subst"] {pinned}
   ["dune" "build" "-p" name "-j" jobs]
 ]
+x-commit-hash: "c0df8ce2171fa9645a41f371429aa3ddc16de5c1"
 url {
-  src: "https://github.com/ocaml/odoc/releases/download/1.5.1/odoc-1.5.1.tbz"
+  src: "https://github.com/ocaml/odoc/releases/download/1.5.2/odoc-1.5.2.tbz"
   checksum: [
-    "sha256=ea14721344e2aab6b63f2884782d37e94a1ed8ab91147a1c08a29710d99d354f"
-    "sha512=b2d12277d61e1e52354128d459d2ad49bea24a4d46db89790769c2843c4b00beaee3ea7d0215211079174c0bd893de6bf52dcbb71e46622728be7491d91058b2"
+    "sha256=d24463f2660bc28c72cda001478360158e953721c9e23fb361ec4783113c4871"
+    "sha512=e6c83630325de422f31cda8f88c038d213969f8b98e989593c057658f3956c0855860c9bc38f61b6479929516ca95aee689ddfba3ad8c47d821c4fdf54524cf9"
   ]
 }
diff --git a/integrationtest.esy.lock/opam/ppx_deriving.4.5/opam b/esy.lock/opam/ppx_deriving.5.1/opam
similarity index 52%
rename from integrationtest.esy.lock/opam/ppx_deriving.4.5/opam
rename to esy.lock/opam/ppx_deriving.5.1/opam
index 62efe36445..0396de61ca 100644
--- a/integrationtest.esy.lock/opam/ppx_deriving.4.5/opam
+++ b/esy.lock/opam/ppx_deriving.5.1/opam
@@ -1,5 +1,5 @@
 opam-version: "2.0"
-maintainer: "thierry.martinez@inria.fr"
+maintainer: "whitequark <whitequark@whitequark.org>"
 authors: [ "whitequark <whitequark@whitequark.org>" ]
 license: "MIT"
 homepage: "https://github.com/ocaml-ppx/ppx_deriving"
@@ -8,28 +8,34 @@ bug-reports: "https://github.com/ocaml-ppx/ppx_deriving/issues"
 dev-repo: "git+https://github.com/ocaml-ppx/ppx_deriving.git"
 tags: [ "syntax" ]
 build: [
-  ["dune" "subst"] {pinned}
+  ["dune" "subst"] {dev}
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
   ["dune" "build" "@doc" "-p" name "-j" jobs] {with-doc}
 ]
 depends: [
-  "dune"     {>= "1.6.3"}
-  "cppo"     {build}
-  "ppxfind"  {build}
+  "ocaml" {>= "4.07.0" & < "4.12"}
+  "dune" {>= "1.6.3"}
+  "cppo" {build}
+  "ocamlfind"
   "ocaml-migrate-parsetree" {< "2.0.0"}
   "ppx_derivers"
-  "ppx_tools"  {>= "4.02.3"}
+  "ppxlib" {>= "0.14.0" & < "0.16.0"}
   "result"
-  "ounit"      {with-test}
-  "ocaml" {>= "4.02" & < "4.12.0"}
+  "ounit" {with-test}
 ]
-synopsis: "Type-driven code generation for OCaml >=4.02.2"
+synopsis: "Type-driven code generation for OCaml"
 description: """
 ppx_deriving provides common infrastructure for generating
 code based on type definitions, and a set of useful plugins
 for common tasks.
 """
 url {
-  src: "https://github.com/ocaml-ppx/ppx_deriving/archive/v4.5.tar.gz"
-  checksum: "sha512=f79153c5231ba1e03a3491fde95ca82ecb62fe05b60a649a374d2fbc5ea5dd9242126de7dfbe917c22fd7077c026c940e18c6b36c5ce0ec4bb6e07f11d2b710b"}
+  src:
+    "https://github.com/ocaml-ppx/ppx_deriving/releases/download/v5.1/ppx_deriving-v5.1.tbz"
+  checksum: [
+    "sha256=b04f3b22b754e65af50812730695863192ae410e802e074b55ebbb8c4f73c4c4"
+    "sha512=abcccda4878a82b0d0eedcc23127da6ae5c10bface59335a226a714752a46b987bff01f48fbe432910b26bfc7b332b301d191da71a9da0db593d86335bc83cd9"
+  ]
+}
+x-commit-hash: "b29509ff51f79f0f47dd85d60ab837ded5d2c6e4"
diff --git a/esy.lock/opam/ppx_deriving_yojson.3.5.3/opam b/esy.lock/opam/ppx_deriving_yojson.3.6.1/opam
similarity index 57%
rename from esy.lock/opam/ppx_deriving_yojson.3.5.3/opam
rename to esy.lock/opam/ppx_deriving_yojson.3.6.1/opam
index 289dd8327d..2f5c6c245d 100644
--- a/esy.lock/opam/ppx_deriving_yojson.3.5.3/opam
+++ b/esy.lock/opam/ppx_deriving_yojson.3.6.1/opam
@@ -4,7 +4,7 @@ authors: [ "whitequark <whitequark@whitequark.org>" ]
 license: "MIT"
 homepage: "https://github.com/ocaml-ppx/ppx_deriving_yojson"
 bug-reports: "https://github.com/ocaml-ppx/ppx_deriving_yojson/issues"
-dev-repo: "git://github.com/ocaml-ppx/ppx_deriving_yojson.git"
+dev-repo: "git+https://github.com/ocaml-ppx/ppx_deriving_yojson.git"
 tags: [ "syntax" "json" ]
 build: [
   ["dune" "subst"] {dev}
@@ -12,14 +12,12 @@ build: [
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
 depends: [
-  "ocaml" {>= "4.04.0"}
+  "ocaml" {>= "4.05.0"}
+  "dune" {>= "1.0"}
   "yojson" {>= "1.6.0" & < "2.0.0"}
   "result"
-  "ppx_deriving" {>= "4.5" & < "5.0"}
-  "ppx_tools"
-  "ppxfind" {build}
-  "dune" {>= "1.0"}
-  "cppo" {build}
+  "ppx_deriving" {>= "5.1"}
+  "ppxlib" {>= "0.14.0"}
   "ounit" {with-test & >= "2.0.0"}
 ]
 synopsis:
@@ -30,9 +28,10 @@ a JSON codec generator.
 """
 url {
   src:
-    "https://github.com/ocaml-ppx/ppx_deriving_yojson/archive/v3.5.3.tar.gz"
+    "https://github.com/ocaml-ppx/ppx_deriving_yojson/releases/download/v3.6.1/ppx_deriving_yojson-v3.6.1.tbz"
   checksum: [
-    "md5=e5185e4ac9d149a332566139df55d408"
-    "sha512=550fe8c400fa57f3f33f4cec509df061db0d62353e0d05ffb64e02aaef74324369840297507553d9b8a8cba81f980c210d23177bf184dbe58b952a7df4aa2176"
+    "sha256=712ee9207c70dd144e72cd689bee2d2beb120b804e77c74ec6f7b843a88944e6"
+    "sha512=d8c828902b8441f73e08fc03e2173ce81a09cccfe091471fbcffe098b2272739b98a05e8308016da3efeb3d4d1abd7d941bfaac42c85961ea40915ddce526577"
   ]
 }
+x-commit-hash: "d0abe462de8bab52d763eeafd751e8ea1ba211ac"
diff --git a/esy.lock/opam/ppx_tools.6.2/opam b/esy.lock/opam/ppx_tools.6.2/opam
deleted file mode 100644
index 9e8b874706..0000000000
--- a/esy.lock/opam/ppx_tools.6.2/opam
+++ /dev/null
@@ -1,21 +0,0 @@
-opam-version: "2.0"
-synopsis: "Tools for authors of ppx rewriters and other syntactic tools"
-maintainer: "Kate <kit.ty.kate@disroot.org>"
-authors: "Alain Frisch <alain.frisch@lexifi.com>"
-license: "MIT"
-tags: [ "syntax" ]
-homepage: "https://github.com/ocaml-ppx/ppx_tools"
-bug-reports: "https://github.com/ocaml-ppx/ppx_tools/issues"
-dev-repo: "git://github.com/ocaml-ppx/ppx_tools.git"
-build: ["dune" "build" "-p" name "-j" jobs]
-depends: [
-  "ocaml" {>= "4.08.0" & < "4.12.0"}
-  "dune" {>= "1.6"}
-]
-url {
-  src: "https://github.com/ocaml-ppx/ppx_tools/archive/6.2.tar.gz"
-  checksum: [
-    "md5=68b05e0794c475c384b9285d1156d1f3"
-    "sha512=fc3943c69901ef46843355c3482d5a1481d05ee94fb0a344ec04101059a02cbaa76fed5742cfae82730edf378f2e140d859a5cf590653f85359255d451f07dc8"
-  ]
-}
diff --git a/esy.lock/opam/ppxfind.1.4/opam b/esy.lock/opam/ppxfind.1.4/opam
deleted file mode 100644
index 57eefe4e65..0000000000
--- a/esy.lock/opam/ppxfind.1.4/opam
+++ /dev/null
@@ -1,41 +0,0 @@
-opam-version: "2.0"
-synopsis: "Tool combining ocamlfind and ppx"
-description: """
-Ppxfind is a small command line tool that among other things allows
-to use old style ppx rewriters with jbuilder.
-"""
-maintainer: ["Jérémie Dimino <jeremie@dimino.org>"]
-authors: ["Jérémie Dimino <jeremie@dimino.org>"]
-license: "BSD3"
-homepage: "https://github.com/jeremiedimino/ppxfind"
-doc: "https://jeremiedimino.github.io/ppxfind/"
-bug-reports: "https://github.com/jeremiedimino/ppxfind/issues"
-depends: [
-  "dune" {>= "2.0"}
-  "ocaml-migrate-parsetree" {>= "1.6.0" & < "2.0.0"}
-  "ocamlfind"
-  "ocaml" {>= "4.02.3"}
-]
-build: [
-  ["dune" "subst"] {pinned}
-  [
-    "dune"
-    "build"
-    "-p"
-    name
-    "-j"
-    jobs
-    "@install"
-    "@runtest" {with-test}
-    "@doc" {with-doc}
-  ]
-]
-dev-repo: "git+https://github.com/jeremiedimino/ppxfind.git"
-url {
-  src:
-    "https://github.com/jeremiedimino/ppxfind/releases/download/1.4/ppxfind-1.4.tbz"
-  checksum: [
-    "sha256=98291c69f04f7f7b7cdad1b5d786c70fc595559d4663cc04cb711ac132db4971"
-    "sha512=f80b0ee09fb536aa9f154da80d06a1b68ba3b10605fb7338bd6449beb5c8d00e983bf66b4a63e12659ae1410fea56d0a2c4cfd43584616438504628035bcb981"
-  ]
-}
diff --git a/esy.lock/opam/ppxlib.0.15.0/opam b/esy.lock/opam/ppxlib.0.15.0/opam
index 084b18884c..f32985ad85 100644
--- a/esy.lock/opam/ppxlib.0.15.0/opam
+++ b/esy.lock/opam/ppxlib.0.15.0/opam
@@ -14,7 +14,7 @@ run-test: [
   ["dune" "runtest" "-p" name "-j" jobs] { ocaml:version >= "4.10" }
 ]
 depends: [
-  "ocaml"                   {>= "4.04.1" & < "4.12"}
+  "ocaml"                   {>= "4.04.1"}
   "dune"                    {>= "1.11"}
   "ocaml-compiler-libs"     {>= "v0.11.0"}
   "ocaml-migrate-parsetree" {>= "1.5.0" & < "2.0.0"}
diff --git a/esy.lock/opam/reason.3.6.0/opam b/esy.lock/opam/reason.3.6.2/opam
similarity index 78%
rename from esy.lock/opam/reason.3.6.0/opam
rename to esy.lock/opam/reason.3.6.2/opam
index 3e9119724e..9408643bc9 100644
--- a/esy.lock/opam/reason.3.6.0/opam
+++ b/esy.lock/opam/reason.3.6.2/opam
@@ -9,17 +9,16 @@ dev-repo: "git://github.com/facebook/reason.git"
 tags: [ "syntax" ]
 build: [
   ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
 depends: [
-  "ocaml"         {>= "4.03" & < "4.11"}
+  "ocaml"         {>= "4.03" & < "4.12"}
   "dune"          {>= "1.4"}
   "ocamlfind"     {build}
   "menhir"        {>= "20170418"}
-  "merlin-extend" {>= "0.4"}
+  "merlin-extend" {>= "0.6"}
+  "ppx_derivers" {< "2.0"}
   "fix"
   "result"
-  "ocaml-migrate-parsetree" {< "2.0.0"}
 ]
 synopsis: "Reason: Syntax & Toolchain for OCaml"
 description: """
@@ -27,6 +26,6 @@ Reason gives OCaml a new syntax that is remniscient of languages like
 JavaScript. It's also the umbrella project for a set of tools for the OCaml &
 JavaScript ecosystem."""
 url {
-  src: "https://registry.npmjs.org/@esy-ocaml/reason/-/reason-3.6.0.tgz"
-  checksum: "md5=d4d729804bc509bca0ac6223e06f7314"
+  src: "https://registry.npmjs.org/@esy-ocaml/reason/-/reason-3.6.2.tgz"
+  checksum: "md5=d6de40f280f1c229f9cb26eb4015f1c5"
 }
diff --git a/esy.lock/opam/stdlib-shims.0.1.0/opam b/esy.lock/opam/stdlib-shims.0.1.0/opam
index 0d1079d893..c6f3529a33 100644
--- a/esy.lock/opam/stdlib-shims.0.1.0/opam
+++ b/esy.lock/opam/stdlib-shims.0.1.0/opam
@@ -8,9 +8,9 @@ bug-reports: "https://github.com/ocaml/stdlib-shims/issues"
 tags: ["stdlib" "compatibility" "org:ocaml"]
 license: ["typeof OCaml system"]
 depends: [
-  "ocaml" {>="4.02.3"}
+  "ocaml" {>= "4.02.3"}
   "dune"
- ("dune" {>= "2.7.0"} | "dune" & "ocaml" {<"4.12.0~~"})
+ ("dune" {>= "2.8.0"} | "ocaml" {< "4.12.0~~"})
 ]
 build: [ "dune" "build" "-p" name "-j" jobs ]
 synopsis: "Backport some of the new stdlib features to older compiler"
diff --git a/integrationtest.esy.lock/index.json b/integrationtest.esy.lock/index.json
index f4c3a738c9..2440a616cd 100644
--- a/integrationtest.esy.lock/index.json
+++ b/integrationtest.esy.lock/index.json
@@ -1,5 +1,5 @@
 {
-  "checksum": "57439db1dbe17866bcd1a2b95a3aca47",
+  "checksum": "8e9a335adbd446c4504db3cf8b88ac94",
   "root": "Oni2@link-dev:./package.json",
   "node": {
     "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": {
@@ -118,7 +118,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "revery@github:revery-ui/revery#4d2dae6@d41d8cd9",
+        "revery@github:revery-ui/revery#19467ad@d41d8cd9",
         "isolinear@github:revery-ui/isolinear#53fc4eb@d41d8cd9",
         "@revery/timber@2.0.0@d41d8cd9",
         "@revery/esy-libvterm@1.0.3@d41d8cd9",
@@ -126,13 +126,13 @@
       ],
       "devDependencies": []
     },
-    "revery@github:revery-ui/revery#4d2dae6@d41d8cd9": {
-      "id": "revery@github:revery-ui/revery#4d2dae6@d41d8cd9",
+    "revery@github:revery-ui/revery#19467ad@d41d8cd9": {
+      "id": "revery@github:revery-ui/revery#19467ad@d41d8cd9",
       "name": "revery",
-      "version": "github:revery-ui/revery#4d2dae6",
+      "version": "github:revery-ui/revery#19467ad",
       "source": {
         "type": "install",
-        "source": [ "github:revery-ui/revery#4d2dae6" ]
+        "source": [ "github:revery-ui/revery#19467ad" ]
       },
       "overrides": [],
       "dependencies": [
@@ -147,7 +147,7 @@
         "@revery/esy-harfbuzz@2.6.8001@d41d8cd9",
         "@opam/uutf@opam:1.0.2@4440868f", "@opam/uucp@opam:13.0.0@e9b515e0",
         "@opam/ppx_optcomp@opam:v0.14.0@47cec200",
-        "@opam/ppx_deriving@opam:4.5@d89f2934",
+        "@opam/ppx_deriving@opam:5.1@3037236f",
         "@opam/omd@github:ocaml/omd:omd.opam#1535e3c@d41d8cd9",
         "@opam/markup@opam:0.8.2@87975241",
         "@opam/lwt_ppx@opam:2.0.1@e6a764a0", "@opam/lwt@opam:4.5.0@542100aa",
@@ -161,19 +161,19 @@
       ],
       "devDependencies": []
     },
-    "resolve@1.18.1@d41d8cd9": {
-      "id": "resolve@1.18.1@d41d8cd9",
+    "resolve@1.19.0@d41d8cd9": {
+      "id": "resolve@1.19.0@d41d8cd9",
       "name": "resolve",
-      "version": "1.18.1",
+      "version": "1.19.0",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://registry.npmjs.org/resolve/-/resolve-1.18.1.tgz#sha1:018fcb2c5b207d2a6424aee361c5a266da8f4130"
+          "archive:https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz#sha1:1af5bf630409734a067cae29318aac7fa29a267c"
         ]
       },
       "overrides": [],
       "dependencies": [
-        "path-parse@1.0.6@d41d8cd9", "is-core-module@2.0.0@d41d8cd9"
+        "path-parse@1.0.6@d41d8cd9", "is-core-module@2.2.0@d41d8cd9"
       ],
       "devDependencies": []
     },
@@ -246,7 +246,7 @@
         ]
       },
       "overrides": [],
-      "dependencies": [ "resolve@1.18.1@d41d8cd9" ],
+      "dependencies": [ "resolve@1.19.0@d41d8cd9" ],
       "devDependencies": []
     },
     "rebez@github:jchavarri/rebez#03fa3b7@d41d8cd9": {
@@ -293,7 +293,7 @@
       "dependencies": [
         "refmterr@3.3.2@d41d8cd9", "ocaml@4.10.0@d41d8cd9",
         "esy-fzy@github:CrossR/esy-fzy#8176cee@d41d8cd9",
-        "@opam/reason@opam:3.6.0@58adb39a",
+        "@opam/reason@opam:3.6.2@1a34f8a4",
         "@opam/dune-configurator@opam:2.5.1@aeb9d8d5",
         "@opam/dune@opam:2.5.0@e0bac278"
       ],
@@ -326,7 +326,7 @@
       "overrides": [],
       "dependencies": [
         "xmldom@0.1.31@d41d8cd9", "xmlbuilder@9.0.7@d41d8cd9",
-        "base64-js@1.3.1@d41d8cd9"
+        "base64-js@1.5.1@d41d8cd9"
       ],
       "devDependencies": []
     },
@@ -471,14 +471,14 @@
       ],
       "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ]
     },
-    "is-core-module@2.0.0@d41d8cd9": {
-      "id": "is-core-module@2.0.0@d41d8cd9",
+    "is-core-module@2.2.0@d41d8cd9": {
+      "id": "is-core-module@2.2.0@d41d8cd9",
       "name": "is-core-module",
-      "version": "2.0.0",
+      "version": "2.2.0",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://registry.npmjs.org/is-core-module/-/is-core-module-2.0.0.tgz#sha1:58531b70aed1db7c0e8d4eb1a0a2d1ddd64bd12d"
+          "archive:https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz#sha1:97037ef3d52224d85163f5597b2b63d9afed981a"
         ]
       },
       "overrides": [],
@@ -919,14 +919,14 @@
       ],
       "devDependencies": []
     },
-    "base64-js@1.3.1@d41d8cd9": {
-      "id": "base64-js@1.3.1@d41d8cd9",
+    "base64-js@1.5.1@d41d8cd9": {
+      "id": "base64-js@1.5.1@d41d8cd9",
       "name": "base64-js",
-      "version": "1.3.1",
+      "version": "1.5.1",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz#sha1:58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"
+          "archive:https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz#sha1:1b1b440160a5bf7ad40b650f095963481903930a"
         ]
       },
       "overrides": [],
@@ -1009,7 +1009,7 @@
       "overrides": [ "integrationtest.json" ],
       "dependencies": [
         "revery-terminal@github:revery-ui/revery-terminal#a9cb168@d41d8cd9",
-        "revery@github:revery-ui/revery#4d2dae6@d41d8cd9",
+        "revery@github:revery-ui/revery#19467ad@d41d8cd9",
         "rench@github:bryphe/rench#a976fe5@d41d8cd9",
         "refmterr@3.3.2@d41d8cd9",
         "reason-native-crash-utils@github:onivim/reason-native-crash-utils#38c8f00@d41d8cd9",
@@ -1026,13 +1026,13 @@
         "@reason-native-web/esy-openssl@1.1.1007@d41d8cd9",
         "@opam/yojson@github:onivim/yojson:yojson.opam#f480aef@d41d8cd9",
         "@opam/uutf@opam:1.0.2@4440868f", "@opam/uucp@opam:13.0.0@e9b515e0",
-        "@opam/reason@opam:3.6.0@58adb39a", "@opam/re@opam:1.9.0@d4d5e13d",
-        "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "@opam/reason@opam:3.6.2@1a34f8a4", "@opam/re@opam:1.9.0@d4d5e13d",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/ppx_optcomp@opam:v0.14.0@47cec200",
         "@opam/ppx_let@opam:v0.14.0@eb9b93e0",
         "@opam/ppx_inline_test@opam:v0.14.1@2e4fdd8d",
-        "@opam/ppx_deriving_yojson@opam:3.5.3@253e094d",
-        "@opam/ppx_deriving@opam:4.5@d89f2934",
+        "@opam/ppx_deriving_yojson@opam:3.6.1@faf11a7c",
+        "@opam/ppx_deriving@opam:5.1@3037236f",
         "@opam/ocamlformat@opam:0.15.0@8e036963",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@opam/markup@opam:0.8.2@87975241", "@opam/lwt@opam:4.5.0@542100aa",
@@ -1500,8 +1500,8 @@
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
       ]
     },
-    "@opam/stdlib-shims@opam:0.1.0@8c116481": {
-      "id": "@opam/stdlib-shims@opam:0.1.0@8c116481",
+    "@opam/stdlib-shims@opam:0.1.0@148f22ac": {
+      "id": "@opam/stdlib-shims@opam:0.1.0@148f22ac",
       "name": "@opam/stdlib-shims",
       "version": "opam:0.1.0",
       "source": {
@@ -1649,38 +1649,38 @@
         "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
-    "@opam/reason@opam:3.6.0@58adb39a": {
-      "id": "@opam/reason@opam:3.6.0@58adb39a",
+    "@opam/reason@opam:3.6.2@1a34f8a4": {
+      "id": "@opam/reason@opam:3.6.2@1a34f8a4",
       "name": "@opam/reason",
-      "version": "opam:3.6.0",
+      "version": "opam:3.6.2",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/d4/d4d729804bc509bca0ac6223e06f7314#md5:d4d729804bc509bca0ac6223e06f7314",
-          "archive:https://registry.npmjs.org/@esy-ocaml/reason/-/reason-3.6.0.tgz#md5:d4d729804bc509bca0ac6223e06f7314"
+          "archive:https://opam.ocaml.org/cache/md5/d6/d6de40f280f1c229f9cb26eb4015f1c5#md5:d6de40f280f1c229f9cb26eb4015f1c5",
+          "archive:https://registry.npmjs.org/@esy-ocaml/reason/-/reason-3.6.2.tgz#md5:d6de40f280f1c229f9cb26eb4015f1c5"
         ],
         "opam": {
           "name": "reason",
-          "version": "3.6.0",
-          "path": "integrationtest.esy.lock/opam/reason.3.6.0"
+          "version": "3.6.2",
+          "path": "integrationtest.esy.lock/opam/reason.3.6.2"
         }
       },
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82",
+        "@opam/ppx_derivers@opam:1.2.1@ecf0aa45",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
-        "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173",
         "@opam/merlin-extend@opam:0.6@404f814c",
-        "@opam/menhir@opam:20200624@8629ff13",
-        "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.5.0@e0bac278",
+        "@opam/menhir@opam:20201201@a7ee0741",
+        "@opam/fix@opam:20201120@5c318621", "@opam/dune@opam:2.5.0@e0bac278",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82",
-        "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173",
+        "@opam/ppx_derivers@opam:1.2.1@ecf0aa45",
         "@opam/merlin-extend@opam:0.6@404f814c",
-        "@opam/menhir@opam:20200624@8629ff13",
-        "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.5.0@e0bac278"
+        "@opam/menhir@opam:20201201@a7ee0741",
+        "@opam/fix@opam:20201120@5c318621", "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
     "@opam/react@opam:1.2.1@0e11855f": {
@@ -1817,8 +1817,8 @@
         "@opam/base-bytes@opam:base@19d0c2ff"
       ]
     },
-    "@opam/ppxlib@opam:0.15.0@a90ae385": {
-      "id": "@opam/ppxlib@opam:0.15.0@a90ae385",
+    "@opam/ppxlib@opam:0.15.0@6a9d8126": {
+      "id": "@opam/ppxlib@opam:0.15.0@6a9d8126",
       "name": "@opam/ppxlib",
       "version": "opam:0.15.0",
       "source": {
@@ -1835,7 +1835,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/stdlib-shims@opam:0.1.0@8c116481",
+        "ocaml@4.10.0@d41d8cd9", "@opam/stdlib-shims@opam:0.1.0@148f22ac",
         "@opam/sexplib0@opam:v0.14.0@ddeb6438",
         "@opam/ppx_derivers@opam:1.2.1@ecf0aa45",
         "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173",
@@ -1843,7 +1843,7 @@
         "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/stdlib-shims@opam:0.1.0@8c116481",
+        "ocaml@4.10.0@d41d8cd9", "@opam/stdlib-shims@opam:0.1.0@148f22ac",
         "@opam/sexplib0@opam:v0.14.0@ddeb6438",
         "@opam/ppx_derivers@opam:1.2.1@ecf0aa45",
         "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173",
@@ -1851,34 +1851,6 @@
         "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
-    "@opam/ppxfind@opam:1.4@d75848d2": {
-      "id": "@opam/ppxfind@opam:1.4@d75848d2",
-      "name": "@opam/ppxfind",
-      "version": "opam:1.4",
-      "source": {
-        "type": "install",
-        "source": [
-          "archive:https://opam.ocaml.org/cache/sha256/98/98291c69f04f7f7b7cdad1b5d786c70fc595559d4663cc04cb711ac132db4971#sha256:98291c69f04f7f7b7cdad1b5d786c70fc595559d4663cc04cb711ac132db4971",
-          "archive:https://github.com/jeremiedimino/ppxfind/releases/download/1.4/ppxfind-1.4.tbz#sha256:98291c69f04f7f7b7cdad1b5d786c70fc595559d4663cc04cb711ac132db4971"
-        ],
-        "opam": {
-          "name": "ppxfind",
-          "version": "1.4",
-          "path": "integrationtest.esy.lock/opam/ppxfind.1.4"
-        }
-      },
-      "overrides": [],
-      "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
-        "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173",
-        "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/substs@0.0.1@d41d8cd9"
-      ],
-      "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
-        "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173",
-        "@opam/dune@opam:2.5.0@e0bac278"
-      ]
-    },
     "@opam/ppx_yojson_conv_lib@opam:v0.14.0@116b53d6": {
       "id": "@opam/ppx_yojson_conv_lib@opam:v0.14.0@116b53d6",
       "name": "@opam/ppx_yojson_conv_lib",
@@ -1935,31 +1907,6 @@
         "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
-    "@opam/ppx_tools@opam:6.2@62a3aff2": {
-      "id": "@opam/ppx_tools@opam:6.2@62a3aff2",
-      "name": "@opam/ppx_tools",
-      "version": "opam:6.2",
-      "source": {
-        "type": "install",
-        "source": [
-          "archive:https://opam.ocaml.org/cache/md5/68/68b05e0794c475c384b9285d1156d1f3#md5:68b05e0794c475c384b9285d1156d1f3",
-          "archive:https://github.com/ocaml-ppx/ppx_tools/archive/6.2.tar.gz#md5:68b05e0794c475c384b9285d1156d1f3"
-        ],
-        "opam": {
-          "name": "ppx_tools",
-          "version": "6.2",
-          "path": "integrationtest.esy.lock/opam/ppx_tools.6.2"
-        }
-      },
-      "overrides": [],
-      "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@e0bac278",
-        "@esy-ocaml/substs@0.0.1@d41d8cd9"
-      ],
-      "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@e0bac278"
-      ]
-    },
     "@opam/ppx_sexp_conv@opam:v0.14.1@5fc4da3c": {
       "id": "@opam/ppx_sexp_conv@opam:v0.14.1@5fc4da3c",
       "name": "@opam/ppx_sexp_conv",
@@ -1979,13 +1926,13 @@
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/sexplib0@opam:v0.14.0@ddeb6438",
-        "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/sexplib0@opam:v0.14.0@ddeb6438",
-        "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
       ]
     },
@@ -2008,13 +1955,13 @@
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/stdio@opam:v0.14.0@a624e254",
-        "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/stdio@opam:v0.14.0@a624e254",
-        "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
       ]
     },
@@ -2036,12 +1983,12 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
       ]
     },
@@ -2063,13 +2010,13 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/octavius@opam:1.2.2@b328d1f1",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/octavius@opam:1.2.2@b328d1f1",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
       ]
@@ -2093,13 +2040,13 @@
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/time_now@opam:v0.14.0@5e4046b3",
-        "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/time_now@opam:v0.14.0@5e4046b3",
-        "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
       ]
     },
@@ -2121,12 +2068,12 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
       ]
     },
@@ -2148,14 +2095,14 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/ppx_sexp_conv@opam:v0.14.1@5fc4da3c",
         "@opam/ppx_compare@opam:v0.14.0@615de7a6",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/ppx_sexp_conv@opam:v0.14.1@5fc4da3c",
         "@opam/ppx_compare@opam:v0.14.0@615de7a6",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
@@ -2179,80 +2126,80 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
       ]
     },
-    "@opam/ppx_deriving_yojson@opam:3.5.3@253e094d": {
-      "id": "@opam/ppx_deriving_yojson@opam:3.5.3@253e094d",
+    "@opam/ppx_deriving_yojson@opam:3.6.1@faf11a7c": {
+      "id": "@opam/ppx_deriving_yojson@opam:3.6.1@faf11a7c",
       "name": "@opam/ppx_deriving_yojson",
-      "version": "opam:3.5.3",
+      "version": "opam:3.6.1",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/e5/e5185e4ac9d149a332566139df55d408#md5:e5185e4ac9d149a332566139df55d408",
-          "archive:https://github.com/ocaml-ppx/ppx_deriving_yojson/archive/v3.5.3.tar.gz#md5:e5185e4ac9d149a332566139df55d408"
+          "archive:https://opam.ocaml.org/cache/sha256/71/712ee9207c70dd144e72cd689bee2d2beb120b804e77c74ec6f7b843a88944e6#sha256:712ee9207c70dd144e72cd689bee2d2beb120b804e77c74ec6f7b843a88944e6",
+          "archive:https://github.com/ocaml-ppx/ppx_deriving_yojson/releases/download/v3.6.1/ppx_deriving_yojson-v3.6.1.tbz#sha256:712ee9207c70dd144e72cd689bee2d2beb120b804e77c74ec6f7b843a88944e6"
         ],
         "opam": {
           "name": "ppx_deriving_yojson",
-          "version": "3.5.3",
-          "path": "integrationtest.esy.lock/opam/ppx_deriving_yojson.3.5.3"
+          "version": "3.6.1",
+          "path": "integrationtest.esy.lock/opam/ppx_deriving_yojson.3.6.1"
         }
       },
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9",
         "@opam/yojson@github:onivim/yojson:yojson.opam#f480aef@d41d8cd9",
-        "@opam/result@opam:1.5@6b753c82", "@opam/ppxfind@opam:1.4@d75848d2",
-        "@opam/ppx_tools@opam:6.2@62a3aff2",
-        "@opam/ppx_deriving@opam:4.5@d89f2934",
-        "@opam/dune@opam:2.5.0@e0bac278", "@opam/cppo@opam:1.6.6@f4f83858",
-        "@esy-ocaml/substs@0.0.1@d41d8cd9"
+        "@opam/result@opam:1.5@6b753c82",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
+        "@opam/ppx_deriving@opam:5.1@3037236f",
+        "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9",
         "@opam/yojson@github:onivim/yojson:yojson.opam#f480aef@d41d8cd9",
         "@opam/result@opam:1.5@6b753c82",
-        "@opam/ppx_tools@opam:6.2@62a3aff2",
-        "@opam/ppx_deriving@opam:4.5@d89f2934",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
+        "@opam/ppx_deriving@opam:5.1@3037236f",
         "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
-    "@opam/ppx_deriving@opam:4.5@d89f2934": {
-      "id": "@opam/ppx_deriving@opam:4.5@d89f2934",
+    "@opam/ppx_deriving@opam:5.1@3037236f": {
+      "id": "@opam/ppx_deriving@opam:5.1@3037236f",
       "name": "@opam/ppx_deriving",
-      "version": "opam:4.5",
+      "version": "opam:5.1",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/sha512/f7/f79153c5231ba1e03a3491fde95ca82ecb62fe05b60a649a374d2fbc5ea5dd9242126de7dfbe917c22fd7077c026c940e18c6b36c5ce0ec4bb6e07f11d2b710b#sha512:f79153c5231ba1e03a3491fde95ca82ecb62fe05b60a649a374d2fbc5ea5dd9242126de7dfbe917c22fd7077c026c940e18c6b36c5ce0ec4bb6e07f11d2b710b",
-          "archive:https://github.com/ocaml-ppx/ppx_deriving/archive/v4.5.tar.gz#sha512:f79153c5231ba1e03a3491fde95ca82ecb62fe05b60a649a374d2fbc5ea5dd9242126de7dfbe917c22fd7077c026c940e18c6b36c5ce0ec4bb6e07f11d2b710b"
+          "archive:https://opam.ocaml.org/cache/sha256/b0/b04f3b22b754e65af50812730695863192ae410e802e074b55ebbb8c4f73c4c4#sha256:b04f3b22b754e65af50812730695863192ae410e802e074b55ebbb8c4f73c4c4",
+          "archive:https://github.com/ocaml-ppx/ppx_deriving/releases/download/v5.1/ppx_deriving-v5.1.tbz#sha256:b04f3b22b754e65af50812730695863192ae410e802e074b55ebbb8c4f73c4c4"
         ],
         "opam": {
           "name": "ppx_deriving",
-          "version": "4.5",
-          "path": "integrationtest.esy.lock/opam/ppx_deriving.4.5"
+          "version": "5.1",
+          "path": "integrationtest.esy.lock/opam/ppx_deriving.5.1"
         }
       },
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82",
-        "@opam/ppxfind@opam:1.4@d75848d2",
-        "@opam/ppx_tools@opam:6.2@62a3aff2",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/ppx_derivers@opam:1.2.1@ecf0aa45",
+        "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/cppo@opam:1.6.6@f4f83858",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82",
-        "@opam/ppx_tools@opam:6.2@62a3aff2",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/ppx_derivers@opam:1.2.1@ecf0aa45",
+        "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173",
         "@opam/dune@opam:2.5.0@e0bac278"
       ]
@@ -2300,12 +2247,12 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
       ]
     },
@@ -2327,12 +2274,12 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
       ]
     },
@@ -2354,7 +2301,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/ppx_sexp_conv@opam:v0.14.1@5fc4da3c",
         "@opam/ppx_js_style@opam:v0.14.0@10b020a8",
         "@opam/ppx_hash@opam:v0.14.0@8e9618e4",
@@ -2364,7 +2311,7 @@
         "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/ppx_sexp_conv@opam:v0.14.1@5fc4da3c",
         "@opam/ppx_js_style@opam:v0.14.0@10b020a8",
         "@opam/ppx_hash@opam:v0.14.0@8e9618e4",
@@ -2392,7 +2339,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/ppx_sexp_conv@opam:v0.14.1@5fc4da3c",
         "@opam/ppx_here@opam:v0.14.0@5ccc1c01",
         "@opam/ppx_compare@opam:v0.14.0@615de7a6",
@@ -2401,7 +2348,7 @@
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/ppx_sexp_conv@opam:v0.14.1@5fc4da3c",
         "@opam/ppx_here@opam:v0.14.0@5ccc1c01",
         "@opam/ppx_compare@opam:v0.14.0@615de7a6",
@@ -2430,20 +2377,20 @@
         "@opam/base-bigarray@opam:base@b03491b0"
       ]
     },
-    "@opam/odoc@opam:1.5.1@52a58c0b": {
-      "id": "@opam/odoc@opam:1.5.1@52a58c0b",
+    "@opam/odoc@opam:1.5.2@236518eb": {
+      "id": "@opam/odoc@opam:1.5.2@236518eb",
       "name": "@opam/odoc",
-      "version": "opam:1.5.1",
+      "version": "opam:1.5.2",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/sha256/ea/ea14721344e2aab6b63f2884782d37e94a1ed8ab91147a1c08a29710d99d354f#sha256:ea14721344e2aab6b63f2884782d37e94a1ed8ab91147a1c08a29710d99d354f",
-          "archive:https://github.com/ocaml/odoc/releases/download/1.5.1/odoc-1.5.1.tbz#sha256:ea14721344e2aab6b63f2884782d37e94a1ed8ab91147a1c08a29710d99d354f"
+          "archive:https://opam.ocaml.org/cache/sha256/d2/d24463f2660bc28c72cda001478360158e953721c9e23fb361ec4783113c4871#sha256:d24463f2660bc28c72cda001478360158e953721c9e23fb361ec4783113c4871",
+          "archive:https://github.com/ocaml/odoc/releases/download/1.5.2/odoc-1.5.2.tbz#sha256:d24463f2660bc28c72cda001478360158e953721c9e23fb361ec4783113c4871"
         ],
         "opam": {
           "name": "odoc",
-          "version": "1.5.1",
-          "path": "integrationtest.esy.lock/opam/odoc.1.5.1"
+          "version": "1.5.2",
+          "path": "integrationtest.esy.lock/opam/odoc.1.5.2"
         }
       },
       "overrides": [],
@@ -2537,11 +2484,11 @@
         "ocaml@4.10.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f",
         "@opam/uuseg@opam:13.0.0@f60712a7",
         "@opam/stdio@opam:v0.14.0@a624e254", "@opam/re@opam:1.9.0@d4d5e13d",
-        "@opam/odoc@opam:1.5.1@52a58c0b",
+        "@opam/odoc@opam:1.5.2@236518eb",
         "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173",
-        "@opam/menhir@opam:20200624@8629ff13",
+        "@opam/menhir@opam:20201201@a7ee0741",
         "@opam/fpath@opam:0.7.3@674d8125",
-        "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.5.0@e0bac278",
+        "@opam/fix@opam:20201120@5c318621", "@opam/dune@opam:2.5.0@e0bac278",
         "@opam/cmdliner@opam:1.0.4@93208aac",
         "@opam/base-unix@opam:base@87d0b2eb",
         "@opam/base@opam:v0.14.0@8bc55fce",
@@ -2551,11 +2498,11 @@
         "ocaml@4.10.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f",
         "@opam/uuseg@opam:13.0.0@f60712a7",
         "@opam/stdio@opam:v0.14.0@a624e254", "@opam/re@opam:1.9.0@d4d5e13d",
-        "@opam/odoc@opam:1.5.1@52a58c0b",
+        "@opam/odoc@opam:1.5.2@236518eb",
         "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173",
-        "@opam/menhir@opam:20200624@8629ff13",
+        "@opam/menhir@opam:20201201@a7ee0741",
         "@opam/fpath@opam:0.7.3@674d8125",
-        "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.5.0@e0bac278",
+        "@opam/fix@opam:20201120@5c318621", "@opam/dune@opam:2.5.0@e0bac278",
         "@opam/cmdliner@opam:1.0.4@93208aac",
         "@opam/base-unix@opam:base@87d0b2eb",
         "@opam/base@opam:v0.14.0@8bc55fce"
@@ -2684,20 +2631,20 @@
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9",
         "@opam/yojson@github:onivim/yojson:yojson.opam#f480aef@d41d8cd9",
-        "@opam/stdlib-shims@opam:0.1.0@8c116481",
+        "@opam/stdlib-shims@opam:0.1.0@148f22ac",
         "@opam/ppx_yojson_conv_lib@opam:v0.14.0@116b53d6",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
-        "@opam/menhir@opam:20200624@8629ff13",
+        "@opam/menhir@opam:20201201@a7ee0741",
         "@opam/dune-build-info@opam:2.6.2@03ffe168",
         "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9",
         "@opam/yojson@github:onivim/yojson:yojson.opam#f480aef@d41d8cd9",
-        "@opam/stdlib-shims@opam:0.1.0@8c116481",
+        "@opam/stdlib-shims@opam:0.1.0@148f22ac",
         "@opam/ppx_yojson_conv_lib@opam:v0.14.0@116b53d6",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
-        "@opam/menhir@opam:20200624@8629ff13",
+        "@opam/menhir@opam:20201201@a7ee0741",
         "@opam/dune-build-info@opam:2.6.2@03ffe168",
         "@opam/dune@opam:2.5.0@e0bac278"
       ]
@@ -2831,20 +2778,20 @@
         "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
-    "@opam/menhirSdk@opam:20200624@2a05b5a7": {
-      "id": "@opam/menhirSdk@opam:20200624@2a05b5a7",
+    "@opam/menhirSdk@opam:20201201@4b828f46": {
+      "id": "@opam/menhirSdk@opam:20201201@4b828f46",
       "name": "@opam/menhirSdk",
-      "version": "opam:20200624",
+      "version": "opam:20201201",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/c3/c37ff53a4a69059e1f8223067b91bb8b#md5:c37ff53a4a69059e1f8223067b91bb8b",
-          "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz#md5:c37ff53a4a69059e1f8223067b91bb8b"
+          "archive:https://opam.ocaml.org/cache/md5/ca/ca1047954bfe8c857425dc67eee46272#md5:ca1047954bfe8c857425dc67eee46272",
+          "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20201201/archive.tar.gz#md5:ca1047954bfe8c857425dc67eee46272"
         ],
         "opam": {
           "name": "menhirSdk",
-          "version": "20200624",
-          "path": "integrationtest.esy.lock/opam/menhirSdk.20200624"
+          "version": "20201201",
+          "path": "integrationtest.esy.lock/opam/menhirSdk.20201201"
         }
       },
       "overrides": [],
@@ -2856,20 +2803,20 @@
         "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
-    "@opam/menhirLib@opam:20200624@8bdd2b0e": {
-      "id": "@opam/menhirLib@opam:20200624@8bdd2b0e",
+    "@opam/menhirLib@opam:20201201@901a3013": {
+      "id": "@opam/menhirLib@opam:20201201@901a3013",
       "name": "@opam/menhirLib",
-      "version": "opam:20200624",
+      "version": "opam:20201201",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/c3/c37ff53a4a69059e1f8223067b91bb8b#md5:c37ff53a4a69059e1f8223067b91bb8b",
-          "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz#md5:c37ff53a4a69059e1f8223067b91bb8b"
+          "archive:https://opam.ocaml.org/cache/md5/ca/ca1047954bfe8c857425dc67eee46272#md5:ca1047954bfe8c857425dc67eee46272",
+          "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20201201/archive.tar.gz#md5:ca1047954bfe8c857425dc67eee46272"
         ],
         "opam": {
           "name": "menhirLib",
-          "version": "20200624",
-          "path": "integrationtest.esy.lock/opam/menhirLib.20200624"
+          "version": "20201201",
+          "path": "integrationtest.esy.lock/opam/menhirLib.20201201"
         }
       },
       "overrides": [],
@@ -2881,31 +2828,31 @@
         "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
-    "@opam/menhir@opam:20200624@8629ff13": {
-      "id": "@opam/menhir@opam:20200624@8629ff13",
+    "@opam/menhir@opam:20201201@a7ee0741": {
+      "id": "@opam/menhir@opam:20201201@a7ee0741",
       "name": "@opam/menhir",
-      "version": "opam:20200624",
+      "version": "opam:20201201",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/c3/c37ff53a4a69059e1f8223067b91bb8b#md5:c37ff53a4a69059e1f8223067b91bb8b",
-          "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz#md5:c37ff53a4a69059e1f8223067b91bb8b"
+          "archive:https://opam.ocaml.org/cache/md5/ca/ca1047954bfe8c857425dc67eee46272#md5:ca1047954bfe8c857425dc67eee46272",
+          "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20201201/archive.tar.gz#md5:ca1047954bfe8c857425dc67eee46272"
         ],
         "opam": {
           "name": "menhir",
-          "version": "20200624",
-          "path": "integrationtest.esy.lock/opam/menhir.20200624"
+          "version": "20201201",
+          "path": "integrationtest.esy.lock/opam/menhir.20201201"
         }
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200624@2a05b5a7",
-        "@opam/menhirLib@opam:20200624@8bdd2b0e",
+        "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20201201@4b828f46",
+        "@opam/menhirLib@opam:20201201@901a3013",
         "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200624@2a05b5a7",
-        "@opam/menhirLib@opam:20200624@8bdd2b0e",
+        "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20201201@4b828f46",
+        "@opam/menhirLib@opam:20201201@901a3013",
         "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
@@ -3278,12 +3225,12 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.0@58adb39a",
+        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.2@1a34f8a4",
         "@opam/fp@github:bryphe/reason-native:fp.opam#5a7a756@d41d8cd9",
         "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.0@58adb39a",
+        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.2@1a34f8a4",
         "@opam/fp@github:bryphe/reason-native:fp.opam#5a7a756@d41d8cd9",
         "@opam/dune@opam:2.5.0@e0bac278"
       ]
@@ -3326,11 +3273,11 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.0@58adb39a",
+        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.2@1a34f8a4",
         "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.0@58adb39a",
+        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.2@1a34f8a4",
         "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
@@ -3353,7 +3300,7 @@
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c",
-        "@opam/stdlib-shims@opam:0.1.0@8c116481",
+        "@opam/stdlib-shims@opam:0.1.0@148f22ac",
         "@opam/seq@opam:base@d8d7de1d",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
@@ -3362,24 +3309,24 @@
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/stdlib-shims@opam:0.1.0@8c116481",
+        "ocaml@4.10.0@d41d8cd9", "@opam/stdlib-shims@opam:0.1.0@148f22ac",
         "@opam/seq@opam:base@d8d7de1d"
       ]
     },
-    "@opam/fix@opam:20200131@0ecd2f01": {
-      "id": "@opam/fix@opam:20200131@0ecd2f01",
+    "@opam/fix@opam:20201120@5c318621": {
+      "id": "@opam/fix@opam:20201120@5c318621",
       "name": "@opam/fix",
-      "version": "opam:20200131",
+      "version": "opam:20201120",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/99/991ff031666c662eaab638d2e0f4ac1d#md5:991ff031666c662eaab638d2e0f4ac1d",
-          "archive:https://gitlab.inria.fr/fpottier/fix/repository/20200131/archive.tar.gz#md5:991ff031666c662eaab638d2e0f4ac1d"
+          "archive:https://opam.ocaml.org/cache/md5/7e/7eb570b759635fe66f3556d2b1cc88e3#md5:7eb570b759635fe66f3556d2b1cc88e3",
+          "archive:https://gitlab.inria.fr/fpottier/fix/repository/20201120/archive.tar.gz#md5:7eb570b759635fe66f3556d2b1cc88e3"
         ],
         "opam": {
           "name": "fix",
-          "version": "20200131",
-          "path": "integrationtest.esy.lock/opam/fix.20200131"
+          "version": "20201120",
+          "path": "integrationtest.esy.lock/opam/fix.20201120"
         }
       },
       "overrides": [],
@@ -3526,12 +3473,12 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.0@58adb39a",
+        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.2@1a34f8a4",
         "@opam/fp@github:bryphe/reason-native:fp.opam#5a7a756@d41d8cd9",
         "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.0@58adb39a",
+        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.2@1a34f8a4",
         "@opam/fp@github:bryphe/reason-native:fp.opam#5a7a756@d41d8cd9",
         "@opam/dune@opam:2.5.0@e0bac278"
       ]
@@ -3557,30 +3504,30 @@
         "ocaml@4.10.0@d41d8cd9",
         "@opam/yojson@github:onivim/yojson:yojson.opam#f480aef@d41d8cd9",
         "@opam/dune@opam:2.5.0@e0bac278",
-        "@opam/decoders@opam:0.4.0@b66e1fb4",
+        "@opam/decoders@opam:0.5.0@9df01185",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9",
         "@opam/yojson@github:onivim/yojson:yojson.opam#f480aef@d41d8cd9",
         "@opam/dune@opam:2.5.0@e0bac278",
-        "@opam/decoders@opam:0.4.0@b66e1fb4"
+        "@opam/decoders@opam:0.5.0@9df01185"
       ]
     },
-    "@opam/decoders@opam:0.4.0@b66e1fb4": {
-      "id": "@opam/decoders@opam:0.4.0@b66e1fb4",
+    "@opam/decoders@opam:0.5.0@9df01185": {
+      "id": "@opam/decoders@opam:0.5.0@9df01185",
       "name": "@opam/decoders",
-      "version": "opam:0.4.0",
+      "version": "opam:0.5.0",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/sha256/18/18ebbd98901dff67c9944d465ed508df018c8ee8e13bfe037d5ad780584eebf7#sha256:18ebbd98901dff67c9944d465ed508df018c8ee8e13bfe037d5ad780584eebf7",
-          "archive:https://github.com/mattjbray/ocaml-decoders/releases/download/v0.4.0/decoders-v0.4.0.tbz#sha256:18ebbd98901dff67c9944d465ed508df018c8ee8e13bfe037d5ad780584eebf7"
+          "archive:https://opam.ocaml.org/cache/sha256/fc/fc0b672a2ebcb1cfb7575384c5033b14985b26fe90ab517749ba77ed7fc0f11a#sha256:fc0b672a2ebcb1cfb7575384c5033b14985b26fe90ab517749ba77ed7fc0f11a",
+          "archive:https://github.com/mattjbray/ocaml-decoders/releases/download/v0.5.0/decoders-v0.5.0.tbz#sha256:fc0b672a2ebcb1cfb7575384c5033b14985b26fe90ab517749ba77ed7fc0f11a"
         ],
         "opam": {
           "name": "decoders",
-          "version": "0.4.0",
-          "path": "integrationtest.esy.lock/opam/decoders.0.4.0"
+          "version": "0.5.0",
+          "path": "integrationtest.esy.lock/opam/decoders.0.5.0"
         }
       },
       "overrides": [],
@@ -3885,16 +3832,16 @@
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@e0bac278",
-        "@opam/bigarray-compat@opam:1.0.0@1faefa97",
+        "@opam/bigarray-compat@opam:1.0.0@3a87ad65",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@e0bac278",
-        "@opam/bigarray-compat@opam:1.0.0@1faefa97"
+        "@opam/bigarray-compat@opam:1.0.0@3a87ad65"
       ]
     },
-    "@opam/bigarray-compat@opam:1.0.0@1faefa97": {
-      "id": "@opam/bigarray-compat@opam:1.0.0@1faefa97",
+    "@opam/bigarray-compat@opam:1.0.0@3a87ad65": {
+      "id": "@opam/bigarray-compat@opam:1.0.0@3a87ad65",
       "name": "@opam/bigarray-compat",
       "version": "opam:1.0.0",
       "source": {
@@ -4101,13 +4048,13 @@
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d",
-        "@opam/menhir@opam:20200624@8629ff13",
+        "@opam/menhir@opam:20201201@a7ee0741",
         "@opam/easy-format@opam:1.3.2@0484b3c4",
         "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d",
-        "@opam/menhir@opam:20200624@8629ff13",
+        "@opam/menhir@opam:20201201@a7ee0741",
         "@opam/easy-format@opam:1.3.2@0484b3c4",
         "@opam/dune@opam:2.5.0@e0bac278"
       ]
@@ -4215,8 +4162,8 @@
         "@opam/ppx_derivers@opam:1.2.1@ecf0aa45",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/merlin-extend@opam:0.6@404f814c",
-        "@opam/menhir@opam:20200624@8629ff13",
-        "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.5.0@e0bac278"
+        "@opam/menhir@opam:20201201@a7ee0741",
+        "@opam/fix@opam:20201120@5c318621", "@opam/dune@opam:2.5.0@e0bac278"
       ],
       "devDependencies": []
     },
@@ -4245,7 +4192,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/reason@3.6.2@d41d8cd9"
       ],
       "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ]
diff --git a/integrationtest.esy.lock/opam/bigarray-compat.1.0.0/opam b/integrationtest.esy.lock/opam/bigarray-compat.1.0.0/opam
index 93751514d6..24a122d43f 100644
--- a/integrationtest.esy.lock/opam/bigarray-compat.1.0.0/opam
+++ b/integrationtest.esy.lock/opam/bigarray-compat.1.0.0/opam
@@ -6,7 +6,7 @@ license: "ISC"
 homepage: "https://github.com/mirage/bigarray-compat"
 bug-reports: "https://github.com/mirage/bigarray-compat/issues"
 depends: [
-  "ocaml" {>= "4.03.0"}
+  "ocaml" {>= "4.02.3"}
   "dune" {>= "1.0"}
 ]
 build: [
@@ -20,4 +20,4 @@ url {
     "md5=1cc7c25382a8900bada34aadfd66632e"
     "sha512=c365fee15582aca35d7b05268cde29e54774ad7df7be56762b4aad78ca1409d4326ad3b34af0f1cc2c7b872837290a9cd9ff43b47987c03bba7bba32fe8a030f"
   ]
-}
\ No newline at end of file
+}
diff --git a/integrationtest.esy.lock/opam/decoders.0.4.0/opam b/integrationtest.esy.lock/opam/decoders.0.4.0/opam
deleted file mode 100644
index bc1e810302..0000000000
--- a/integrationtest.esy.lock/opam/decoders.0.4.0/opam
+++ /dev/null
@@ -1,40 +0,0 @@
-opam-version: "2.0"
-synopsis: "Elm-inspired decoders for Ocaml"
-description: """
-A combinator library for "decoding" JSON-like values into your own Ocaml types, inspired by Elm's `Json.Decode` and `Json.Encode`.
-
-> Eh?
-
-An Ocaml program having a JSON (or YAML) data source usually goes something like this:
-
-1. Get your data from somewhere. Now you have a `string`.
-2. *Parse* the `string` as JSON (or YAML). Now you have a `Yojson.Basic.json`, or maybe an `Ezjsonm.value`, or perhaps a `Ocyaml.yaml`.
-3. *Decode* the JSON value to an Ocaml type that's actually useful for your program's domain.
-
-This library helps with step 3.
-"""
-maintainer: "Matt Bray <matt@aestheticintegration.com>"
-authors: ["Matt Bray <matt@aestheticintegration.com>"]
-homepage: "https://github.com/mattjbray/ocaml-decoders"
-doc: "https://mattjbray.github.io/ocaml-decoders/decoders"
-bug-reports: "https://github.com/mattjbray/ocaml-decoders/issues"
-license: "ISC"
-dev-repo: "git+https://github.com/mattjbray/ocaml-decoders.git"
-build: [
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-  ["dune" "build" "@doc" "-p" name "-j" jobs] {with-doc}
-]
-depends: [
-  "dune" {>= "1.0"}
-  "containers" {with-test}
-  "ocaml" { >= "4.03.0" }
-]
-url {
-  src:
-    "https://github.com/mattjbray/ocaml-decoders/releases/download/v0.4.0/decoders-v0.4.0.tbz"
-  checksum: [
-    "sha256=18ebbd98901dff67c9944d465ed508df018c8ee8e13bfe037d5ad780584eebf7"
-    "sha512=a6221b40cc1c3d9ea46c5e7cec6c5992b923e390ce004c23d7f36e99974c10f6d4a690113255b85d3895f357e0dd44562e9bc03ba8708223cb1e56ba182c10d3"
-  ]
-}
diff --git a/integrationtest.esy.lock/opam/decoders.0.5.0/opam b/integrationtest.esy.lock/opam/decoders.0.5.0/opam
new file mode 100644
index 0000000000..171215090b
--- /dev/null
+++ b/integrationtest.esy.lock/opam/decoders.0.5.0/opam
@@ -0,0 +1,40 @@
+opam-version: "2.0"
+synopsis: "Elm-inspired decoders for Ocaml"
+description:
+  "A combinator library for \"decoding\" JSON-like values into your own Ocaml types, inspired by Elm's `Json.Decode` and `Json.Encode`."
+maintainer: ["Matt Bray <mattjbray@gmail.com>"]
+authors: ["Matt Bray <mattjbray@gmail.com>"]
+license: "ISC"
+homepage: "https://github.com/mattjbray/ocaml-decoders"
+doc: "https://mattjbray.github.io/ocaml-decoders/"
+bug-reports: "https://github.com/mattjbray/ocaml-decoders/issues"
+depends: [
+  "ocaml" {>= "4.03.0"}
+  "dune" {>= "2.0"}
+  "odoc" {with-doc}
+  "containers" {with-test}
+]
+build: [
+  ["dune" "subst"] {pinned}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+]
+dev-repo: "git+https://github.com/mattjbray/ocaml-decoders.git"
+x-commit-hash: "19200c6221a834098306620234310de514f6301c"
+url {
+  src:
+    "https://github.com/mattjbray/ocaml-decoders/releases/download/v0.5.0/decoders-v0.5.0.tbz"
+  checksum: [
+    "sha256=fc0b672a2ebcb1cfb7575384c5033b14985b26fe90ab517749ba77ed7fc0f11a"
+    "sha512=908f8cc12267344cb10319cf8ce05308734980093581791da07365e9986cbe96a1bc420da9eb6057930cbe37255824d76ee8c96d68e31f13bd3361834a6c7e10"
+  ]
+}
diff --git a/integrationtest.esy.lock/opam/fix.20200131/opam b/integrationtest.esy.lock/opam/fix.20201120/opam
similarity index 62%
rename from integrationtest.esy.lock/opam/fix.20200131/opam
rename to integrationtest.esy.lock/opam/fix.20201120/opam
index 4babcba82a..31c8a641a2 100644
--- a/integrationtest.esy.lock/opam/fix.20200131/opam
+++ b/integrationtest.esy.lock/opam/fix.20201120/opam
@@ -11,14 +11,14 @@ build: [
 ]
 depends: [
   "ocaml" { >= "4.03" }
-  "dune" { >= "1.3" }
+  "dune" {>=  "1.3" }
 ]
 synopsis: "Facilities for memoization and fixed points"
 url {
   src:
-    "https://gitlab.inria.fr/fpottier/fix/repository/20200131/archive.tar.gz"
+    "https://gitlab.inria.fr/fpottier/fix/repository/20201120/archive.tar.gz"
   checksum: [
-    "md5=991ff031666c662eaab638d2e0f4ac1d"
-    "sha512=01c45a1d90b02ec0939e968b185a6a373ac6117e2287b9a26d3db9d71e9569d086cea50da60710fcab5c2ed9d3b4c72b76839c0651e436f1fb39c77dc7c04b5e"
+    "md5=7eb570b759635fe66f3556d2b1cc88e3"
+    "sha512=344dcc619f9e8b8a6c998775b6d2dab2ea5253e6a67abe4797f76dc5dd30bc776568abce1e90477422e9db447821579889737e3531c42139708f813e983ea5d4"
   ]
 }
diff --git a/bench.esy.lock/opam/menhir.20200624/opam b/integrationtest.esy.lock/opam/menhir.20201201/opam
similarity index 69%
rename from bench.esy.lock/opam/menhir.20200624/opam
rename to integrationtest.esy.lock/opam/menhir.20201201/opam
index 37637fcf60..8bf0aabeeb 100644
--- a/bench.esy.lock/opam/menhir.20200624/opam
+++ b/integrationtest.esy.lock/opam/menhir.20201201/opam
@@ -19,9 +19,9 @@ depends: [
 synopsis: "An LR(1) parser generator"
 url {
   src:
-    "https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz"
+    "https://gitlab.inria.fr/fpottier/menhir/repository/20201201/archive.tar.gz"
   checksum: [
-    "md5=c37ff53a4a69059e1f8223067b91bb8b"
-    "sha512=68cd165bd65c93fc9b14820a032b6d760674b3e811d8536c2e26e10f9fc5892720564f109484f12f8d08d849c2983c2eaf350d76ab1122a5b8a3c7674ab2bd39"
+    "md5=ca1047954bfe8c857425dc67eee46272"
+    "sha512=571e7de852a2ea7d1cbb27fb9fd0b716b6ba1f112d4aedf4548d41f907c9a9b74e1b557a26a7515c2a0e5407de6c2614cea17d51a088d845d4c6ceaec85a0ecb"
   ]
 }
diff --git a/release.esy.lock/opam/menhirLib.20200624/opam b/integrationtest.esy.lock/opam/menhirLib.20201201/opam
similarity index 70%
rename from release.esy.lock/opam/menhirLib.20200624/opam
rename to integrationtest.esy.lock/opam/menhirLib.20201201/opam
index afcbe5d5e7..3d5290fd0f 100644
--- a/release.esy.lock/opam/menhirLib.20200624/opam
+++ b/integrationtest.esy.lock/opam/menhirLib.20201201/opam
@@ -20,9 +20,9 @@ conflicts: [
 synopsis: "Runtime support library for parsers generated by Menhir"
 url {
   src:
-    "https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz"
+    "https://gitlab.inria.fr/fpottier/menhir/repository/20201201/archive.tar.gz"
   checksum: [
-    "md5=c37ff53a4a69059e1f8223067b91bb8b"
-    "sha512=68cd165bd65c93fc9b14820a032b6d760674b3e811d8536c2e26e10f9fc5892720564f109484f12f8d08d849c2983c2eaf350d76ab1122a5b8a3c7674ab2bd39"
+    "md5=ca1047954bfe8c857425dc67eee46272"
+    "sha512=571e7de852a2ea7d1cbb27fb9fd0b716b6ba1f112d4aedf4548d41f907c9a9b74e1b557a26a7515c2a0e5407de6c2614cea17d51a088d845d4c6ceaec85a0ecb"
   ]
 }
diff --git a/esy.lock/opam/menhirSdk.20200624/opam b/integrationtest.esy.lock/opam/menhirSdk.20201201/opam
similarity index 70%
rename from esy.lock/opam/menhirSdk.20200624/opam
rename to integrationtest.esy.lock/opam/menhirSdk.20201201/opam
index af12216336..46afb20f24 100644
--- a/esy.lock/opam/menhirSdk.20200624/opam
+++ b/integrationtest.esy.lock/opam/menhirSdk.20201201/opam
@@ -20,9 +20,9 @@ conflicts: [
 synopsis: "Compile-time library for auxiliary tools related to Menhir"
 url {
   src:
-    "https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz"
+    "https://gitlab.inria.fr/fpottier/menhir/repository/20201201/archive.tar.gz"
   checksum: [
-    "md5=c37ff53a4a69059e1f8223067b91bb8b"
-    "sha512=68cd165bd65c93fc9b14820a032b6d760674b3e811d8536c2e26e10f9fc5892720564f109484f12f8d08d849c2983c2eaf350d76ab1122a5b8a3c7674ab2bd39"
+    "md5=ca1047954bfe8c857425dc67eee46272"
+    "sha512=571e7de852a2ea7d1cbb27fb9fd0b716b6ba1f112d4aedf4548d41f907c9a9b74e1b557a26a7515c2a0e5407de6c2614cea17d51a088d845d4c6ceaec85a0ecb"
   ]
 }
diff --git a/integrationtest.esy.lock/opam/odoc.1.5.1/opam b/integrationtest.esy.lock/opam/odoc.1.5.2/opam
similarity index 67%
rename from integrationtest.esy.lock/opam/odoc.1.5.1/opam
rename to integrationtest.esy.lock/opam/odoc.1.5.2/opam
index a7ccb1dca0..f59e640771 100644
--- a/integrationtest.esy.lock/opam/odoc.1.5.1/opam
+++ b/integrationtest.esy.lock/opam/odoc.1.5.2/opam
@@ -12,7 +12,7 @@ authors: [
   "Anton Bachin <antonbachin@yahoo.com>"
   "Jon Ludlam <jon@recoil.org>"
 ]
-maintainer: "Jon Ludlam <jon@recoil.org>"
+maintainer: "Anton Bachin <antonbachin@yahoo.com>"
 dev-repo: "git+https://github.com/ocaml/odoc.git"
 
 synopsis: "OCaml documentation generator"
@@ -27,12 +27,12 @@ depends: [
   "cppo" {build}
   "dune"
   "fpath"
-  "ocaml" {>= "4.02.0" & < "4.12"}
+  "ocaml" {>= "4.02.0"}
   "result"
   "tyxml" {>= "4.3.0"}
 
   "alcotest" {dev & >= "0.8.3"}
-  "markup" {dev & >= "0.8.0"}
+  "markup" {dev & >= "1.0.0"}
   "ocamlfind" {dev}
   "sexplib" {dev & >= "113.33.00"}
 
@@ -43,10 +43,11 @@ build: [
   ["dune" "subst"] {pinned}
   ["dune" "build" "-p" name "-j" jobs]
 ]
+x-commit-hash: "c0df8ce2171fa9645a41f371429aa3ddc16de5c1"
 url {
-  src: "https://github.com/ocaml/odoc/releases/download/1.5.1/odoc-1.5.1.tbz"
+  src: "https://github.com/ocaml/odoc/releases/download/1.5.2/odoc-1.5.2.tbz"
   checksum: [
-    "sha256=ea14721344e2aab6b63f2884782d37e94a1ed8ab91147a1c08a29710d99d354f"
-    "sha512=b2d12277d61e1e52354128d459d2ad49bea24a4d46db89790769c2843c4b00beaee3ea7d0215211079174c0bd893de6bf52dcbb71e46622728be7491d91058b2"
+    "sha256=d24463f2660bc28c72cda001478360158e953721c9e23fb361ec4783113c4871"
+    "sha512=e6c83630325de422f31cda8f88c038d213969f8b98e989593c057658f3956c0855860c9bc38f61b6479929516ca95aee689ddfba3ad8c47d821c4fdf54524cf9"
   ]
 }
diff --git a/bench.esy.lock/opam/ppx_deriving.4.5/opam b/integrationtest.esy.lock/opam/ppx_deriving.5.1/opam
similarity index 52%
rename from bench.esy.lock/opam/ppx_deriving.4.5/opam
rename to integrationtest.esy.lock/opam/ppx_deriving.5.1/opam
index 62efe36445..0396de61ca 100644
--- a/bench.esy.lock/opam/ppx_deriving.4.5/opam
+++ b/integrationtest.esy.lock/opam/ppx_deriving.5.1/opam
@@ -1,5 +1,5 @@
 opam-version: "2.0"
-maintainer: "thierry.martinez@inria.fr"
+maintainer: "whitequark <whitequark@whitequark.org>"
 authors: [ "whitequark <whitequark@whitequark.org>" ]
 license: "MIT"
 homepage: "https://github.com/ocaml-ppx/ppx_deriving"
@@ -8,28 +8,34 @@ bug-reports: "https://github.com/ocaml-ppx/ppx_deriving/issues"
 dev-repo: "git+https://github.com/ocaml-ppx/ppx_deriving.git"
 tags: [ "syntax" ]
 build: [
-  ["dune" "subst"] {pinned}
+  ["dune" "subst"] {dev}
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
   ["dune" "build" "@doc" "-p" name "-j" jobs] {with-doc}
 ]
 depends: [
-  "dune"     {>= "1.6.3"}
-  "cppo"     {build}
-  "ppxfind"  {build}
+  "ocaml" {>= "4.07.0" & < "4.12"}
+  "dune" {>= "1.6.3"}
+  "cppo" {build}
+  "ocamlfind"
   "ocaml-migrate-parsetree" {< "2.0.0"}
   "ppx_derivers"
-  "ppx_tools"  {>= "4.02.3"}
+  "ppxlib" {>= "0.14.0" & < "0.16.0"}
   "result"
-  "ounit"      {with-test}
-  "ocaml" {>= "4.02" & < "4.12.0"}
+  "ounit" {with-test}
 ]
-synopsis: "Type-driven code generation for OCaml >=4.02.2"
+synopsis: "Type-driven code generation for OCaml"
 description: """
 ppx_deriving provides common infrastructure for generating
 code based on type definitions, and a set of useful plugins
 for common tasks.
 """
 url {
-  src: "https://github.com/ocaml-ppx/ppx_deriving/archive/v4.5.tar.gz"
-  checksum: "sha512=f79153c5231ba1e03a3491fde95ca82ecb62fe05b60a649a374d2fbc5ea5dd9242126de7dfbe917c22fd7077c026c940e18c6b36c5ce0ec4bb6e07f11d2b710b"}
+  src:
+    "https://github.com/ocaml-ppx/ppx_deriving/releases/download/v5.1/ppx_deriving-v5.1.tbz"
+  checksum: [
+    "sha256=b04f3b22b754e65af50812730695863192ae410e802e074b55ebbb8c4f73c4c4"
+    "sha512=abcccda4878a82b0d0eedcc23127da6ae5c10bface59335a226a714752a46b987bff01f48fbe432910b26bfc7b332b301d191da71a9da0db593d86335bc83cd9"
+  ]
+}
+x-commit-hash: "b29509ff51f79f0f47dd85d60ab837ded5d2c6e4"
diff --git a/release.esy.lock/opam/ppx_deriving_yojson.3.5.3/opam b/integrationtest.esy.lock/opam/ppx_deriving_yojson.3.6.1/opam
similarity index 57%
rename from release.esy.lock/opam/ppx_deriving_yojson.3.5.3/opam
rename to integrationtest.esy.lock/opam/ppx_deriving_yojson.3.6.1/opam
index 289dd8327d..2f5c6c245d 100644
--- a/release.esy.lock/opam/ppx_deriving_yojson.3.5.3/opam
+++ b/integrationtest.esy.lock/opam/ppx_deriving_yojson.3.6.1/opam
@@ -4,7 +4,7 @@ authors: [ "whitequark <whitequark@whitequark.org>" ]
 license: "MIT"
 homepage: "https://github.com/ocaml-ppx/ppx_deriving_yojson"
 bug-reports: "https://github.com/ocaml-ppx/ppx_deriving_yojson/issues"
-dev-repo: "git://github.com/ocaml-ppx/ppx_deriving_yojson.git"
+dev-repo: "git+https://github.com/ocaml-ppx/ppx_deriving_yojson.git"
 tags: [ "syntax" "json" ]
 build: [
   ["dune" "subst"] {dev}
@@ -12,14 +12,12 @@ build: [
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
 depends: [
-  "ocaml" {>= "4.04.0"}
+  "ocaml" {>= "4.05.0"}
+  "dune" {>= "1.0"}
   "yojson" {>= "1.6.0" & < "2.0.0"}
   "result"
-  "ppx_deriving" {>= "4.5" & < "5.0"}
-  "ppx_tools"
-  "ppxfind" {build}
-  "dune" {>= "1.0"}
-  "cppo" {build}
+  "ppx_deriving" {>= "5.1"}
+  "ppxlib" {>= "0.14.0"}
   "ounit" {with-test & >= "2.0.0"}
 ]
 synopsis:
@@ -30,9 +28,10 @@ a JSON codec generator.
 """
 url {
   src:
-    "https://github.com/ocaml-ppx/ppx_deriving_yojson/archive/v3.5.3.tar.gz"
+    "https://github.com/ocaml-ppx/ppx_deriving_yojson/releases/download/v3.6.1/ppx_deriving_yojson-v3.6.1.tbz"
   checksum: [
-    "md5=e5185e4ac9d149a332566139df55d408"
-    "sha512=550fe8c400fa57f3f33f4cec509df061db0d62353e0d05ffb64e02aaef74324369840297507553d9b8a8cba81f980c210d23177bf184dbe58b952a7df4aa2176"
+    "sha256=712ee9207c70dd144e72cd689bee2d2beb120b804e77c74ec6f7b843a88944e6"
+    "sha512=d8c828902b8441f73e08fc03e2173ce81a09cccfe091471fbcffe098b2272739b98a05e8308016da3efeb3d4d1abd7d941bfaac42c85961ea40915ddce526577"
   ]
 }
+x-commit-hash: "d0abe462de8bab52d763eeafd751e8ea1ba211ac"
diff --git a/integrationtest.esy.lock/opam/ppx_tools.6.2/opam b/integrationtest.esy.lock/opam/ppx_tools.6.2/opam
deleted file mode 100644
index 9e8b874706..0000000000
--- a/integrationtest.esy.lock/opam/ppx_tools.6.2/opam
+++ /dev/null
@@ -1,21 +0,0 @@
-opam-version: "2.0"
-synopsis: "Tools for authors of ppx rewriters and other syntactic tools"
-maintainer: "Kate <kit.ty.kate@disroot.org>"
-authors: "Alain Frisch <alain.frisch@lexifi.com>"
-license: "MIT"
-tags: [ "syntax" ]
-homepage: "https://github.com/ocaml-ppx/ppx_tools"
-bug-reports: "https://github.com/ocaml-ppx/ppx_tools/issues"
-dev-repo: "git://github.com/ocaml-ppx/ppx_tools.git"
-build: ["dune" "build" "-p" name "-j" jobs]
-depends: [
-  "ocaml" {>= "4.08.0" & < "4.12.0"}
-  "dune" {>= "1.6"}
-]
-url {
-  src: "https://github.com/ocaml-ppx/ppx_tools/archive/6.2.tar.gz"
-  checksum: [
-    "md5=68b05e0794c475c384b9285d1156d1f3"
-    "sha512=fc3943c69901ef46843355c3482d5a1481d05ee94fb0a344ec04101059a02cbaa76fed5742cfae82730edf378f2e140d859a5cf590653f85359255d451f07dc8"
-  ]
-}
diff --git a/integrationtest.esy.lock/opam/ppxfind.1.4/opam b/integrationtest.esy.lock/opam/ppxfind.1.4/opam
deleted file mode 100644
index 57eefe4e65..0000000000
--- a/integrationtest.esy.lock/opam/ppxfind.1.4/opam
+++ /dev/null
@@ -1,41 +0,0 @@
-opam-version: "2.0"
-synopsis: "Tool combining ocamlfind and ppx"
-description: """
-Ppxfind is a small command line tool that among other things allows
-to use old style ppx rewriters with jbuilder.
-"""
-maintainer: ["Jérémie Dimino <jeremie@dimino.org>"]
-authors: ["Jérémie Dimino <jeremie@dimino.org>"]
-license: "BSD3"
-homepage: "https://github.com/jeremiedimino/ppxfind"
-doc: "https://jeremiedimino.github.io/ppxfind/"
-bug-reports: "https://github.com/jeremiedimino/ppxfind/issues"
-depends: [
-  "dune" {>= "2.0"}
-  "ocaml-migrate-parsetree" {>= "1.6.0" & < "2.0.0"}
-  "ocamlfind"
-  "ocaml" {>= "4.02.3"}
-]
-build: [
-  ["dune" "subst"] {pinned}
-  [
-    "dune"
-    "build"
-    "-p"
-    name
-    "-j"
-    jobs
-    "@install"
-    "@runtest" {with-test}
-    "@doc" {with-doc}
-  ]
-]
-dev-repo: "git+https://github.com/jeremiedimino/ppxfind.git"
-url {
-  src:
-    "https://github.com/jeremiedimino/ppxfind/releases/download/1.4/ppxfind-1.4.tbz"
-  checksum: [
-    "sha256=98291c69f04f7f7b7cdad1b5d786c70fc595559d4663cc04cb711ac132db4971"
-    "sha512=f80b0ee09fb536aa9f154da80d06a1b68ba3b10605fb7338bd6449beb5c8d00e983bf66b4a63e12659ae1410fea56d0a2c4cfd43584616438504628035bcb981"
-  ]
-}
diff --git a/integrationtest.esy.lock/opam/ppxlib.0.15.0/opam b/integrationtest.esy.lock/opam/ppxlib.0.15.0/opam
index 084b18884c..f32985ad85 100644
--- a/integrationtest.esy.lock/opam/ppxlib.0.15.0/opam
+++ b/integrationtest.esy.lock/opam/ppxlib.0.15.0/opam
@@ -14,7 +14,7 @@ run-test: [
   ["dune" "runtest" "-p" name "-j" jobs] { ocaml:version >= "4.10" }
 ]
 depends: [
-  "ocaml"                   {>= "4.04.1" & < "4.12"}
+  "ocaml"                   {>= "4.04.1"}
   "dune"                    {>= "1.11"}
   "ocaml-compiler-libs"     {>= "v0.11.0"}
   "ocaml-migrate-parsetree" {>= "1.5.0" & < "2.0.0"}
diff --git a/bench.esy.lock/opam/reason.3.6.0/opam b/integrationtest.esy.lock/opam/reason.3.6.2/opam
similarity index 78%
rename from bench.esy.lock/opam/reason.3.6.0/opam
rename to integrationtest.esy.lock/opam/reason.3.6.2/opam
index 3e9119724e..9408643bc9 100644
--- a/bench.esy.lock/opam/reason.3.6.0/opam
+++ b/integrationtest.esy.lock/opam/reason.3.6.2/opam
@@ -9,17 +9,16 @@ dev-repo: "git://github.com/facebook/reason.git"
 tags: [ "syntax" ]
 build: [
   ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
 depends: [
-  "ocaml"         {>= "4.03" & < "4.11"}
+  "ocaml"         {>= "4.03" & < "4.12"}
   "dune"          {>= "1.4"}
   "ocamlfind"     {build}
   "menhir"        {>= "20170418"}
-  "merlin-extend" {>= "0.4"}
+  "merlin-extend" {>= "0.6"}
+  "ppx_derivers" {< "2.0"}
   "fix"
   "result"
-  "ocaml-migrate-parsetree" {< "2.0.0"}
 ]
 synopsis: "Reason: Syntax & Toolchain for OCaml"
 description: """
@@ -27,6 +26,6 @@ Reason gives OCaml a new syntax that is remniscient of languages like
 JavaScript. It's also the umbrella project for a set of tools for the OCaml &
 JavaScript ecosystem."""
 url {
-  src: "https://registry.npmjs.org/@esy-ocaml/reason/-/reason-3.6.0.tgz"
-  checksum: "md5=d4d729804bc509bca0ac6223e06f7314"
+  src: "https://registry.npmjs.org/@esy-ocaml/reason/-/reason-3.6.2.tgz"
+  checksum: "md5=d6de40f280f1c229f9cb26eb4015f1c5"
 }
diff --git a/integrationtest.esy.lock/opam/stdlib-shims.0.1.0/opam b/integrationtest.esy.lock/opam/stdlib-shims.0.1.0/opam
index 0d1079d893..c6f3529a33 100644
--- a/integrationtest.esy.lock/opam/stdlib-shims.0.1.0/opam
+++ b/integrationtest.esy.lock/opam/stdlib-shims.0.1.0/opam
@@ -8,9 +8,9 @@ bug-reports: "https://github.com/ocaml/stdlib-shims/issues"
 tags: ["stdlib" "compatibility" "org:ocaml"]
 license: ["typeof OCaml system"]
 depends: [
-  "ocaml" {>="4.02.3"}
+  "ocaml" {>= "4.02.3"}
   "dune"
- ("dune" {>= "2.7.0"} | "dune" & "ocaml" {<"4.12.0~~"})
+ ("dune" {>= "2.8.0"} | "ocaml" {< "4.12.0~~"})
 ]
 build: [ "dune" "build" "-p" name "-j" jobs ]
 synopsis: "Backport some of the new stdlib features to older compiler"
diff --git a/package.json b/package.json
index 5b9e03029a..d45995a203 100644
--- a/package.json
+++ b/package.json
@@ -256,7 +256,7 @@
     "revery-terminal": "*"
   },
   "resolutions": {
-    "revery": "link:../revery",
+    "revery": "revery-ui/revery#19467ad",
     "esy-skia": "revery-ui/esy-skia#60e0260",
     "rench": "bryphe/rench#a976fe5",
     "isolinear": "revery-ui/isolinear#53fc4eb",
diff --git a/release.esy.lock/index.json b/release.esy.lock/index.json
index 38e8867286..70a0ae7209 100644
--- a/release.esy.lock/index.json
+++ b/release.esy.lock/index.json
@@ -1,5 +1,5 @@
 {
-  "checksum": "57439db1dbe17866bcd1a2b95a3aca47",
+  "checksum": "8e9a335adbd446c4504db3cf8b88ac94",
   "root": "Oni2@link-dev:./package.json",
   "node": {
     "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": {
@@ -118,7 +118,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "revery@github:revery-ui/revery#4d2dae6@d41d8cd9",
+        "revery@github:revery-ui/revery#19467ad@d41d8cd9",
         "isolinear@github:revery-ui/isolinear#53fc4eb@d41d8cd9",
         "@revery/timber@2.0.0@d41d8cd9",
         "@revery/esy-libvterm@1.0.3@d41d8cd9",
@@ -126,13 +126,13 @@
       ],
       "devDependencies": []
     },
-    "revery@github:revery-ui/revery#4d2dae6@d41d8cd9": {
-      "id": "revery@github:revery-ui/revery#4d2dae6@d41d8cd9",
+    "revery@github:revery-ui/revery#19467ad@d41d8cd9": {
+      "id": "revery@github:revery-ui/revery#19467ad@d41d8cd9",
       "name": "revery",
-      "version": "github:revery-ui/revery#4d2dae6",
+      "version": "github:revery-ui/revery#19467ad",
       "source": {
         "type": "install",
-        "source": [ "github:revery-ui/revery#4d2dae6" ]
+        "source": [ "github:revery-ui/revery#19467ad" ]
       },
       "overrides": [],
       "dependencies": [
@@ -147,7 +147,7 @@
         "@revery/esy-harfbuzz@2.6.8001@d41d8cd9",
         "@opam/uutf@opam:1.0.2@4440868f", "@opam/uucp@opam:13.0.0@e9b515e0",
         "@opam/ppx_optcomp@opam:v0.14.0@47cec200",
-        "@opam/ppx_deriving@opam:4.5@d89f2934",
+        "@opam/ppx_deriving@opam:5.1@3037236f",
         "@opam/omd@github:ocaml/omd:omd.opam#1535e3c@d41d8cd9",
         "@opam/markup@opam:0.8.2@87975241",
         "@opam/lwt_ppx@opam:2.0.1@e6a764a0", "@opam/lwt@opam:4.5.0@542100aa",
@@ -161,19 +161,19 @@
       ],
       "devDependencies": []
     },
-    "resolve@1.18.1@d41d8cd9": {
-      "id": "resolve@1.18.1@d41d8cd9",
+    "resolve@1.19.0@d41d8cd9": {
+      "id": "resolve@1.19.0@d41d8cd9",
       "name": "resolve",
-      "version": "1.18.1",
+      "version": "1.19.0",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://registry.npmjs.org/resolve/-/resolve-1.18.1.tgz#sha1:018fcb2c5b207d2a6424aee361c5a266da8f4130"
+          "archive:https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz#sha1:1af5bf630409734a067cae29318aac7fa29a267c"
         ]
       },
       "overrides": [],
       "dependencies": [
-        "path-parse@1.0.6@d41d8cd9", "is-core-module@2.0.0@d41d8cd9"
+        "path-parse@1.0.6@d41d8cd9", "is-core-module@2.2.0@d41d8cd9"
       ],
       "devDependencies": []
     },
@@ -246,7 +246,7 @@
         ]
       },
       "overrides": [],
-      "dependencies": [ "resolve@1.18.1@d41d8cd9" ],
+      "dependencies": [ "resolve@1.19.0@d41d8cd9" ],
       "devDependencies": []
     },
     "rebez@github:jchavarri/rebez#03fa3b7@d41d8cd9": {
@@ -293,7 +293,7 @@
       "dependencies": [
         "refmterr@3.3.2@d41d8cd9", "ocaml@4.10.0@d41d8cd9",
         "esy-fzy@github:CrossR/esy-fzy#8176cee@d41d8cd9",
-        "@opam/reason@opam:3.6.0@58adb39a",
+        "@opam/reason@opam:3.6.2@1a34f8a4",
         "@opam/dune-configurator@opam:2.5.1@aeb9d8d5",
         "@opam/dune@opam:2.5.0@e0bac278"
       ],
@@ -326,7 +326,7 @@
       "overrides": [],
       "dependencies": [
         "xmldom@0.1.31@d41d8cd9", "xmlbuilder@9.0.7@d41d8cd9",
-        "base64-js@1.3.1@d41d8cd9"
+        "base64-js@1.5.1@d41d8cd9"
       ],
       "devDependencies": []
     },
@@ -471,14 +471,14 @@
       ],
       "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ]
     },
-    "is-core-module@2.0.0@d41d8cd9": {
-      "id": "is-core-module@2.0.0@d41d8cd9",
+    "is-core-module@2.2.0@d41d8cd9": {
+      "id": "is-core-module@2.2.0@d41d8cd9",
       "name": "is-core-module",
-      "version": "2.0.0",
+      "version": "2.2.0",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://registry.npmjs.org/is-core-module/-/is-core-module-2.0.0.tgz#sha1:58531b70aed1db7c0e8d4eb1a0a2d1ddd64bd12d"
+          "archive:https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz#sha1:97037ef3d52224d85163f5597b2b63d9afed981a"
         ]
       },
       "overrides": [],
@@ -919,14 +919,14 @@
       ],
       "devDependencies": []
     },
-    "base64-js@1.3.1@d41d8cd9": {
-      "id": "base64-js@1.3.1@d41d8cd9",
+    "base64-js@1.5.1@d41d8cd9": {
+      "id": "base64-js@1.5.1@d41d8cd9",
       "name": "base64-js",
-      "version": "1.3.1",
+      "version": "1.5.1",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz#sha1:58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"
+          "archive:https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz#sha1:1b1b440160a5bf7ad40b650f095963481903930a"
         ]
       },
       "overrides": [],
@@ -1009,7 +1009,7 @@
       "overrides": [ "release.json" ],
       "dependencies": [
         "revery-terminal@github:revery-ui/revery-terminal#a9cb168@d41d8cd9",
-        "revery@github:revery-ui/revery#4d2dae6@d41d8cd9",
+        "revery@github:revery-ui/revery#19467ad@d41d8cd9",
         "rench@github:bryphe/rench#a976fe5@d41d8cd9",
         "refmterr@3.3.2@d41d8cd9",
         "reason-native-crash-utils@github:onivim/reason-native-crash-utils#38c8f00@d41d8cd9",
@@ -1026,13 +1026,13 @@
         "@reason-native-web/esy-openssl@1.1.1007@d41d8cd9",
         "@opam/yojson@github:onivim/yojson:yojson.opam#f480aef@d41d8cd9",
         "@opam/uutf@opam:1.0.2@4440868f", "@opam/uucp@opam:13.0.0@e9b515e0",
-        "@opam/reason@opam:3.6.0@58adb39a", "@opam/re@opam:1.9.0@d4d5e13d",
-        "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "@opam/reason@opam:3.6.2@1a34f8a4", "@opam/re@opam:1.9.0@d4d5e13d",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/ppx_optcomp@opam:v0.14.0@47cec200",
         "@opam/ppx_let@opam:v0.14.0@eb9b93e0",
         "@opam/ppx_inline_test@opam:v0.14.1@2e4fdd8d",
-        "@opam/ppx_deriving_yojson@opam:3.5.3@253e094d",
-        "@opam/ppx_deriving@opam:4.5@d89f2934",
+        "@opam/ppx_deriving_yojson@opam:3.6.1@faf11a7c",
+        "@opam/ppx_deriving@opam:5.1@3037236f",
         "@opam/ocamlformat@opam:0.15.0@8e036963",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@opam/markup@opam:0.8.2@87975241", "@opam/lwt@opam:4.5.0@542100aa",
@@ -1500,8 +1500,8 @@
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
       ]
     },
-    "@opam/stdlib-shims@opam:0.1.0@8c116481": {
-      "id": "@opam/stdlib-shims@opam:0.1.0@8c116481",
+    "@opam/stdlib-shims@opam:0.1.0@148f22ac": {
+      "id": "@opam/stdlib-shims@opam:0.1.0@148f22ac",
       "name": "@opam/stdlib-shims",
       "version": "opam:0.1.0",
       "source": {
@@ -1649,38 +1649,38 @@
         "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
-    "@opam/reason@opam:3.6.0@58adb39a": {
-      "id": "@opam/reason@opam:3.6.0@58adb39a",
+    "@opam/reason@opam:3.6.2@1a34f8a4": {
+      "id": "@opam/reason@opam:3.6.2@1a34f8a4",
       "name": "@opam/reason",
-      "version": "opam:3.6.0",
+      "version": "opam:3.6.2",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/d4/d4d729804bc509bca0ac6223e06f7314#md5:d4d729804bc509bca0ac6223e06f7314",
-          "archive:https://registry.npmjs.org/@esy-ocaml/reason/-/reason-3.6.0.tgz#md5:d4d729804bc509bca0ac6223e06f7314"
+          "archive:https://opam.ocaml.org/cache/md5/d6/d6de40f280f1c229f9cb26eb4015f1c5#md5:d6de40f280f1c229f9cb26eb4015f1c5",
+          "archive:https://registry.npmjs.org/@esy-ocaml/reason/-/reason-3.6.2.tgz#md5:d6de40f280f1c229f9cb26eb4015f1c5"
         ],
         "opam": {
           "name": "reason",
-          "version": "3.6.0",
-          "path": "release.esy.lock/opam/reason.3.6.0"
+          "version": "3.6.2",
+          "path": "release.esy.lock/opam/reason.3.6.2"
         }
       },
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82",
+        "@opam/ppx_derivers@opam:1.2.1@ecf0aa45",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
-        "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173",
         "@opam/merlin-extend@opam:0.6@404f814c",
-        "@opam/menhir@opam:20200624@8629ff13",
-        "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.5.0@e0bac278",
+        "@opam/menhir@opam:20201201@a7ee0741",
+        "@opam/fix@opam:20201120@5c318621", "@opam/dune@opam:2.5.0@e0bac278",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82",
-        "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173",
+        "@opam/ppx_derivers@opam:1.2.1@ecf0aa45",
         "@opam/merlin-extend@opam:0.6@404f814c",
-        "@opam/menhir@opam:20200624@8629ff13",
-        "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.5.0@e0bac278"
+        "@opam/menhir@opam:20201201@a7ee0741",
+        "@opam/fix@opam:20201120@5c318621", "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
     "@opam/react@opam:1.2.1@0e11855f": {
@@ -1817,8 +1817,8 @@
         "@opam/base-bytes@opam:base@19d0c2ff"
       ]
     },
-    "@opam/ppxlib@opam:0.15.0@a90ae385": {
-      "id": "@opam/ppxlib@opam:0.15.0@a90ae385",
+    "@opam/ppxlib@opam:0.15.0@6a9d8126": {
+      "id": "@opam/ppxlib@opam:0.15.0@6a9d8126",
       "name": "@opam/ppxlib",
       "version": "opam:0.15.0",
       "source": {
@@ -1835,7 +1835,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/stdlib-shims@opam:0.1.0@8c116481",
+        "ocaml@4.10.0@d41d8cd9", "@opam/stdlib-shims@opam:0.1.0@148f22ac",
         "@opam/sexplib0@opam:v0.14.0@ddeb6438",
         "@opam/ppx_derivers@opam:1.2.1@ecf0aa45",
         "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173",
@@ -1843,7 +1843,7 @@
         "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/stdlib-shims@opam:0.1.0@8c116481",
+        "ocaml@4.10.0@d41d8cd9", "@opam/stdlib-shims@opam:0.1.0@148f22ac",
         "@opam/sexplib0@opam:v0.14.0@ddeb6438",
         "@opam/ppx_derivers@opam:1.2.1@ecf0aa45",
         "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173",
@@ -1851,34 +1851,6 @@
         "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
-    "@opam/ppxfind@opam:1.4@d75848d2": {
-      "id": "@opam/ppxfind@opam:1.4@d75848d2",
-      "name": "@opam/ppxfind",
-      "version": "opam:1.4",
-      "source": {
-        "type": "install",
-        "source": [
-          "archive:https://opam.ocaml.org/cache/sha256/98/98291c69f04f7f7b7cdad1b5d786c70fc595559d4663cc04cb711ac132db4971#sha256:98291c69f04f7f7b7cdad1b5d786c70fc595559d4663cc04cb711ac132db4971",
-          "archive:https://github.com/jeremiedimino/ppxfind/releases/download/1.4/ppxfind-1.4.tbz#sha256:98291c69f04f7f7b7cdad1b5d786c70fc595559d4663cc04cb711ac132db4971"
-        ],
-        "opam": {
-          "name": "ppxfind",
-          "version": "1.4",
-          "path": "release.esy.lock/opam/ppxfind.1.4"
-        }
-      },
-      "overrides": [],
-      "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
-        "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173",
-        "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/substs@0.0.1@d41d8cd9"
-      ],
-      "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
-        "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173",
-        "@opam/dune@opam:2.5.0@e0bac278"
-      ]
-    },
     "@opam/ppx_yojson_conv_lib@opam:v0.14.0@116b53d6": {
       "id": "@opam/ppx_yojson_conv_lib@opam:v0.14.0@116b53d6",
       "name": "@opam/ppx_yojson_conv_lib",
@@ -1935,31 +1907,6 @@
         "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
-    "@opam/ppx_tools@opam:6.2@62a3aff2": {
-      "id": "@opam/ppx_tools@opam:6.2@62a3aff2",
-      "name": "@opam/ppx_tools",
-      "version": "opam:6.2",
-      "source": {
-        "type": "install",
-        "source": [
-          "archive:https://opam.ocaml.org/cache/md5/68/68b05e0794c475c384b9285d1156d1f3#md5:68b05e0794c475c384b9285d1156d1f3",
-          "archive:https://github.com/ocaml-ppx/ppx_tools/archive/6.2.tar.gz#md5:68b05e0794c475c384b9285d1156d1f3"
-        ],
-        "opam": {
-          "name": "ppx_tools",
-          "version": "6.2",
-          "path": "release.esy.lock/opam/ppx_tools.6.2"
-        }
-      },
-      "overrides": [],
-      "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@e0bac278",
-        "@esy-ocaml/substs@0.0.1@d41d8cd9"
-      ],
-      "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@e0bac278"
-      ]
-    },
     "@opam/ppx_sexp_conv@opam:v0.14.1@5fc4da3c": {
       "id": "@opam/ppx_sexp_conv@opam:v0.14.1@5fc4da3c",
       "name": "@opam/ppx_sexp_conv",
@@ -1979,13 +1926,13 @@
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/sexplib0@opam:v0.14.0@ddeb6438",
-        "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/sexplib0@opam:v0.14.0@ddeb6438",
-        "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
       ]
     },
@@ -2008,13 +1955,13 @@
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/stdio@opam:v0.14.0@a624e254",
-        "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/stdio@opam:v0.14.0@a624e254",
-        "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
       ]
     },
@@ -2036,12 +1983,12 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
       ]
     },
@@ -2063,13 +2010,13 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/octavius@opam:1.2.2@b328d1f1",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/octavius@opam:1.2.2@b328d1f1",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
       ]
@@ -2093,13 +2040,13 @@
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/time_now@opam:v0.14.0@5e4046b3",
-        "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/time_now@opam:v0.14.0@5e4046b3",
-        "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
       ]
     },
@@ -2121,12 +2068,12 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
       ]
     },
@@ -2148,14 +2095,14 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/ppx_sexp_conv@opam:v0.14.1@5fc4da3c",
         "@opam/ppx_compare@opam:v0.14.0@615de7a6",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/ppx_sexp_conv@opam:v0.14.1@5fc4da3c",
         "@opam/ppx_compare@opam:v0.14.0@615de7a6",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
@@ -2179,80 +2126,80 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
       ]
     },
-    "@opam/ppx_deriving_yojson@opam:3.5.3@253e094d": {
-      "id": "@opam/ppx_deriving_yojson@opam:3.5.3@253e094d",
+    "@opam/ppx_deriving_yojson@opam:3.6.1@faf11a7c": {
+      "id": "@opam/ppx_deriving_yojson@opam:3.6.1@faf11a7c",
       "name": "@opam/ppx_deriving_yojson",
-      "version": "opam:3.5.3",
+      "version": "opam:3.6.1",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/e5/e5185e4ac9d149a332566139df55d408#md5:e5185e4ac9d149a332566139df55d408",
-          "archive:https://github.com/ocaml-ppx/ppx_deriving_yojson/archive/v3.5.3.tar.gz#md5:e5185e4ac9d149a332566139df55d408"
+          "archive:https://opam.ocaml.org/cache/sha256/71/712ee9207c70dd144e72cd689bee2d2beb120b804e77c74ec6f7b843a88944e6#sha256:712ee9207c70dd144e72cd689bee2d2beb120b804e77c74ec6f7b843a88944e6",
+          "archive:https://github.com/ocaml-ppx/ppx_deriving_yojson/releases/download/v3.6.1/ppx_deriving_yojson-v3.6.1.tbz#sha256:712ee9207c70dd144e72cd689bee2d2beb120b804e77c74ec6f7b843a88944e6"
         ],
         "opam": {
           "name": "ppx_deriving_yojson",
-          "version": "3.5.3",
-          "path": "release.esy.lock/opam/ppx_deriving_yojson.3.5.3"
+          "version": "3.6.1",
+          "path": "release.esy.lock/opam/ppx_deriving_yojson.3.6.1"
         }
       },
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9",
         "@opam/yojson@github:onivim/yojson:yojson.opam#f480aef@d41d8cd9",
-        "@opam/result@opam:1.5@6b753c82", "@opam/ppxfind@opam:1.4@d75848d2",
-        "@opam/ppx_tools@opam:6.2@62a3aff2",
-        "@opam/ppx_deriving@opam:4.5@d89f2934",
-        "@opam/dune@opam:2.5.0@e0bac278", "@opam/cppo@opam:1.6.6@f4f83858",
-        "@esy-ocaml/substs@0.0.1@d41d8cd9"
+        "@opam/result@opam:1.5@6b753c82",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
+        "@opam/ppx_deriving@opam:5.1@3037236f",
+        "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9",
         "@opam/yojson@github:onivim/yojson:yojson.opam#f480aef@d41d8cd9",
         "@opam/result@opam:1.5@6b753c82",
-        "@opam/ppx_tools@opam:6.2@62a3aff2",
-        "@opam/ppx_deriving@opam:4.5@d89f2934",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
+        "@opam/ppx_deriving@opam:5.1@3037236f",
         "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
-    "@opam/ppx_deriving@opam:4.5@d89f2934": {
-      "id": "@opam/ppx_deriving@opam:4.5@d89f2934",
+    "@opam/ppx_deriving@opam:5.1@3037236f": {
+      "id": "@opam/ppx_deriving@opam:5.1@3037236f",
       "name": "@opam/ppx_deriving",
-      "version": "opam:4.5",
+      "version": "opam:5.1",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/sha512/f7/f79153c5231ba1e03a3491fde95ca82ecb62fe05b60a649a374d2fbc5ea5dd9242126de7dfbe917c22fd7077c026c940e18c6b36c5ce0ec4bb6e07f11d2b710b#sha512:f79153c5231ba1e03a3491fde95ca82ecb62fe05b60a649a374d2fbc5ea5dd9242126de7dfbe917c22fd7077c026c940e18c6b36c5ce0ec4bb6e07f11d2b710b",
-          "archive:https://github.com/ocaml-ppx/ppx_deriving/archive/v4.5.tar.gz#sha512:f79153c5231ba1e03a3491fde95ca82ecb62fe05b60a649a374d2fbc5ea5dd9242126de7dfbe917c22fd7077c026c940e18c6b36c5ce0ec4bb6e07f11d2b710b"
+          "archive:https://opam.ocaml.org/cache/sha256/b0/b04f3b22b754e65af50812730695863192ae410e802e074b55ebbb8c4f73c4c4#sha256:b04f3b22b754e65af50812730695863192ae410e802e074b55ebbb8c4f73c4c4",
+          "archive:https://github.com/ocaml-ppx/ppx_deriving/releases/download/v5.1/ppx_deriving-v5.1.tbz#sha256:b04f3b22b754e65af50812730695863192ae410e802e074b55ebbb8c4f73c4c4"
         ],
         "opam": {
           "name": "ppx_deriving",
-          "version": "4.5",
-          "path": "release.esy.lock/opam/ppx_deriving.4.5"
+          "version": "5.1",
+          "path": "release.esy.lock/opam/ppx_deriving.5.1"
         }
       },
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82",
-        "@opam/ppxfind@opam:1.4@d75848d2",
-        "@opam/ppx_tools@opam:6.2@62a3aff2",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/ppx_derivers@opam:1.2.1@ecf0aa45",
+        "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/cppo@opam:1.6.6@f4f83858",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82",
-        "@opam/ppx_tools@opam:6.2@62a3aff2",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/ppx_derivers@opam:1.2.1@ecf0aa45",
+        "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173",
         "@opam/dune@opam:2.5.0@e0bac278"
       ]
@@ -2300,12 +2247,12 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
       ]
     },
@@ -2327,12 +2274,12 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
       ]
     },
@@ -2354,7 +2301,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/ppx_sexp_conv@opam:v0.14.1@5fc4da3c",
         "@opam/ppx_js_style@opam:v0.14.0@10b020a8",
         "@opam/ppx_hash@opam:v0.14.0@8e9618e4",
@@ -2364,7 +2311,7 @@
         "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/ppx_sexp_conv@opam:v0.14.1@5fc4da3c",
         "@opam/ppx_js_style@opam:v0.14.0@10b020a8",
         "@opam/ppx_hash@opam:v0.14.0@8e9618e4",
@@ -2392,7 +2339,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/ppx_sexp_conv@opam:v0.14.1@5fc4da3c",
         "@opam/ppx_here@opam:v0.14.0@5ccc1c01",
         "@opam/ppx_compare@opam:v0.14.0@615de7a6",
@@ -2401,7 +2348,7 @@
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/ppx_sexp_conv@opam:v0.14.1@5fc4da3c",
         "@opam/ppx_here@opam:v0.14.0@5ccc1c01",
         "@opam/ppx_compare@opam:v0.14.0@615de7a6",
@@ -2430,20 +2377,20 @@
         "@opam/base-bigarray@opam:base@b03491b0"
       ]
     },
-    "@opam/odoc@opam:1.5.1@52a58c0b": {
-      "id": "@opam/odoc@opam:1.5.1@52a58c0b",
+    "@opam/odoc@opam:1.5.2@236518eb": {
+      "id": "@opam/odoc@opam:1.5.2@236518eb",
       "name": "@opam/odoc",
-      "version": "opam:1.5.1",
+      "version": "opam:1.5.2",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/sha256/ea/ea14721344e2aab6b63f2884782d37e94a1ed8ab91147a1c08a29710d99d354f#sha256:ea14721344e2aab6b63f2884782d37e94a1ed8ab91147a1c08a29710d99d354f",
-          "archive:https://github.com/ocaml/odoc/releases/download/1.5.1/odoc-1.5.1.tbz#sha256:ea14721344e2aab6b63f2884782d37e94a1ed8ab91147a1c08a29710d99d354f"
+          "archive:https://opam.ocaml.org/cache/sha256/d2/d24463f2660bc28c72cda001478360158e953721c9e23fb361ec4783113c4871#sha256:d24463f2660bc28c72cda001478360158e953721c9e23fb361ec4783113c4871",
+          "archive:https://github.com/ocaml/odoc/releases/download/1.5.2/odoc-1.5.2.tbz#sha256:d24463f2660bc28c72cda001478360158e953721c9e23fb361ec4783113c4871"
         ],
         "opam": {
           "name": "odoc",
-          "version": "1.5.1",
-          "path": "release.esy.lock/opam/odoc.1.5.1"
+          "version": "1.5.2",
+          "path": "release.esy.lock/opam/odoc.1.5.2"
         }
       },
       "overrides": [],
@@ -2537,11 +2484,11 @@
         "ocaml@4.10.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f",
         "@opam/uuseg@opam:13.0.0@f60712a7",
         "@opam/stdio@opam:v0.14.0@a624e254", "@opam/re@opam:1.9.0@d4d5e13d",
-        "@opam/odoc@opam:1.5.1@52a58c0b",
+        "@opam/odoc@opam:1.5.2@236518eb",
         "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173",
-        "@opam/menhir@opam:20200624@8629ff13",
+        "@opam/menhir@opam:20201201@a7ee0741",
         "@opam/fpath@opam:0.7.3@674d8125",
-        "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.5.0@e0bac278",
+        "@opam/fix@opam:20201120@5c318621", "@opam/dune@opam:2.5.0@e0bac278",
         "@opam/cmdliner@opam:1.0.4@93208aac",
         "@opam/base-unix@opam:base@87d0b2eb",
         "@opam/base@opam:v0.14.0@8bc55fce",
@@ -2551,11 +2498,11 @@
         "ocaml@4.10.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f",
         "@opam/uuseg@opam:13.0.0@f60712a7",
         "@opam/stdio@opam:v0.14.0@a624e254", "@opam/re@opam:1.9.0@d4d5e13d",
-        "@opam/odoc@opam:1.5.1@52a58c0b",
+        "@opam/odoc@opam:1.5.2@236518eb",
         "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173",
-        "@opam/menhir@opam:20200624@8629ff13",
+        "@opam/menhir@opam:20201201@a7ee0741",
         "@opam/fpath@opam:0.7.3@674d8125",
-        "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.5.0@e0bac278",
+        "@opam/fix@opam:20201120@5c318621", "@opam/dune@opam:2.5.0@e0bac278",
         "@opam/cmdliner@opam:1.0.4@93208aac",
         "@opam/base-unix@opam:base@87d0b2eb",
         "@opam/base@opam:v0.14.0@8bc55fce"
@@ -2683,20 +2630,20 @@
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9",
         "@opam/yojson@github:onivim/yojson:yojson.opam#f480aef@d41d8cd9",
-        "@opam/stdlib-shims@opam:0.1.0@8c116481",
+        "@opam/stdlib-shims@opam:0.1.0@148f22ac",
         "@opam/ppx_yojson_conv_lib@opam:v0.14.0@116b53d6",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
-        "@opam/menhir@opam:20200624@8629ff13",
+        "@opam/menhir@opam:20201201@a7ee0741",
         "@opam/dune-build-info@opam:2.6.2@03ffe168",
         "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9",
         "@opam/yojson@github:onivim/yojson:yojson.opam#f480aef@d41d8cd9",
-        "@opam/stdlib-shims@opam:0.1.0@8c116481",
+        "@opam/stdlib-shims@opam:0.1.0@148f22ac",
         "@opam/ppx_yojson_conv_lib@opam:v0.14.0@116b53d6",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
-        "@opam/menhir@opam:20200624@8629ff13",
+        "@opam/menhir@opam:20201201@a7ee0741",
         "@opam/dune-build-info@opam:2.6.2@03ffe168",
         "@opam/dune@opam:2.5.0@e0bac278"
       ]
@@ -2830,20 +2777,20 @@
         "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
-    "@opam/menhirSdk@opam:20200624@2a05b5a7": {
-      "id": "@opam/menhirSdk@opam:20200624@2a05b5a7",
+    "@opam/menhirSdk@opam:20201201@4b828f46": {
+      "id": "@opam/menhirSdk@opam:20201201@4b828f46",
       "name": "@opam/menhirSdk",
-      "version": "opam:20200624",
+      "version": "opam:20201201",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/c3/c37ff53a4a69059e1f8223067b91bb8b#md5:c37ff53a4a69059e1f8223067b91bb8b",
-          "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz#md5:c37ff53a4a69059e1f8223067b91bb8b"
+          "archive:https://opam.ocaml.org/cache/md5/ca/ca1047954bfe8c857425dc67eee46272#md5:ca1047954bfe8c857425dc67eee46272",
+          "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20201201/archive.tar.gz#md5:ca1047954bfe8c857425dc67eee46272"
         ],
         "opam": {
           "name": "menhirSdk",
-          "version": "20200624",
-          "path": "release.esy.lock/opam/menhirSdk.20200624"
+          "version": "20201201",
+          "path": "release.esy.lock/opam/menhirSdk.20201201"
         }
       },
       "overrides": [],
@@ -2855,20 +2802,20 @@
         "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
-    "@opam/menhirLib@opam:20200624@8bdd2b0e": {
-      "id": "@opam/menhirLib@opam:20200624@8bdd2b0e",
+    "@opam/menhirLib@opam:20201201@901a3013": {
+      "id": "@opam/menhirLib@opam:20201201@901a3013",
       "name": "@opam/menhirLib",
-      "version": "opam:20200624",
+      "version": "opam:20201201",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/c3/c37ff53a4a69059e1f8223067b91bb8b#md5:c37ff53a4a69059e1f8223067b91bb8b",
-          "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz#md5:c37ff53a4a69059e1f8223067b91bb8b"
+          "archive:https://opam.ocaml.org/cache/md5/ca/ca1047954bfe8c857425dc67eee46272#md5:ca1047954bfe8c857425dc67eee46272",
+          "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20201201/archive.tar.gz#md5:ca1047954bfe8c857425dc67eee46272"
         ],
         "opam": {
           "name": "menhirLib",
-          "version": "20200624",
-          "path": "release.esy.lock/opam/menhirLib.20200624"
+          "version": "20201201",
+          "path": "release.esy.lock/opam/menhirLib.20201201"
         }
       },
       "overrides": [],
@@ -2880,31 +2827,31 @@
         "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
-    "@opam/menhir@opam:20200624@8629ff13": {
-      "id": "@opam/menhir@opam:20200624@8629ff13",
+    "@opam/menhir@opam:20201201@a7ee0741": {
+      "id": "@opam/menhir@opam:20201201@a7ee0741",
       "name": "@opam/menhir",
-      "version": "opam:20200624",
+      "version": "opam:20201201",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/c3/c37ff53a4a69059e1f8223067b91bb8b#md5:c37ff53a4a69059e1f8223067b91bb8b",
-          "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz#md5:c37ff53a4a69059e1f8223067b91bb8b"
+          "archive:https://opam.ocaml.org/cache/md5/ca/ca1047954bfe8c857425dc67eee46272#md5:ca1047954bfe8c857425dc67eee46272",
+          "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20201201/archive.tar.gz#md5:ca1047954bfe8c857425dc67eee46272"
         ],
         "opam": {
           "name": "menhir",
-          "version": "20200624",
-          "path": "release.esy.lock/opam/menhir.20200624"
+          "version": "20201201",
+          "path": "release.esy.lock/opam/menhir.20201201"
         }
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200624@2a05b5a7",
-        "@opam/menhirLib@opam:20200624@8bdd2b0e",
+        "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20201201@4b828f46",
+        "@opam/menhirLib@opam:20201201@901a3013",
         "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200624@2a05b5a7",
-        "@opam/menhirLib@opam:20200624@8bdd2b0e",
+        "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20201201@4b828f46",
+        "@opam/menhirLib@opam:20201201@901a3013",
         "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
@@ -3277,12 +3224,12 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.0@58adb39a",
+        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.2@1a34f8a4",
         "@opam/fp@github:bryphe/reason-native:fp.opam#5a7a756@d41d8cd9",
         "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.0@58adb39a",
+        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.2@1a34f8a4",
         "@opam/fp@github:bryphe/reason-native:fp.opam#5a7a756@d41d8cd9",
         "@opam/dune@opam:2.5.0@e0bac278"
       ]
@@ -3325,11 +3272,11 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.0@58adb39a",
+        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.2@1a34f8a4",
         "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.0@58adb39a",
+        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.2@1a34f8a4",
         "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
@@ -3352,7 +3299,7 @@
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c",
-        "@opam/stdlib-shims@opam:0.1.0@8c116481",
+        "@opam/stdlib-shims@opam:0.1.0@148f22ac",
         "@opam/seq@opam:base@d8d7de1d",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
@@ -3361,24 +3308,24 @@
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/stdlib-shims@opam:0.1.0@8c116481",
+        "ocaml@4.10.0@d41d8cd9", "@opam/stdlib-shims@opam:0.1.0@148f22ac",
         "@opam/seq@opam:base@d8d7de1d"
       ]
     },
-    "@opam/fix@opam:20200131@0ecd2f01": {
-      "id": "@opam/fix@opam:20200131@0ecd2f01",
+    "@opam/fix@opam:20201120@5c318621": {
+      "id": "@opam/fix@opam:20201120@5c318621",
       "name": "@opam/fix",
-      "version": "opam:20200131",
+      "version": "opam:20201120",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/99/991ff031666c662eaab638d2e0f4ac1d#md5:991ff031666c662eaab638d2e0f4ac1d",
-          "archive:https://gitlab.inria.fr/fpottier/fix/repository/20200131/archive.tar.gz#md5:991ff031666c662eaab638d2e0f4ac1d"
+          "archive:https://opam.ocaml.org/cache/md5/7e/7eb570b759635fe66f3556d2b1cc88e3#md5:7eb570b759635fe66f3556d2b1cc88e3",
+          "archive:https://gitlab.inria.fr/fpottier/fix/repository/20201120/archive.tar.gz#md5:7eb570b759635fe66f3556d2b1cc88e3"
         ],
         "opam": {
           "name": "fix",
-          "version": "20200131",
-          "path": "release.esy.lock/opam/fix.20200131"
+          "version": "20201120",
+          "path": "release.esy.lock/opam/fix.20201120"
         }
       },
       "overrides": [],
@@ -3525,12 +3472,12 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.0@58adb39a",
+        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.2@1a34f8a4",
         "@opam/fp@github:bryphe/reason-native:fp.opam#5a7a756@d41d8cd9",
         "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.0@58adb39a",
+        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.2@1a34f8a4",
         "@opam/fp@github:bryphe/reason-native:fp.opam#5a7a756@d41d8cd9",
         "@opam/dune@opam:2.5.0@e0bac278"
       ]
@@ -3556,30 +3503,30 @@
         "ocaml@4.10.0@d41d8cd9",
         "@opam/yojson@github:onivim/yojson:yojson.opam#f480aef@d41d8cd9",
         "@opam/dune@opam:2.5.0@e0bac278",
-        "@opam/decoders@opam:0.4.0@b66e1fb4",
+        "@opam/decoders@opam:0.5.0@9df01185",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9",
         "@opam/yojson@github:onivim/yojson:yojson.opam#f480aef@d41d8cd9",
         "@opam/dune@opam:2.5.0@e0bac278",
-        "@opam/decoders@opam:0.4.0@b66e1fb4"
+        "@opam/decoders@opam:0.5.0@9df01185"
       ]
     },
-    "@opam/decoders@opam:0.4.0@b66e1fb4": {
-      "id": "@opam/decoders@opam:0.4.0@b66e1fb4",
+    "@opam/decoders@opam:0.5.0@9df01185": {
+      "id": "@opam/decoders@opam:0.5.0@9df01185",
       "name": "@opam/decoders",
-      "version": "opam:0.4.0",
+      "version": "opam:0.5.0",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/sha256/18/18ebbd98901dff67c9944d465ed508df018c8ee8e13bfe037d5ad780584eebf7#sha256:18ebbd98901dff67c9944d465ed508df018c8ee8e13bfe037d5ad780584eebf7",
-          "archive:https://github.com/mattjbray/ocaml-decoders/releases/download/v0.4.0/decoders-v0.4.0.tbz#sha256:18ebbd98901dff67c9944d465ed508df018c8ee8e13bfe037d5ad780584eebf7"
+          "archive:https://opam.ocaml.org/cache/sha256/fc/fc0b672a2ebcb1cfb7575384c5033b14985b26fe90ab517749ba77ed7fc0f11a#sha256:fc0b672a2ebcb1cfb7575384c5033b14985b26fe90ab517749ba77ed7fc0f11a",
+          "archive:https://github.com/mattjbray/ocaml-decoders/releases/download/v0.5.0/decoders-v0.5.0.tbz#sha256:fc0b672a2ebcb1cfb7575384c5033b14985b26fe90ab517749ba77ed7fc0f11a"
         ],
         "opam": {
           "name": "decoders",
-          "version": "0.4.0",
-          "path": "release.esy.lock/opam/decoders.0.4.0"
+          "version": "0.5.0",
+          "path": "release.esy.lock/opam/decoders.0.5.0"
         }
       },
       "overrides": [],
@@ -3884,16 +3831,16 @@
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@e0bac278",
-        "@opam/bigarray-compat@opam:1.0.0@1faefa97",
+        "@opam/bigarray-compat@opam:1.0.0@3a87ad65",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@e0bac278",
-        "@opam/bigarray-compat@opam:1.0.0@1faefa97"
+        "@opam/bigarray-compat@opam:1.0.0@3a87ad65"
       ]
     },
-    "@opam/bigarray-compat@opam:1.0.0@1faefa97": {
-      "id": "@opam/bigarray-compat@opam:1.0.0@1faefa97",
+    "@opam/bigarray-compat@opam:1.0.0@3a87ad65": {
+      "id": "@opam/bigarray-compat@opam:1.0.0@3a87ad65",
       "name": "@opam/bigarray-compat",
       "version": "opam:1.0.0",
       "source": {
@@ -4100,13 +4047,13 @@
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d",
-        "@opam/menhir@opam:20200624@8629ff13",
+        "@opam/menhir@opam:20201201@a7ee0741",
         "@opam/easy-format@opam:1.3.2@0484b3c4",
         "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d",
-        "@opam/menhir@opam:20200624@8629ff13",
+        "@opam/menhir@opam:20201201@a7ee0741",
         "@opam/easy-format@opam:1.3.2@0484b3c4",
         "@opam/dune@opam:2.5.0@e0bac278"
       ]
@@ -4214,8 +4161,8 @@
         "@opam/ppx_derivers@opam:1.2.1@ecf0aa45",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/merlin-extend@opam:0.6@404f814c",
-        "@opam/menhir@opam:20200624@8629ff13",
-        "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.5.0@e0bac278"
+        "@opam/menhir@opam:20201201@a7ee0741",
+        "@opam/fix@opam:20201120@5c318621", "@opam/dune@opam:2.5.0@e0bac278"
       ],
       "devDependencies": []
     },
@@ -4244,7 +4191,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/reason@3.6.2@d41d8cd9"
       ],
       "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ]
diff --git a/release.esy.lock/opam/bigarray-compat.1.0.0/opam b/release.esy.lock/opam/bigarray-compat.1.0.0/opam
index 93751514d6..24a122d43f 100644
--- a/release.esy.lock/opam/bigarray-compat.1.0.0/opam
+++ b/release.esy.lock/opam/bigarray-compat.1.0.0/opam
@@ -6,7 +6,7 @@ license: "ISC"
 homepage: "https://github.com/mirage/bigarray-compat"
 bug-reports: "https://github.com/mirage/bigarray-compat/issues"
 depends: [
-  "ocaml" {>= "4.03.0"}
+  "ocaml" {>= "4.02.3"}
   "dune" {>= "1.0"}
 ]
 build: [
@@ -20,4 +20,4 @@ url {
     "md5=1cc7c25382a8900bada34aadfd66632e"
     "sha512=c365fee15582aca35d7b05268cde29e54774ad7df7be56762b4aad78ca1409d4326ad3b34af0f1cc2c7b872837290a9cd9ff43b47987c03bba7bba32fe8a030f"
   ]
-}
\ No newline at end of file
+}
diff --git a/release.esy.lock/opam/decoders.0.4.0/opam b/release.esy.lock/opam/decoders.0.4.0/opam
deleted file mode 100644
index bc1e810302..0000000000
--- a/release.esy.lock/opam/decoders.0.4.0/opam
+++ /dev/null
@@ -1,40 +0,0 @@
-opam-version: "2.0"
-synopsis: "Elm-inspired decoders for Ocaml"
-description: """
-A combinator library for "decoding" JSON-like values into your own Ocaml types, inspired by Elm's `Json.Decode` and `Json.Encode`.
-
-> Eh?
-
-An Ocaml program having a JSON (or YAML) data source usually goes something like this:
-
-1. Get your data from somewhere. Now you have a `string`.
-2. *Parse* the `string` as JSON (or YAML). Now you have a `Yojson.Basic.json`, or maybe an `Ezjsonm.value`, or perhaps a `Ocyaml.yaml`.
-3. *Decode* the JSON value to an Ocaml type that's actually useful for your program's domain.
-
-This library helps with step 3.
-"""
-maintainer: "Matt Bray <matt@aestheticintegration.com>"
-authors: ["Matt Bray <matt@aestheticintegration.com>"]
-homepage: "https://github.com/mattjbray/ocaml-decoders"
-doc: "https://mattjbray.github.io/ocaml-decoders/decoders"
-bug-reports: "https://github.com/mattjbray/ocaml-decoders/issues"
-license: "ISC"
-dev-repo: "git+https://github.com/mattjbray/ocaml-decoders.git"
-build: [
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-  ["dune" "build" "@doc" "-p" name "-j" jobs] {with-doc}
-]
-depends: [
-  "dune" {>= "1.0"}
-  "containers" {with-test}
-  "ocaml" { >= "4.03.0" }
-]
-url {
-  src:
-    "https://github.com/mattjbray/ocaml-decoders/releases/download/v0.4.0/decoders-v0.4.0.tbz"
-  checksum: [
-    "sha256=18ebbd98901dff67c9944d465ed508df018c8ee8e13bfe037d5ad780584eebf7"
-    "sha512=a6221b40cc1c3d9ea46c5e7cec6c5992b923e390ce004c23d7f36e99974c10f6d4a690113255b85d3895f357e0dd44562e9bc03ba8708223cb1e56ba182c10d3"
-  ]
-}
diff --git a/release.esy.lock/opam/decoders.0.5.0/opam b/release.esy.lock/opam/decoders.0.5.0/opam
new file mode 100644
index 0000000000..171215090b
--- /dev/null
+++ b/release.esy.lock/opam/decoders.0.5.0/opam
@@ -0,0 +1,40 @@
+opam-version: "2.0"
+synopsis: "Elm-inspired decoders for Ocaml"
+description:
+  "A combinator library for \"decoding\" JSON-like values into your own Ocaml types, inspired by Elm's `Json.Decode` and `Json.Encode`."
+maintainer: ["Matt Bray <mattjbray@gmail.com>"]
+authors: ["Matt Bray <mattjbray@gmail.com>"]
+license: "ISC"
+homepage: "https://github.com/mattjbray/ocaml-decoders"
+doc: "https://mattjbray.github.io/ocaml-decoders/"
+bug-reports: "https://github.com/mattjbray/ocaml-decoders/issues"
+depends: [
+  "ocaml" {>= "4.03.0"}
+  "dune" {>= "2.0"}
+  "odoc" {with-doc}
+  "containers" {with-test}
+]
+build: [
+  ["dune" "subst"] {pinned}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+]
+dev-repo: "git+https://github.com/mattjbray/ocaml-decoders.git"
+x-commit-hash: "19200c6221a834098306620234310de514f6301c"
+url {
+  src:
+    "https://github.com/mattjbray/ocaml-decoders/releases/download/v0.5.0/decoders-v0.5.0.tbz"
+  checksum: [
+    "sha256=fc0b672a2ebcb1cfb7575384c5033b14985b26fe90ab517749ba77ed7fc0f11a"
+    "sha512=908f8cc12267344cb10319cf8ce05308734980093581791da07365e9986cbe96a1bc420da9eb6057930cbe37255824d76ee8c96d68e31f13bd3361834a6c7e10"
+  ]
+}
diff --git a/release.esy.lock/opam/fix.20200131/opam b/release.esy.lock/opam/fix.20201120/opam
similarity index 62%
rename from release.esy.lock/opam/fix.20200131/opam
rename to release.esy.lock/opam/fix.20201120/opam
index 4babcba82a..31c8a641a2 100644
--- a/release.esy.lock/opam/fix.20200131/opam
+++ b/release.esy.lock/opam/fix.20201120/opam
@@ -11,14 +11,14 @@ build: [
 ]
 depends: [
   "ocaml" { >= "4.03" }
-  "dune" { >= "1.3" }
+  "dune" {>=  "1.3" }
 ]
 synopsis: "Facilities for memoization and fixed points"
 url {
   src:
-    "https://gitlab.inria.fr/fpottier/fix/repository/20200131/archive.tar.gz"
+    "https://gitlab.inria.fr/fpottier/fix/repository/20201120/archive.tar.gz"
   checksum: [
-    "md5=991ff031666c662eaab638d2e0f4ac1d"
-    "sha512=01c45a1d90b02ec0939e968b185a6a373ac6117e2287b9a26d3db9d71e9569d086cea50da60710fcab5c2ed9d3b4c72b76839c0651e436f1fb39c77dc7c04b5e"
+    "md5=7eb570b759635fe66f3556d2b1cc88e3"
+    "sha512=344dcc619f9e8b8a6c998775b6d2dab2ea5253e6a67abe4797f76dc5dd30bc776568abce1e90477422e9db447821579889737e3531c42139708f813e983ea5d4"
   ]
 }
diff --git a/release.esy.lock/opam/menhir.20200624/opam b/release.esy.lock/opam/menhir.20201201/opam
similarity index 69%
rename from release.esy.lock/opam/menhir.20200624/opam
rename to release.esy.lock/opam/menhir.20201201/opam
index 37637fcf60..8bf0aabeeb 100644
--- a/release.esy.lock/opam/menhir.20200624/opam
+++ b/release.esy.lock/opam/menhir.20201201/opam
@@ -19,9 +19,9 @@ depends: [
 synopsis: "An LR(1) parser generator"
 url {
   src:
-    "https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz"
+    "https://gitlab.inria.fr/fpottier/menhir/repository/20201201/archive.tar.gz"
   checksum: [
-    "md5=c37ff53a4a69059e1f8223067b91bb8b"
-    "sha512=68cd165bd65c93fc9b14820a032b6d760674b3e811d8536c2e26e10f9fc5892720564f109484f12f8d08d849c2983c2eaf350d76ab1122a5b8a3c7674ab2bd39"
+    "md5=ca1047954bfe8c857425dc67eee46272"
+    "sha512=571e7de852a2ea7d1cbb27fb9fd0b716b6ba1f112d4aedf4548d41f907c9a9b74e1b557a26a7515c2a0e5407de6c2614cea17d51a088d845d4c6ceaec85a0ecb"
   ]
 }
diff --git a/bench.esy.lock/opam/menhirLib.20200624/opam b/release.esy.lock/opam/menhirLib.20201201/opam
similarity index 70%
rename from bench.esy.lock/opam/menhirLib.20200624/opam
rename to release.esy.lock/opam/menhirLib.20201201/opam
index afcbe5d5e7..3d5290fd0f 100644
--- a/bench.esy.lock/opam/menhirLib.20200624/opam
+++ b/release.esy.lock/opam/menhirLib.20201201/opam
@@ -20,9 +20,9 @@ conflicts: [
 synopsis: "Runtime support library for parsers generated by Menhir"
 url {
   src:
-    "https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz"
+    "https://gitlab.inria.fr/fpottier/menhir/repository/20201201/archive.tar.gz"
   checksum: [
-    "md5=c37ff53a4a69059e1f8223067b91bb8b"
-    "sha512=68cd165bd65c93fc9b14820a032b6d760674b3e811d8536c2e26e10f9fc5892720564f109484f12f8d08d849c2983c2eaf350d76ab1122a5b8a3c7674ab2bd39"
+    "md5=ca1047954bfe8c857425dc67eee46272"
+    "sha512=571e7de852a2ea7d1cbb27fb9fd0b716b6ba1f112d4aedf4548d41f907c9a9b74e1b557a26a7515c2a0e5407de6c2614cea17d51a088d845d4c6ceaec85a0ecb"
   ]
 }
diff --git a/release.esy.lock/opam/menhirSdk.20200624/opam b/release.esy.lock/opam/menhirSdk.20201201/opam
similarity index 70%
rename from release.esy.lock/opam/menhirSdk.20200624/opam
rename to release.esy.lock/opam/menhirSdk.20201201/opam
index af12216336..46afb20f24 100644
--- a/release.esy.lock/opam/menhirSdk.20200624/opam
+++ b/release.esy.lock/opam/menhirSdk.20201201/opam
@@ -20,9 +20,9 @@ conflicts: [
 synopsis: "Compile-time library for auxiliary tools related to Menhir"
 url {
   src:
-    "https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz"
+    "https://gitlab.inria.fr/fpottier/menhir/repository/20201201/archive.tar.gz"
   checksum: [
-    "md5=c37ff53a4a69059e1f8223067b91bb8b"
-    "sha512=68cd165bd65c93fc9b14820a032b6d760674b3e811d8536c2e26e10f9fc5892720564f109484f12f8d08d849c2983c2eaf350d76ab1122a5b8a3c7674ab2bd39"
+    "md5=ca1047954bfe8c857425dc67eee46272"
+    "sha512=571e7de852a2ea7d1cbb27fb9fd0b716b6ba1f112d4aedf4548d41f907c9a9b74e1b557a26a7515c2a0e5407de6c2614cea17d51a088d845d4c6ceaec85a0ecb"
   ]
 }
diff --git a/release.esy.lock/opam/odoc.1.5.1/opam b/release.esy.lock/opam/odoc.1.5.2/opam
similarity index 67%
rename from release.esy.lock/opam/odoc.1.5.1/opam
rename to release.esy.lock/opam/odoc.1.5.2/opam
index a7ccb1dca0..f59e640771 100644
--- a/release.esy.lock/opam/odoc.1.5.1/opam
+++ b/release.esy.lock/opam/odoc.1.5.2/opam
@@ -12,7 +12,7 @@ authors: [
   "Anton Bachin <antonbachin@yahoo.com>"
   "Jon Ludlam <jon@recoil.org>"
 ]
-maintainer: "Jon Ludlam <jon@recoil.org>"
+maintainer: "Anton Bachin <antonbachin@yahoo.com>"
 dev-repo: "git+https://github.com/ocaml/odoc.git"
 
 synopsis: "OCaml documentation generator"
@@ -27,12 +27,12 @@ depends: [
   "cppo" {build}
   "dune"
   "fpath"
-  "ocaml" {>= "4.02.0" & < "4.12"}
+  "ocaml" {>= "4.02.0"}
   "result"
   "tyxml" {>= "4.3.0"}
 
   "alcotest" {dev & >= "0.8.3"}
-  "markup" {dev & >= "0.8.0"}
+  "markup" {dev & >= "1.0.0"}
   "ocamlfind" {dev}
   "sexplib" {dev & >= "113.33.00"}
 
@@ -43,10 +43,11 @@ build: [
   ["dune" "subst"] {pinned}
   ["dune" "build" "-p" name "-j" jobs]
 ]
+x-commit-hash: "c0df8ce2171fa9645a41f371429aa3ddc16de5c1"
 url {
-  src: "https://github.com/ocaml/odoc/releases/download/1.5.1/odoc-1.5.1.tbz"
+  src: "https://github.com/ocaml/odoc/releases/download/1.5.2/odoc-1.5.2.tbz"
   checksum: [
-    "sha256=ea14721344e2aab6b63f2884782d37e94a1ed8ab91147a1c08a29710d99d354f"
-    "sha512=b2d12277d61e1e52354128d459d2ad49bea24a4d46db89790769c2843c4b00beaee3ea7d0215211079174c0bd893de6bf52dcbb71e46622728be7491d91058b2"
+    "sha256=d24463f2660bc28c72cda001478360158e953721c9e23fb361ec4783113c4871"
+    "sha512=e6c83630325de422f31cda8f88c038d213969f8b98e989593c057658f3956c0855860c9bc38f61b6479929516ca95aee689ddfba3ad8c47d821c4fdf54524cf9"
   ]
 }
diff --git a/release.esy.lock/opam/ppx_deriving.4.5/opam b/release.esy.lock/opam/ppx_deriving.5.1/opam
similarity index 52%
rename from release.esy.lock/opam/ppx_deriving.4.5/opam
rename to release.esy.lock/opam/ppx_deriving.5.1/opam
index 62efe36445..0396de61ca 100644
--- a/release.esy.lock/opam/ppx_deriving.4.5/opam
+++ b/release.esy.lock/opam/ppx_deriving.5.1/opam
@@ -1,5 +1,5 @@
 opam-version: "2.0"
-maintainer: "thierry.martinez@inria.fr"
+maintainer: "whitequark <whitequark@whitequark.org>"
 authors: [ "whitequark <whitequark@whitequark.org>" ]
 license: "MIT"
 homepage: "https://github.com/ocaml-ppx/ppx_deriving"
@@ -8,28 +8,34 @@ bug-reports: "https://github.com/ocaml-ppx/ppx_deriving/issues"
 dev-repo: "git+https://github.com/ocaml-ppx/ppx_deriving.git"
 tags: [ "syntax" ]
 build: [
-  ["dune" "subst"] {pinned}
+  ["dune" "subst"] {dev}
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
   ["dune" "build" "@doc" "-p" name "-j" jobs] {with-doc}
 ]
 depends: [
-  "dune"     {>= "1.6.3"}
-  "cppo"     {build}
-  "ppxfind"  {build}
+  "ocaml" {>= "4.07.0" & < "4.12"}
+  "dune" {>= "1.6.3"}
+  "cppo" {build}
+  "ocamlfind"
   "ocaml-migrate-parsetree" {< "2.0.0"}
   "ppx_derivers"
-  "ppx_tools"  {>= "4.02.3"}
+  "ppxlib" {>= "0.14.0" & < "0.16.0"}
   "result"
-  "ounit"      {with-test}
-  "ocaml" {>= "4.02" & < "4.12.0"}
+  "ounit" {with-test}
 ]
-synopsis: "Type-driven code generation for OCaml >=4.02.2"
+synopsis: "Type-driven code generation for OCaml"
 description: """
 ppx_deriving provides common infrastructure for generating
 code based on type definitions, and a set of useful plugins
 for common tasks.
 """
 url {
-  src: "https://github.com/ocaml-ppx/ppx_deriving/archive/v4.5.tar.gz"
-  checksum: "sha512=f79153c5231ba1e03a3491fde95ca82ecb62fe05b60a649a374d2fbc5ea5dd9242126de7dfbe917c22fd7077c026c940e18c6b36c5ce0ec4bb6e07f11d2b710b"}
+  src:
+    "https://github.com/ocaml-ppx/ppx_deriving/releases/download/v5.1/ppx_deriving-v5.1.tbz"
+  checksum: [
+    "sha256=b04f3b22b754e65af50812730695863192ae410e802e074b55ebbb8c4f73c4c4"
+    "sha512=abcccda4878a82b0d0eedcc23127da6ae5c10bface59335a226a714752a46b987bff01f48fbe432910b26bfc7b332b301d191da71a9da0db593d86335bc83cd9"
+  ]
+}
+x-commit-hash: "b29509ff51f79f0f47dd85d60ab837ded5d2c6e4"
diff --git a/bench.esy.lock/opam/ppx_deriving_yojson.3.5.3/opam b/release.esy.lock/opam/ppx_deriving_yojson.3.6.1/opam
similarity index 57%
rename from bench.esy.lock/opam/ppx_deriving_yojson.3.5.3/opam
rename to release.esy.lock/opam/ppx_deriving_yojson.3.6.1/opam
index 289dd8327d..2f5c6c245d 100644
--- a/bench.esy.lock/opam/ppx_deriving_yojson.3.5.3/opam
+++ b/release.esy.lock/opam/ppx_deriving_yojson.3.6.1/opam
@@ -4,7 +4,7 @@ authors: [ "whitequark <whitequark@whitequark.org>" ]
 license: "MIT"
 homepage: "https://github.com/ocaml-ppx/ppx_deriving_yojson"
 bug-reports: "https://github.com/ocaml-ppx/ppx_deriving_yojson/issues"
-dev-repo: "git://github.com/ocaml-ppx/ppx_deriving_yojson.git"
+dev-repo: "git+https://github.com/ocaml-ppx/ppx_deriving_yojson.git"
 tags: [ "syntax" "json" ]
 build: [
   ["dune" "subst"] {dev}
@@ -12,14 +12,12 @@ build: [
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
 depends: [
-  "ocaml" {>= "4.04.0"}
+  "ocaml" {>= "4.05.0"}
+  "dune" {>= "1.0"}
   "yojson" {>= "1.6.0" & < "2.0.0"}
   "result"
-  "ppx_deriving" {>= "4.5" & < "5.0"}
-  "ppx_tools"
-  "ppxfind" {build}
-  "dune" {>= "1.0"}
-  "cppo" {build}
+  "ppx_deriving" {>= "5.1"}
+  "ppxlib" {>= "0.14.0"}
   "ounit" {with-test & >= "2.0.0"}
 ]
 synopsis:
@@ -30,9 +28,10 @@ a JSON codec generator.
 """
 url {
   src:
-    "https://github.com/ocaml-ppx/ppx_deriving_yojson/archive/v3.5.3.tar.gz"
+    "https://github.com/ocaml-ppx/ppx_deriving_yojson/releases/download/v3.6.1/ppx_deriving_yojson-v3.6.1.tbz"
   checksum: [
-    "md5=e5185e4ac9d149a332566139df55d408"
-    "sha512=550fe8c400fa57f3f33f4cec509df061db0d62353e0d05ffb64e02aaef74324369840297507553d9b8a8cba81f980c210d23177bf184dbe58b952a7df4aa2176"
+    "sha256=712ee9207c70dd144e72cd689bee2d2beb120b804e77c74ec6f7b843a88944e6"
+    "sha512=d8c828902b8441f73e08fc03e2173ce81a09cccfe091471fbcffe098b2272739b98a05e8308016da3efeb3d4d1abd7d941bfaac42c85961ea40915ddce526577"
   ]
 }
+x-commit-hash: "d0abe462de8bab52d763eeafd751e8ea1ba211ac"
diff --git a/release.esy.lock/opam/ppx_tools.6.2/opam b/release.esy.lock/opam/ppx_tools.6.2/opam
deleted file mode 100644
index 9e8b874706..0000000000
--- a/release.esy.lock/opam/ppx_tools.6.2/opam
+++ /dev/null
@@ -1,21 +0,0 @@
-opam-version: "2.0"
-synopsis: "Tools for authors of ppx rewriters and other syntactic tools"
-maintainer: "Kate <kit.ty.kate@disroot.org>"
-authors: "Alain Frisch <alain.frisch@lexifi.com>"
-license: "MIT"
-tags: [ "syntax" ]
-homepage: "https://github.com/ocaml-ppx/ppx_tools"
-bug-reports: "https://github.com/ocaml-ppx/ppx_tools/issues"
-dev-repo: "git://github.com/ocaml-ppx/ppx_tools.git"
-build: ["dune" "build" "-p" name "-j" jobs]
-depends: [
-  "ocaml" {>= "4.08.0" & < "4.12.0"}
-  "dune" {>= "1.6"}
-]
-url {
-  src: "https://github.com/ocaml-ppx/ppx_tools/archive/6.2.tar.gz"
-  checksum: [
-    "md5=68b05e0794c475c384b9285d1156d1f3"
-    "sha512=fc3943c69901ef46843355c3482d5a1481d05ee94fb0a344ec04101059a02cbaa76fed5742cfae82730edf378f2e140d859a5cf590653f85359255d451f07dc8"
-  ]
-}
diff --git a/release.esy.lock/opam/ppxfind.1.4/opam b/release.esy.lock/opam/ppxfind.1.4/opam
deleted file mode 100644
index 57eefe4e65..0000000000
--- a/release.esy.lock/opam/ppxfind.1.4/opam
+++ /dev/null
@@ -1,41 +0,0 @@
-opam-version: "2.0"
-synopsis: "Tool combining ocamlfind and ppx"
-description: """
-Ppxfind is a small command line tool that among other things allows
-to use old style ppx rewriters with jbuilder.
-"""
-maintainer: ["Jérémie Dimino <jeremie@dimino.org>"]
-authors: ["Jérémie Dimino <jeremie@dimino.org>"]
-license: "BSD3"
-homepage: "https://github.com/jeremiedimino/ppxfind"
-doc: "https://jeremiedimino.github.io/ppxfind/"
-bug-reports: "https://github.com/jeremiedimino/ppxfind/issues"
-depends: [
-  "dune" {>= "2.0"}
-  "ocaml-migrate-parsetree" {>= "1.6.0" & < "2.0.0"}
-  "ocamlfind"
-  "ocaml" {>= "4.02.3"}
-]
-build: [
-  ["dune" "subst"] {pinned}
-  [
-    "dune"
-    "build"
-    "-p"
-    name
-    "-j"
-    jobs
-    "@install"
-    "@runtest" {with-test}
-    "@doc" {with-doc}
-  ]
-]
-dev-repo: "git+https://github.com/jeremiedimino/ppxfind.git"
-url {
-  src:
-    "https://github.com/jeremiedimino/ppxfind/releases/download/1.4/ppxfind-1.4.tbz"
-  checksum: [
-    "sha256=98291c69f04f7f7b7cdad1b5d786c70fc595559d4663cc04cb711ac132db4971"
-    "sha512=f80b0ee09fb536aa9f154da80d06a1b68ba3b10605fb7338bd6449beb5c8d00e983bf66b4a63e12659ae1410fea56d0a2c4cfd43584616438504628035bcb981"
-  ]
-}
diff --git a/release.esy.lock/opam/ppxlib.0.15.0/opam b/release.esy.lock/opam/ppxlib.0.15.0/opam
index 084b18884c..f32985ad85 100644
--- a/release.esy.lock/opam/ppxlib.0.15.0/opam
+++ b/release.esy.lock/opam/ppxlib.0.15.0/opam
@@ -14,7 +14,7 @@ run-test: [
   ["dune" "runtest" "-p" name "-j" jobs] { ocaml:version >= "4.10" }
 ]
 depends: [
-  "ocaml"                   {>= "4.04.1" & < "4.12"}
+  "ocaml"                   {>= "4.04.1"}
   "dune"                    {>= "1.11"}
   "ocaml-compiler-libs"     {>= "v0.11.0"}
   "ocaml-migrate-parsetree" {>= "1.5.0" & < "2.0.0"}
diff --git a/release.esy.lock/opam/reason.3.6.0/opam b/release.esy.lock/opam/reason.3.6.2/opam
similarity index 78%
rename from release.esy.lock/opam/reason.3.6.0/opam
rename to release.esy.lock/opam/reason.3.6.2/opam
index 3e9119724e..9408643bc9 100644
--- a/release.esy.lock/opam/reason.3.6.0/opam
+++ b/release.esy.lock/opam/reason.3.6.2/opam
@@ -9,17 +9,16 @@ dev-repo: "git://github.com/facebook/reason.git"
 tags: [ "syntax" ]
 build: [
   ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
 depends: [
-  "ocaml"         {>= "4.03" & < "4.11"}
+  "ocaml"         {>= "4.03" & < "4.12"}
   "dune"          {>= "1.4"}
   "ocamlfind"     {build}
   "menhir"        {>= "20170418"}
-  "merlin-extend" {>= "0.4"}
+  "merlin-extend" {>= "0.6"}
+  "ppx_derivers" {< "2.0"}
   "fix"
   "result"
-  "ocaml-migrate-parsetree" {< "2.0.0"}
 ]
 synopsis: "Reason: Syntax & Toolchain for OCaml"
 description: """
@@ -27,6 +26,6 @@ Reason gives OCaml a new syntax that is remniscient of languages like
 JavaScript. It's also the umbrella project for a set of tools for the OCaml &
 JavaScript ecosystem."""
 url {
-  src: "https://registry.npmjs.org/@esy-ocaml/reason/-/reason-3.6.0.tgz"
-  checksum: "md5=d4d729804bc509bca0ac6223e06f7314"
+  src: "https://registry.npmjs.org/@esy-ocaml/reason/-/reason-3.6.2.tgz"
+  checksum: "md5=d6de40f280f1c229f9cb26eb4015f1c5"
 }
diff --git a/release.esy.lock/opam/stdlib-shims.0.1.0/opam b/release.esy.lock/opam/stdlib-shims.0.1.0/opam
index 0d1079d893..c6f3529a33 100644
--- a/release.esy.lock/opam/stdlib-shims.0.1.0/opam
+++ b/release.esy.lock/opam/stdlib-shims.0.1.0/opam
@@ -8,9 +8,9 @@ bug-reports: "https://github.com/ocaml/stdlib-shims/issues"
 tags: ["stdlib" "compatibility" "org:ocaml"]
 license: ["typeof OCaml system"]
 depends: [
-  "ocaml" {>="4.02.3"}
+  "ocaml" {>= "4.02.3"}
   "dune"
- ("dune" {>= "2.7.0"} | "dune" & "ocaml" {<"4.12.0~~"})
+ ("dune" {>= "2.8.0"} | "ocaml" {< "4.12.0~~"})
 ]
 build: [ "dune" "build" "-p" name "-j" jobs ]
 synopsis: "Backport some of the new stdlib features to older compiler"
diff --git a/test.esy.lock/index.json b/test.esy.lock/index.json
index 69225b3589..f93ece4e23 100644
--- a/test.esy.lock/index.json
+++ b/test.esy.lock/index.json
@@ -1,5 +1,5 @@
 {
-  "checksum": "35da6de314f952ff6a0bdc5586497f95",
+  "checksum": "0f85f54ca31212b8295cbe8140d96eac",
   "root": "Oni2@link-dev:./package.json",
   "node": {
     "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": {
@@ -118,7 +118,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "revery@github:revery-ui/revery#4d2dae6@d41d8cd9",
+        "revery@github:revery-ui/revery#19467ad@d41d8cd9",
         "isolinear@github:revery-ui/isolinear#53fc4eb@d41d8cd9",
         "@revery/timber@2.0.0@d41d8cd9",
         "@revery/esy-libvterm@1.0.3@d41d8cd9",
@@ -126,13 +126,13 @@
       ],
       "devDependencies": []
     },
-    "revery@github:revery-ui/revery#4d2dae6@d41d8cd9": {
-      "id": "revery@github:revery-ui/revery#4d2dae6@d41d8cd9",
+    "revery@github:revery-ui/revery#19467ad@d41d8cd9": {
+      "id": "revery@github:revery-ui/revery#19467ad@d41d8cd9",
       "name": "revery",
-      "version": "github:revery-ui/revery#4d2dae6",
+      "version": "github:revery-ui/revery#19467ad",
       "source": {
         "type": "install",
-        "source": [ "github:revery-ui/revery#4d2dae6" ]
+        "source": [ "github:revery-ui/revery#19467ad" ]
       },
       "overrides": [],
       "dependencies": [
@@ -147,7 +147,7 @@
         "@revery/esy-harfbuzz@2.6.8001@d41d8cd9",
         "@opam/uutf@opam:1.0.2@4440868f", "@opam/uucp@opam:13.0.0@e9b515e0",
         "@opam/ppx_optcomp@opam:v0.14.0@47cec200",
-        "@opam/ppx_deriving@opam:4.5@d89f2934",
+        "@opam/ppx_deriving@opam:5.1@3037236f",
         "@opam/omd@github:ocaml/omd:omd.opam#1535e3c@d41d8cd9",
         "@opam/markup@opam:0.8.2@87975241",
         "@opam/lwt_ppx@opam:2.0.1@e6a764a0", "@opam/lwt@opam:4.5.0@542100aa",
@@ -161,19 +161,19 @@
       ],
       "devDependencies": []
     },
-    "resolve@1.18.1@d41d8cd9": {
-      "id": "resolve@1.18.1@d41d8cd9",
+    "resolve@1.19.0@d41d8cd9": {
+      "id": "resolve@1.19.0@d41d8cd9",
       "name": "resolve",
-      "version": "1.18.1",
+      "version": "1.19.0",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://registry.npmjs.org/resolve/-/resolve-1.18.1.tgz#sha1:018fcb2c5b207d2a6424aee361c5a266da8f4130"
+          "archive:https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz#sha1:1af5bf630409734a067cae29318aac7fa29a267c"
         ]
       },
       "overrides": [],
       "dependencies": [
-        "path-parse@1.0.6@d41d8cd9", "is-core-module@2.0.0@d41d8cd9"
+        "path-parse@1.0.6@d41d8cd9", "is-core-module@2.2.0@d41d8cd9"
       ],
       "devDependencies": []
     },
@@ -246,7 +246,7 @@
         ]
       },
       "overrides": [],
-      "dependencies": [ "resolve@1.18.1@d41d8cd9" ],
+      "dependencies": [ "resolve@1.19.0@d41d8cd9" ],
       "devDependencies": []
     },
     "rebez@github:jchavarri/rebez#03fa3b7@d41d8cd9": {
@@ -293,7 +293,7 @@
       "dependencies": [
         "refmterr@3.3.2@d41d8cd9", "ocaml@4.10.0@d41d8cd9",
         "esy-fzy@github:CrossR/esy-fzy#8176cee@d41d8cd9",
-        "@opam/reason@opam:3.6.0@58adb39a",
+        "@opam/reason@opam:3.6.2@1a34f8a4",
         "@opam/dune-configurator@opam:2.5.1@aeb9d8d5",
         "@opam/dune@opam:2.5.0@e0bac278"
       ],
@@ -326,7 +326,7 @@
       "overrides": [],
       "dependencies": [
         "xmldom@0.1.31@d41d8cd9", "xmlbuilder@9.0.7@d41d8cd9",
-        "base64-js@1.3.1@d41d8cd9"
+        "base64-js@1.5.1@d41d8cd9"
       ],
       "devDependencies": []
     },
@@ -471,14 +471,14 @@
       ],
       "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ]
     },
-    "is-core-module@2.0.0@d41d8cd9": {
-      "id": "is-core-module@2.0.0@d41d8cd9",
+    "is-core-module@2.2.0@d41d8cd9": {
+      "id": "is-core-module@2.2.0@d41d8cd9",
       "name": "is-core-module",
-      "version": "2.0.0",
+      "version": "2.2.0",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://registry.npmjs.org/is-core-module/-/is-core-module-2.0.0.tgz#sha1:58531b70aed1db7c0e8d4eb1a0a2d1ddd64bd12d"
+          "archive:https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz#sha1:97037ef3d52224d85163f5597b2b63d9afed981a"
         ]
       },
       "overrides": [],
@@ -919,14 +919,14 @@
       ],
       "devDependencies": []
     },
-    "base64-js@1.3.1@d41d8cd9": {
-      "id": "base64-js@1.3.1@d41d8cd9",
+    "base64-js@1.5.1@d41d8cd9": {
+      "id": "base64-js@1.5.1@d41d8cd9",
       "name": "base64-js",
-      "version": "1.3.1",
+      "version": "1.5.1",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz#sha1:58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"
+          "archive:https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz#sha1:1b1b440160a5bf7ad40b650f095963481903930a"
         ]
       },
       "overrides": [],
@@ -1009,7 +1009,7 @@
       "overrides": [ "test.json" ],
       "dependencies": [
         "revery-terminal@github:revery-ui/revery-terminal#a9cb168@d41d8cd9",
-        "revery@github:revery-ui/revery#4d2dae6@d41d8cd9",
+        "revery@github:revery-ui/revery#19467ad@d41d8cd9",
         "rench@github:bryphe/rench#a976fe5@d41d8cd9",
         "refmterr@3.3.2@d41d8cd9",
         "reason-native-crash-utils@github:onivim/reason-native-crash-utils#38c8f00@d41d8cd9",
@@ -1027,13 +1027,13 @@
         "@reason-native-web/esy-openssl@1.1.1007@d41d8cd9",
         "@opam/yojson@github:onivim/yojson:yojson.opam#f480aef@d41d8cd9",
         "@opam/uutf@opam:1.0.2@4440868f", "@opam/uucp@opam:13.0.0@e9b515e0",
-        "@opam/reason@opam:3.6.0@58adb39a", "@opam/re@opam:1.9.0@d4d5e13d",
-        "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "@opam/reason@opam:3.6.2@1a34f8a4", "@opam/re@opam:1.9.0@d4d5e13d",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/ppx_optcomp@opam:v0.14.0@47cec200",
         "@opam/ppx_let@opam:v0.14.0@eb9b93e0",
         "@opam/ppx_inline_test@opam:v0.14.1@2e4fdd8d",
-        "@opam/ppx_deriving_yojson@opam:3.5.3@253e094d",
-        "@opam/ppx_deriving@opam:4.5@d89f2934",
+        "@opam/ppx_deriving_yojson@opam:3.6.1@faf11a7c",
+        "@opam/ppx_deriving@opam:5.1@3037236f",
         "@opam/ocamlformat@opam:0.15.0@8e036963",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
         "@opam/markup@opam:0.8.2@87975241", "@opam/lwt@opam:4.5.0@542100aa",
@@ -1501,8 +1501,8 @@
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
       ]
     },
-    "@opam/stdlib-shims@opam:0.1.0@8c116481": {
-      "id": "@opam/stdlib-shims@opam:0.1.0@8c116481",
+    "@opam/stdlib-shims@opam:0.1.0@148f22ac": {
+      "id": "@opam/stdlib-shims@opam:0.1.0@148f22ac",
       "name": "@opam/stdlib-shims",
       "version": "opam:0.1.0",
       "source": {
@@ -1650,38 +1650,38 @@
         "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
-    "@opam/reason@opam:3.6.0@58adb39a": {
-      "id": "@opam/reason@opam:3.6.0@58adb39a",
+    "@opam/reason@opam:3.6.2@1a34f8a4": {
+      "id": "@opam/reason@opam:3.6.2@1a34f8a4",
       "name": "@opam/reason",
-      "version": "opam:3.6.0",
+      "version": "opam:3.6.2",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/d4/d4d729804bc509bca0ac6223e06f7314#md5:d4d729804bc509bca0ac6223e06f7314",
-          "archive:https://registry.npmjs.org/@esy-ocaml/reason/-/reason-3.6.0.tgz#md5:d4d729804bc509bca0ac6223e06f7314"
+          "archive:https://opam.ocaml.org/cache/md5/d6/d6de40f280f1c229f9cb26eb4015f1c5#md5:d6de40f280f1c229f9cb26eb4015f1c5",
+          "archive:https://registry.npmjs.org/@esy-ocaml/reason/-/reason-3.6.2.tgz#md5:d6de40f280f1c229f9cb26eb4015f1c5"
         ],
         "opam": {
           "name": "reason",
-          "version": "3.6.0",
-          "path": "test.esy.lock/opam/reason.3.6.0"
+          "version": "3.6.2",
+          "path": "test.esy.lock/opam/reason.3.6.2"
         }
       },
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82",
+        "@opam/ppx_derivers@opam:1.2.1@ecf0aa45",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
-        "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173",
         "@opam/merlin-extend@opam:0.6@404f814c",
-        "@opam/menhir@opam:20200624@8629ff13",
-        "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.5.0@e0bac278",
+        "@opam/menhir@opam:20201201@a7ee0741",
+        "@opam/fix@opam:20201120@5c318621", "@opam/dune@opam:2.5.0@e0bac278",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82",
-        "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173",
+        "@opam/ppx_derivers@opam:1.2.1@ecf0aa45",
         "@opam/merlin-extend@opam:0.6@404f814c",
-        "@opam/menhir@opam:20200624@8629ff13",
-        "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.5.0@e0bac278"
+        "@opam/menhir@opam:20201201@a7ee0741",
+        "@opam/fix@opam:20201120@5c318621", "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
     "@opam/react@opam:1.2.1@0e11855f": {
@@ -1818,8 +1818,8 @@
         "@opam/base-bytes@opam:base@19d0c2ff"
       ]
     },
-    "@opam/ppxlib@opam:0.15.0@a90ae385": {
-      "id": "@opam/ppxlib@opam:0.15.0@a90ae385",
+    "@opam/ppxlib@opam:0.15.0@6a9d8126": {
+      "id": "@opam/ppxlib@opam:0.15.0@6a9d8126",
       "name": "@opam/ppxlib",
       "version": "opam:0.15.0",
       "source": {
@@ -1836,7 +1836,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/stdlib-shims@opam:0.1.0@8c116481",
+        "ocaml@4.10.0@d41d8cd9", "@opam/stdlib-shims@opam:0.1.0@148f22ac",
         "@opam/sexplib0@opam:v0.14.0@ddeb6438",
         "@opam/ppx_derivers@opam:1.2.1@ecf0aa45",
         "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173",
@@ -1844,7 +1844,7 @@
         "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/stdlib-shims@opam:0.1.0@8c116481",
+        "ocaml@4.10.0@d41d8cd9", "@opam/stdlib-shims@opam:0.1.0@148f22ac",
         "@opam/sexplib0@opam:v0.14.0@ddeb6438",
         "@opam/ppx_derivers@opam:1.2.1@ecf0aa45",
         "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173",
@@ -1852,34 +1852,6 @@
         "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
-    "@opam/ppxfind@opam:1.4@d75848d2": {
-      "id": "@opam/ppxfind@opam:1.4@d75848d2",
-      "name": "@opam/ppxfind",
-      "version": "opam:1.4",
-      "source": {
-        "type": "install",
-        "source": [
-          "archive:https://opam.ocaml.org/cache/sha256/98/98291c69f04f7f7b7cdad1b5d786c70fc595559d4663cc04cb711ac132db4971#sha256:98291c69f04f7f7b7cdad1b5d786c70fc595559d4663cc04cb711ac132db4971",
-          "archive:https://github.com/jeremiedimino/ppxfind/releases/download/1.4/ppxfind-1.4.tbz#sha256:98291c69f04f7f7b7cdad1b5d786c70fc595559d4663cc04cb711ac132db4971"
-        ],
-        "opam": {
-          "name": "ppxfind",
-          "version": "1.4",
-          "path": "test.esy.lock/opam/ppxfind.1.4"
-        }
-      },
-      "overrides": [],
-      "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
-        "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173",
-        "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/substs@0.0.1@d41d8cd9"
-      ],
-      "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
-        "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173",
-        "@opam/dune@opam:2.5.0@e0bac278"
-      ]
-    },
     "@opam/ppx_yojson_conv_lib@opam:v0.14.0@116b53d6": {
       "id": "@opam/ppx_yojson_conv_lib@opam:v0.14.0@116b53d6",
       "name": "@opam/ppx_yojson_conv_lib",
@@ -1936,31 +1908,6 @@
         "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
-    "@opam/ppx_tools@opam:6.2@62a3aff2": {
-      "id": "@opam/ppx_tools@opam:6.2@62a3aff2",
-      "name": "@opam/ppx_tools",
-      "version": "opam:6.2",
-      "source": {
-        "type": "install",
-        "source": [
-          "archive:https://opam.ocaml.org/cache/md5/68/68b05e0794c475c384b9285d1156d1f3#md5:68b05e0794c475c384b9285d1156d1f3",
-          "archive:https://github.com/ocaml-ppx/ppx_tools/archive/6.2.tar.gz#md5:68b05e0794c475c384b9285d1156d1f3"
-        ],
-        "opam": {
-          "name": "ppx_tools",
-          "version": "6.2",
-          "path": "test.esy.lock/opam/ppx_tools.6.2"
-        }
-      },
-      "overrides": [],
-      "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@e0bac278",
-        "@esy-ocaml/substs@0.0.1@d41d8cd9"
-      ],
-      "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@e0bac278"
-      ]
-    },
     "@opam/ppx_sexp_conv@opam:v0.14.1@5fc4da3c": {
       "id": "@opam/ppx_sexp_conv@opam:v0.14.1@5fc4da3c",
       "name": "@opam/ppx_sexp_conv",
@@ -1980,13 +1927,13 @@
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/sexplib0@opam:v0.14.0@ddeb6438",
-        "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/sexplib0@opam:v0.14.0@ddeb6438",
-        "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
       ]
     },
@@ -2009,13 +1956,13 @@
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/stdio@opam:v0.14.0@a624e254",
-        "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/stdio@opam:v0.14.0@a624e254",
-        "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
       ]
     },
@@ -2037,12 +1984,12 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
       ]
     },
@@ -2064,13 +2011,13 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/octavius@opam:1.2.2@b328d1f1",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/octavius@opam:1.2.2@b328d1f1",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
       ]
@@ -2094,13 +2041,13 @@
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/time_now@opam:v0.14.0@5e4046b3",
-        "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/time_now@opam:v0.14.0@5e4046b3",
-        "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
       ]
     },
@@ -2122,12 +2069,12 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
       ]
     },
@@ -2149,14 +2096,14 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/ppx_sexp_conv@opam:v0.14.1@5fc4da3c",
         "@opam/ppx_compare@opam:v0.14.0@615de7a6",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/ppx_sexp_conv@opam:v0.14.1@5fc4da3c",
         "@opam/ppx_compare@opam:v0.14.0@615de7a6",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
@@ -2180,80 +2127,80 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
       ]
     },
-    "@opam/ppx_deriving_yojson@opam:3.5.3@253e094d": {
-      "id": "@opam/ppx_deriving_yojson@opam:3.5.3@253e094d",
+    "@opam/ppx_deriving_yojson@opam:3.6.1@faf11a7c": {
+      "id": "@opam/ppx_deriving_yojson@opam:3.6.1@faf11a7c",
       "name": "@opam/ppx_deriving_yojson",
-      "version": "opam:3.5.3",
+      "version": "opam:3.6.1",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/e5/e5185e4ac9d149a332566139df55d408#md5:e5185e4ac9d149a332566139df55d408",
-          "archive:https://github.com/ocaml-ppx/ppx_deriving_yojson/archive/v3.5.3.tar.gz#md5:e5185e4ac9d149a332566139df55d408"
+          "archive:https://opam.ocaml.org/cache/sha256/71/712ee9207c70dd144e72cd689bee2d2beb120b804e77c74ec6f7b843a88944e6#sha256:712ee9207c70dd144e72cd689bee2d2beb120b804e77c74ec6f7b843a88944e6",
+          "archive:https://github.com/ocaml-ppx/ppx_deriving_yojson/releases/download/v3.6.1/ppx_deriving_yojson-v3.6.1.tbz#sha256:712ee9207c70dd144e72cd689bee2d2beb120b804e77c74ec6f7b843a88944e6"
         ],
         "opam": {
           "name": "ppx_deriving_yojson",
-          "version": "3.5.3",
-          "path": "test.esy.lock/opam/ppx_deriving_yojson.3.5.3"
+          "version": "3.6.1",
+          "path": "test.esy.lock/opam/ppx_deriving_yojson.3.6.1"
         }
       },
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9",
         "@opam/yojson@github:onivim/yojson:yojson.opam#f480aef@d41d8cd9",
-        "@opam/result@opam:1.5@6b753c82", "@opam/ppxfind@opam:1.4@d75848d2",
-        "@opam/ppx_tools@opam:6.2@62a3aff2",
-        "@opam/ppx_deriving@opam:4.5@d89f2934",
-        "@opam/dune@opam:2.5.0@e0bac278", "@opam/cppo@opam:1.6.6@f4f83858",
-        "@esy-ocaml/substs@0.0.1@d41d8cd9"
+        "@opam/result@opam:1.5@6b753c82",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
+        "@opam/ppx_deriving@opam:5.1@3037236f",
+        "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9",
         "@opam/yojson@github:onivim/yojson:yojson.opam#f480aef@d41d8cd9",
         "@opam/result@opam:1.5@6b753c82",
-        "@opam/ppx_tools@opam:6.2@62a3aff2",
-        "@opam/ppx_deriving@opam:4.5@d89f2934",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
+        "@opam/ppx_deriving@opam:5.1@3037236f",
         "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
-    "@opam/ppx_deriving@opam:4.5@d89f2934": {
-      "id": "@opam/ppx_deriving@opam:4.5@d89f2934",
+    "@opam/ppx_deriving@opam:5.1@3037236f": {
+      "id": "@opam/ppx_deriving@opam:5.1@3037236f",
       "name": "@opam/ppx_deriving",
-      "version": "opam:4.5",
+      "version": "opam:5.1",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/sha512/f7/f79153c5231ba1e03a3491fde95ca82ecb62fe05b60a649a374d2fbc5ea5dd9242126de7dfbe917c22fd7077c026c940e18c6b36c5ce0ec4bb6e07f11d2b710b#sha512:f79153c5231ba1e03a3491fde95ca82ecb62fe05b60a649a374d2fbc5ea5dd9242126de7dfbe917c22fd7077c026c940e18c6b36c5ce0ec4bb6e07f11d2b710b",
-          "archive:https://github.com/ocaml-ppx/ppx_deriving/archive/v4.5.tar.gz#sha512:f79153c5231ba1e03a3491fde95ca82ecb62fe05b60a649a374d2fbc5ea5dd9242126de7dfbe917c22fd7077c026c940e18c6b36c5ce0ec4bb6e07f11d2b710b"
+          "archive:https://opam.ocaml.org/cache/sha256/b0/b04f3b22b754e65af50812730695863192ae410e802e074b55ebbb8c4f73c4c4#sha256:b04f3b22b754e65af50812730695863192ae410e802e074b55ebbb8c4f73c4c4",
+          "archive:https://github.com/ocaml-ppx/ppx_deriving/releases/download/v5.1/ppx_deriving-v5.1.tbz#sha256:b04f3b22b754e65af50812730695863192ae410e802e074b55ebbb8c4f73c4c4"
         ],
         "opam": {
           "name": "ppx_deriving",
-          "version": "4.5",
-          "path": "test.esy.lock/opam/ppx_deriving.4.5"
+          "version": "5.1",
+          "path": "test.esy.lock/opam/ppx_deriving.5.1"
         }
       },
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82",
-        "@opam/ppxfind@opam:1.4@d75848d2",
-        "@opam/ppx_tools@opam:6.2@62a3aff2",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/ppx_derivers@opam:1.2.1@ecf0aa45",
+        "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/cppo@opam:1.6.6@f4f83858",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/result@opam:1.5@6b753c82",
-        "@opam/ppx_tools@opam:6.2@62a3aff2",
+        "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/ppx_derivers@opam:1.2.1@ecf0aa45",
+        "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173",
         "@opam/dune@opam:2.5.0@e0bac278"
       ]
@@ -2301,12 +2248,12 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
       ]
     },
@@ -2328,12 +2275,12 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@opam/base@opam:v0.14.0@8bc55fce"
       ]
     },
@@ -2355,7 +2302,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/ppx_sexp_conv@opam:v0.14.1@5fc4da3c",
         "@opam/ppx_js_style@opam:v0.14.0@10b020a8",
         "@opam/ppx_hash@opam:v0.14.0@8e9618e4",
@@ -2365,7 +2312,7 @@
         "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/ppx_sexp_conv@opam:v0.14.1@5fc4da3c",
         "@opam/ppx_js_style@opam:v0.14.0@10b020a8",
         "@opam/ppx_hash@opam:v0.14.0@8e9618e4",
@@ -2393,7 +2340,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/ppx_sexp_conv@opam:v0.14.1@5fc4da3c",
         "@opam/ppx_here@opam:v0.14.0@5ccc1c01",
         "@opam/ppx_compare@opam:v0.14.0@615de7a6",
@@ -2402,7 +2349,7 @@
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/ppx_sexp_conv@opam:v0.14.1@5fc4da3c",
         "@opam/ppx_here@opam:v0.14.0@5ccc1c01",
         "@opam/ppx_compare@opam:v0.14.0@615de7a6",
@@ -2431,20 +2378,20 @@
         "@opam/base-bigarray@opam:base@b03491b0"
       ]
     },
-    "@opam/odoc@opam:1.5.1@52a58c0b": {
-      "id": "@opam/odoc@opam:1.5.1@52a58c0b",
+    "@opam/odoc@opam:1.5.2@236518eb": {
+      "id": "@opam/odoc@opam:1.5.2@236518eb",
       "name": "@opam/odoc",
-      "version": "opam:1.5.1",
+      "version": "opam:1.5.2",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/sha256/ea/ea14721344e2aab6b63f2884782d37e94a1ed8ab91147a1c08a29710d99d354f#sha256:ea14721344e2aab6b63f2884782d37e94a1ed8ab91147a1c08a29710d99d354f",
-          "archive:https://github.com/ocaml/odoc/releases/download/1.5.1/odoc-1.5.1.tbz#sha256:ea14721344e2aab6b63f2884782d37e94a1ed8ab91147a1c08a29710d99d354f"
+          "archive:https://opam.ocaml.org/cache/sha256/d2/d24463f2660bc28c72cda001478360158e953721c9e23fb361ec4783113c4871#sha256:d24463f2660bc28c72cda001478360158e953721c9e23fb361ec4783113c4871",
+          "archive:https://github.com/ocaml/odoc/releases/download/1.5.2/odoc-1.5.2.tbz#sha256:d24463f2660bc28c72cda001478360158e953721c9e23fb361ec4783113c4871"
         ],
         "opam": {
           "name": "odoc",
-          "version": "1.5.1",
-          "path": "test.esy.lock/opam/odoc.1.5.1"
+          "version": "1.5.2",
+          "path": "test.esy.lock/opam/odoc.1.5.2"
         }
       },
       "overrides": [],
@@ -2538,11 +2485,11 @@
         "ocaml@4.10.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f",
         "@opam/uuseg@opam:13.0.0@f60712a7",
         "@opam/stdio@opam:v0.14.0@a624e254", "@opam/re@opam:1.9.0@d4d5e13d",
-        "@opam/odoc@opam:1.5.1@52a58c0b",
+        "@opam/odoc@opam:1.5.2@236518eb",
         "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173",
-        "@opam/menhir@opam:20200624@8629ff13",
+        "@opam/menhir@opam:20201201@a7ee0741",
         "@opam/fpath@opam:0.7.3@674d8125",
-        "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.5.0@e0bac278",
+        "@opam/fix@opam:20201120@5c318621", "@opam/dune@opam:2.5.0@e0bac278",
         "@opam/cmdliner@opam:1.0.4@93208aac",
         "@opam/base-unix@opam:base@87d0b2eb",
         "@opam/base@opam:v0.14.0@8bc55fce",
@@ -2552,11 +2499,11 @@
         "ocaml@4.10.0@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f",
         "@opam/uuseg@opam:13.0.0@f60712a7",
         "@opam/stdio@opam:v0.14.0@a624e254", "@opam/re@opam:1.9.0@d4d5e13d",
-        "@opam/odoc@opam:1.5.1@52a58c0b",
+        "@opam/odoc@opam:1.5.2@236518eb",
         "@opam/ocaml-migrate-parsetree@opam:1.8.0@305b6173",
-        "@opam/menhir@opam:20200624@8629ff13",
+        "@opam/menhir@opam:20201201@a7ee0741",
         "@opam/fpath@opam:0.7.3@674d8125",
-        "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.5.0@e0bac278",
+        "@opam/fix@opam:20201120@5c318621", "@opam/dune@opam:2.5.0@e0bac278",
         "@opam/cmdliner@opam:1.0.4@93208aac",
         "@opam/base-unix@opam:base@87d0b2eb",
         "@opam/base@opam:v0.14.0@8bc55fce"
@@ -2684,20 +2631,20 @@
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9",
         "@opam/yojson@github:onivim/yojson:yojson.opam#f480aef@d41d8cd9",
-        "@opam/stdlib-shims@opam:0.1.0@8c116481",
+        "@opam/stdlib-shims@opam:0.1.0@148f22ac",
         "@opam/ppx_yojson_conv_lib@opam:v0.14.0@116b53d6",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
-        "@opam/menhir@opam:20200624@8629ff13",
+        "@opam/menhir@opam:20201201@a7ee0741",
         "@opam/dune-build-info@opam:2.6.2@03ffe168",
         "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9",
         "@opam/yojson@github:onivim/yojson:yojson.opam#f480aef@d41d8cd9",
-        "@opam/stdlib-shims@opam:0.1.0@8c116481",
+        "@opam/stdlib-shims@opam:0.1.0@148f22ac",
         "@opam/ppx_yojson_conv_lib@opam:v0.14.0@116b53d6",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
-        "@opam/menhir@opam:20200624@8629ff13",
+        "@opam/menhir@opam:20201201@a7ee0741",
         "@opam/dune-build-info@opam:2.6.2@03ffe168",
         "@opam/dune@opam:2.5.0@e0bac278"
       ]
@@ -2831,20 +2778,20 @@
         "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
-    "@opam/menhirSdk@opam:20200624@2a05b5a7": {
-      "id": "@opam/menhirSdk@opam:20200624@2a05b5a7",
+    "@opam/menhirSdk@opam:20201201@4b828f46": {
+      "id": "@opam/menhirSdk@opam:20201201@4b828f46",
       "name": "@opam/menhirSdk",
-      "version": "opam:20200624",
+      "version": "opam:20201201",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/c3/c37ff53a4a69059e1f8223067b91bb8b#md5:c37ff53a4a69059e1f8223067b91bb8b",
-          "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz#md5:c37ff53a4a69059e1f8223067b91bb8b"
+          "archive:https://opam.ocaml.org/cache/md5/ca/ca1047954bfe8c857425dc67eee46272#md5:ca1047954bfe8c857425dc67eee46272",
+          "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20201201/archive.tar.gz#md5:ca1047954bfe8c857425dc67eee46272"
         ],
         "opam": {
           "name": "menhirSdk",
-          "version": "20200624",
-          "path": "test.esy.lock/opam/menhirSdk.20200624"
+          "version": "20201201",
+          "path": "test.esy.lock/opam/menhirSdk.20201201"
         }
       },
       "overrides": [],
@@ -2856,20 +2803,20 @@
         "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
-    "@opam/menhirLib@opam:20200624@8bdd2b0e": {
-      "id": "@opam/menhirLib@opam:20200624@8bdd2b0e",
+    "@opam/menhirLib@opam:20201201@901a3013": {
+      "id": "@opam/menhirLib@opam:20201201@901a3013",
       "name": "@opam/menhirLib",
-      "version": "opam:20200624",
+      "version": "opam:20201201",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/c3/c37ff53a4a69059e1f8223067b91bb8b#md5:c37ff53a4a69059e1f8223067b91bb8b",
-          "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz#md5:c37ff53a4a69059e1f8223067b91bb8b"
+          "archive:https://opam.ocaml.org/cache/md5/ca/ca1047954bfe8c857425dc67eee46272#md5:ca1047954bfe8c857425dc67eee46272",
+          "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20201201/archive.tar.gz#md5:ca1047954bfe8c857425dc67eee46272"
         ],
         "opam": {
           "name": "menhirLib",
-          "version": "20200624",
-          "path": "test.esy.lock/opam/menhirLib.20200624"
+          "version": "20201201",
+          "path": "test.esy.lock/opam/menhirLib.20201201"
         }
       },
       "overrides": [],
@@ -2881,31 +2828,31 @@
         "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
-    "@opam/menhir@opam:20200624@8629ff13": {
-      "id": "@opam/menhir@opam:20200624@8629ff13",
+    "@opam/menhir@opam:20201201@a7ee0741": {
+      "id": "@opam/menhir@opam:20201201@a7ee0741",
       "name": "@opam/menhir",
-      "version": "opam:20200624",
+      "version": "opam:20201201",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/c3/c37ff53a4a69059e1f8223067b91bb8b#md5:c37ff53a4a69059e1f8223067b91bb8b",
-          "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz#md5:c37ff53a4a69059e1f8223067b91bb8b"
+          "archive:https://opam.ocaml.org/cache/md5/ca/ca1047954bfe8c857425dc67eee46272#md5:ca1047954bfe8c857425dc67eee46272",
+          "archive:https://gitlab.inria.fr/fpottier/menhir/repository/20201201/archive.tar.gz#md5:ca1047954bfe8c857425dc67eee46272"
         ],
         "opam": {
           "name": "menhir",
-          "version": "20200624",
-          "path": "test.esy.lock/opam/menhir.20200624"
+          "version": "20201201",
+          "path": "test.esy.lock/opam/menhir.20201201"
         }
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200624@2a05b5a7",
-        "@opam/menhirLib@opam:20200624@8bdd2b0e",
+        "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20201201@4b828f46",
+        "@opam/menhirLib@opam:20201201@901a3013",
         "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20200624@2a05b5a7",
-        "@opam/menhirLib@opam:20200624@8bdd2b0e",
+        "ocaml@4.10.0@d41d8cd9", "@opam/menhirSdk@opam:20201201@4b828f46",
+        "@opam/menhirLib@opam:20201201@901a3013",
         "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
@@ -3278,12 +3225,12 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.0@58adb39a",
+        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.2@1a34f8a4",
         "@opam/fp@github:bryphe/reason-native:fp.opam#5a7a756@d41d8cd9",
         "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.0@58adb39a",
+        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.2@1a34f8a4",
         "@opam/fp@github:bryphe/reason-native:fp.opam#5a7a756@d41d8cd9",
         "@opam/dune@opam:2.5.0@e0bac278"
       ]
@@ -3326,11 +3273,11 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.0@58adb39a",
+        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.2@1a34f8a4",
         "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.0@58adb39a",
+        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.2@1a34f8a4",
         "@opam/dune@opam:2.5.0@e0bac278"
       ]
     },
@@ -3353,7 +3300,7 @@
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/topkg@opam:1.0.3@e4e10f1c",
-        "@opam/stdlib-shims@opam:0.1.0@8c116481",
+        "@opam/stdlib-shims@opam:0.1.0@148f22ac",
         "@opam/seq@opam:base@d8d7de1d",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/ocamlbuild@opam:0.14.0@6ac75d03",
@@ -3362,24 +3309,24 @@
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/stdlib-shims@opam:0.1.0@8c116481",
+        "ocaml@4.10.0@d41d8cd9", "@opam/stdlib-shims@opam:0.1.0@148f22ac",
         "@opam/seq@opam:base@d8d7de1d"
       ]
     },
-    "@opam/fix@opam:20200131@0ecd2f01": {
-      "id": "@opam/fix@opam:20200131@0ecd2f01",
+    "@opam/fix@opam:20201120@5c318621": {
+      "id": "@opam/fix@opam:20201120@5c318621",
       "name": "@opam/fix",
-      "version": "opam:20200131",
+      "version": "opam:20201120",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/md5/99/991ff031666c662eaab638d2e0f4ac1d#md5:991ff031666c662eaab638d2e0f4ac1d",
-          "archive:https://gitlab.inria.fr/fpottier/fix/repository/20200131/archive.tar.gz#md5:991ff031666c662eaab638d2e0f4ac1d"
+          "archive:https://opam.ocaml.org/cache/md5/7e/7eb570b759635fe66f3556d2b1cc88e3#md5:7eb570b759635fe66f3556d2b1cc88e3",
+          "archive:https://gitlab.inria.fr/fpottier/fix/repository/20201120/archive.tar.gz#md5:7eb570b759635fe66f3556d2b1cc88e3"
         ],
         "opam": {
           "name": "fix",
-          "version": "20200131",
-          "path": "test.esy.lock/opam/fix.20200131"
+          "version": "20201120",
+          "path": "test.esy.lock/opam/fix.20201120"
         }
       },
       "overrides": [],
@@ -3526,12 +3473,12 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.0@58adb39a",
+        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.2@1a34f8a4",
         "@opam/fp@github:bryphe/reason-native:fp.opam#5a7a756@d41d8cd9",
         "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.0@58adb39a",
+        "ocaml@4.10.0@d41d8cd9", "@opam/reason@opam:3.6.2@1a34f8a4",
         "@opam/fp@github:bryphe/reason-native:fp.opam#5a7a756@d41d8cd9",
         "@opam/dune@opam:2.5.0@e0bac278"
       ]
@@ -3557,30 +3504,30 @@
         "ocaml@4.10.0@d41d8cd9",
         "@opam/yojson@github:onivim/yojson:yojson.opam#f480aef@d41d8cd9",
         "@opam/dune@opam:2.5.0@e0bac278",
-        "@opam/decoders@opam:0.4.0@b66e1fb4",
+        "@opam/decoders@opam:0.5.0@9df01185",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9",
         "@opam/yojson@github:onivim/yojson:yojson.opam#f480aef@d41d8cd9",
         "@opam/dune@opam:2.5.0@e0bac278",
-        "@opam/decoders@opam:0.4.0@b66e1fb4"
+        "@opam/decoders@opam:0.5.0@9df01185"
       ]
     },
-    "@opam/decoders@opam:0.4.0@b66e1fb4": {
-      "id": "@opam/decoders@opam:0.4.0@b66e1fb4",
+    "@opam/decoders@opam:0.5.0@9df01185": {
+      "id": "@opam/decoders@opam:0.5.0@9df01185",
       "name": "@opam/decoders",
-      "version": "opam:0.4.0",
+      "version": "opam:0.5.0",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/sha256/18/18ebbd98901dff67c9944d465ed508df018c8ee8e13bfe037d5ad780584eebf7#sha256:18ebbd98901dff67c9944d465ed508df018c8ee8e13bfe037d5ad780584eebf7",
-          "archive:https://github.com/mattjbray/ocaml-decoders/releases/download/v0.4.0/decoders-v0.4.0.tbz#sha256:18ebbd98901dff67c9944d465ed508df018c8ee8e13bfe037d5ad780584eebf7"
+          "archive:https://opam.ocaml.org/cache/sha256/fc/fc0b672a2ebcb1cfb7575384c5033b14985b26fe90ab517749ba77ed7fc0f11a#sha256:fc0b672a2ebcb1cfb7575384c5033b14985b26fe90ab517749ba77ed7fc0f11a",
+          "archive:https://github.com/mattjbray/ocaml-decoders/releases/download/v0.5.0/decoders-v0.5.0.tbz#sha256:fc0b672a2ebcb1cfb7575384c5033b14985b26fe90ab517749ba77ed7fc0f11a"
         ],
         "opam": {
           "name": "decoders",
-          "version": "0.4.0",
-          "path": "test.esy.lock/opam/decoders.0.4.0"
+          "version": "0.5.0",
+          "path": "test.esy.lock/opam/decoders.0.5.0"
         }
       },
       "overrides": [],
@@ -3885,16 +3832,16 @@
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@e0bac278",
-        "@opam/bigarray-compat@opam:1.0.0@1faefa97",
+        "@opam/bigarray-compat@opam:1.0.0@3a87ad65",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/dune@opam:2.5.0@e0bac278",
-        "@opam/bigarray-compat@opam:1.0.0@1faefa97"
+        "@opam/bigarray-compat@opam:1.0.0@3a87ad65"
       ]
     },
-    "@opam/bigarray-compat@opam:1.0.0@1faefa97": {
-      "id": "@opam/bigarray-compat@opam:1.0.0@1faefa97",
+    "@opam/bigarray-compat@opam:1.0.0@3a87ad65": {
+      "id": "@opam/bigarray-compat@opam:1.0.0@3a87ad65",
       "name": "@opam/bigarray-compat",
       "version": "opam:1.0.0",
       "source": {
@@ -4101,13 +4048,13 @@
       "overrides": [],
       "dependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d",
-        "@opam/menhir@opam:20200624@8629ff13",
+        "@opam/menhir@opam:20201201@a7ee0741",
         "@opam/easy-format@opam:1.3.2@0484b3c4",
         "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d",
-        "@opam/menhir@opam:20200624@8629ff13",
+        "@opam/menhir@opam:20201201@a7ee0741",
         "@opam/easy-format@opam:1.3.2@0484b3c4",
         "@opam/dune@opam:2.5.0@e0bac278"
       ]
@@ -4215,8 +4162,8 @@
         "@opam/ppx_derivers@opam:1.2.1@ecf0aa45",
         "@opam/ocamlfind@opam:1.8.1@ff07b0f9",
         "@opam/merlin-extend@opam:0.6@404f814c",
-        "@opam/menhir@opam:20200624@8629ff13",
-        "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.5.0@e0bac278"
+        "@opam/menhir@opam:20201201@a7ee0741",
+        "@opam/fix@opam:20201120@5c318621", "@opam/dune@opam:2.5.0@e0bac278"
       ],
       "devDependencies": []
     },
@@ -4245,7 +4192,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@a90ae385",
+        "ocaml@4.10.0@d41d8cd9", "@opam/ppxlib@opam:0.15.0@6a9d8126",
         "@opam/dune@opam:2.5.0@e0bac278", "@esy-ocaml/reason@3.6.2@d41d8cd9"
       ],
       "devDependencies": [ "ocaml@4.10.0@d41d8cd9" ]
diff --git a/test.esy.lock/opam/bigarray-compat.1.0.0/opam b/test.esy.lock/opam/bigarray-compat.1.0.0/opam
index 93751514d6..24a122d43f 100644
--- a/test.esy.lock/opam/bigarray-compat.1.0.0/opam
+++ b/test.esy.lock/opam/bigarray-compat.1.0.0/opam
@@ -6,7 +6,7 @@ license: "ISC"
 homepage: "https://github.com/mirage/bigarray-compat"
 bug-reports: "https://github.com/mirage/bigarray-compat/issues"
 depends: [
-  "ocaml" {>= "4.03.0"}
+  "ocaml" {>= "4.02.3"}
   "dune" {>= "1.0"}
 ]
 build: [
@@ -20,4 +20,4 @@ url {
     "md5=1cc7c25382a8900bada34aadfd66632e"
     "sha512=c365fee15582aca35d7b05268cde29e54774ad7df7be56762b4aad78ca1409d4326ad3b34af0f1cc2c7b872837290a9cd9ff43b47987c03bba7bba32fe8a030f"
   ]
-}
\ No newline at end of file
+}
diff --git a/test.esy.lock/opam/decoders.0.4.0/opam b/test.esy.lock/opam/decoders.0.4.0/opam
deleted file mode 100644
index bc1e810302..0000000000
--- a/test.esy.lock/opam/decoders.0.4.0/opam
+++ /dev/null
@@ -1,40 +0,0 @@
-opam-version: "2.0"
-synopsis: "Elm-inspired decoders for Ocaml"
-description: """
-A combinator library for "decoding" JSON-like values into your own Ocaml types, inspired by Elm's `Json.Decode` and `Json.Encode`.
-
-> Eh?
-
-An Ocaml program having a JSON (or YAML) data source usually goes something like this:
-
-1. Get your data from somewhere. Now you have a `string`.
-2. *Parse* the `string` as JSON (or YAML). Now you have a `Yojson.Basic.json`, or maybe an `Ezjsonm.value`, or perhaps a `Ocyaml.yaml`.
-3. *Decode* the JSON value to an Ocaml type that's actually useful for your program's domain.
-
-This library helps with step 3.
-"""
-maintainer: "Matt Bray <matt@aestheticintegration.com>"
-authors: ["Matt Bray <matt@aestheticintegration.com>"]
-homepage: "https://github.com/mattjbray/ocaml-decoders"
-doc: "https://mattjbray.github.io/ocaml-decoders/decoders"
-bug-reports: "https://github.com/mattjbray/ocaml-decoders/issues"
-license: "ISC"
-dev-repo: "git+https://github.com/mattjbray/ocaml-decoders.git"
-build: [
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-  ["dune" "build" "@doc" "-p" name "-j" jobs] {with-doc}
-]
-depends: [
-  "dune" {>= "1.0"}
-  "containers" {with-test}
-  "ocaml" { >= "4.03.0" }
-]
-url {
-  src:
-    "https://github.com/mattjbray/ocaml-decoders/releases/download/v0.4.0/decoders-v0.4.0.tbz"
-  checksum: [
-    "sha256=18ebbd98901dff67c9944d465ed508df018c8ee8e13bfe037d5ad780584eebf7"
-    "sha512=a6221b40cc1c3d9ea46c5e7cec6c5992b923e390ce004c23d7f36e99974c10f6d4a690113255b85d3895f357e0dd44562e9bc03ba8708223cb1e56ba182c10d3"
-  ]
-}
diff --git a/test.esy.lock/opam/decoders.0.5.0/opam b/test.esy.lock/opam/decoders.0.5.0/opam
new file mode 100644
index 0000000000..171215090b
--- /dev/null
+++ b/test.esy.lock/opam/decoders.0.5.0/opam
@@ -0,0 +1,40 @@
+opam-version: "2.0"
+synopsis: "Elm-inspired decoders for Ocaml"
+description:
+  "A combinator library for \"decoding\" JSON-like values into your own Ocaml types, inspired by Elm's `Json.Decode` and `Json.Encode`."
+maintainer: ["Matt Bray <mattjbray@gmail.com>"]
+authors: ["Matt Bray <mattjbray@gmail.com>"]
+license: "ISC"
+homepage: "https://github.com/mattjbray/ocaml-decoders"
+doc: "https://mattjbray.github.io/ocaml-decoders/"
+bug-reports: "https://github.com/mattjbray/ocaml-decoders/issues"
+depends: [
+  "ocaml" {>= "4.03.0"}
+  "dune" {>= "2.0"}
+  "odoc" {with-doc}
+  "containers" {with-test}
+]
+build: [
+  ["dune" "subst"] {pinned}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+]
+dev-repo: "git+https://github.com/mattjbray/ocaml-decoders.git"
+x-commit-hash: "19200c6221a834098306620234310de514f6301c"
+url {
+  src:
+    "https://github.com/mattjbray/ocaml-decoders/releases/download/v0.5.0/decoders-v0.5.0.tbz"
+  checksum: [
+    "sha256=fc0b672a2ebcb1cfb7575384c5033b14985b26fe90ab517749ba77ed7fc0f11a"
+    "sha512=908f8cc12267344cb10319cf8ce05308734980093581791da07365e9986cbe96a1bc420da9eb6057930cbe37255824d76ee8c96d68e31f13bd3361834a6c7e10"
+  ]
+}
diff --git a/test.esy.lock/opam/fix.20200131/opam b/test.esy.lock/opam/fix.20200131/opam
deleted file mode 100644
index 4babcba82a..0000000000
--- a/test.esy.lock/opam/fix.20200131/opam
+++ /dev/null
@@ -1,24 +0,0 @@
-opam-version: "2.0"
-maintainer: "francois.pottier@inria.fr"
-authors: [
-  "François Pottier <francois.pottier@inria.fr>"
-]
-homepage: "https://gitlab.inria.fr/fpottier/fix"
-dev-repo: "git+https://gitlab.inria.fr/fpottier/fix.git"
-bug-reports: "francois.pottier@inria.fr"
-build: [
-  ["dune" "build" "-p" name "-j" jobs]
-]
-depends: [
-  "ocaml" { >= "4.03" }
-  "dune" { >= "1.3" }
-]
-synopsis: "Facilities for memoization and fixed points"
-url {
-  src:
-    "https://gitlab.inria.fr/fpottier/fix/repository/20200131/archive.tar.gz"
-  checksum: [
-    "md5=991ff031666c662eaab638d2e0f4ac1d"
-    "sha512=01c45a1d90b02ec0939e968b185a6a373ac6117e2287b9a26d3db9d71e9569d086cea50da60710fcab5c2ed9d3b4c72b76839c0651e436f1fb39c77dc7c04b5e"
-  ]
-}
diff --git a/test.esy.lock/opam/fix.20201120/opam b/test.esy.lock/opam/fix.20201120/opam
new file mode 100644
index 0000000000..31c8a641a2
--- /dev/null
+++ b/test.esy.lock/opam/fix.20201120/opam
@@ -0,0 +1,24 @@
+opam-version: "2.0"
+maintainer: "francois.pottier@inria.fr"
+authors: [
+  "François Pottier <francois.pottier@inria.fr>"
+]
+homepage: "https://gitlab.inria.fr/fpottier/fix"
+dev-repo: "git+https://gitlab.inria.fr/fpottier/fix.git"
+bug-reports: "francois.pottier@inria.fr"
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+]
+depends: [
+  "ocaml" { >= "4.03" }
+  "dune" {>=  "1.3" }
+]
+synopsis: "Facilities for memoization and fixed points"
+url {
+  src:
+    "https://gitlab.inria.fr/fpottier/fix/repository/20201120/archive.tar.gz"
+  checksum: [
+    "md5=7eb570b759635fe66f3556d2b1cc88e3"
+    "sha512=344dcc619f9e8b8a6c998775b6d2dab2ea5253e6a67abe4797f76dc5dd30bc776568abce1e90477422e9db447821579889737e3531c42139708f813e983ea5d4"
+  ]
+}
diff --git a/test.esy.lock/opam/menhir.20200624/opam b/test.esy.lock/opam/menhir.20200624/opam
deleted file mode 100644
index 37637fcf60..0000000000
--- a/test.esy.lock/opam/menhir.20200624/opam
+++ /dev/null
@@ -1,27 +0,0 @@
-opam-version: "2.0"
-maintainer: "francois.pottier@inria.fr"
-authors: [
-  "François Pottier <francois.pottier@inria.fr>"
-  "Yann Régis-Gianas <yrg@pps.univ-paris-diderot.fr>"
-]
-homepage: "http://gitlab.inria.fr/fpottier/menhir"
-dev-repo: "git+https://gitlab.inria.fr/fpottier/menhir.git"
-bug-reports: "menhir@inria.fr"
-build: [
-  ["dune" "build" "-p" name "-j" jobs]
-]
-depends: [
-  "ocaml" {>= "4.02.3"}
-  "dune" { >= "2.2.0"}
-  "menhirLib" {= version}
-  "menhirSdk" {= version}
-]
-synopsis: "An LR(1) parser generator"
-url {
-  src:
-    "https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz"
-  checksum: [
-    "md5=c37ff53a4a69059e1f8223067b91bb8b"
-    "sha512=68cd165bd65c93fc9b14820a032b6d760674b3e811d8536c2e26e10f9fc5892720564f109484f12f8d08d849c2983c2eaf350d76ab1122a5b8a3c7674ab2bd39"
-  ]
-}
diff --git a/test.esy.lock/opam/menhir.20201201/opam b/test.esy.lock/opam/menhir.20201201/opam
new file mode 100644
index 0000000000..8bf0aabeeb
--- /dev/null
+++ b/test.esy.lock/opam/menhir.20201201/opam
@@ -0,0 +1,27 @@
+opam-version: "2.0"
+maintainer: "francois.pottier@inria.fr"
+authors: [
+  "François Pottier <francois.pottier@inria.fr>"
+  "Yann Régis-Gianas <yrg@pps.univ-paris-diderot.fr>"
+]
+homepage: "http://gitlab.inria.fr/fpottier/menhir"
+dev-repo: "git+https://gitlab.inria.fr/fpottier/menhir.git"
+bug-reports: "menhir@inria.fr"
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+]
+depends: [
+  "ocaml" {>= "4.02.3"}
+  "dune" { >= "2.2.0"}
+  "menhirLib" {= version}
+  "menhirSdk" {= version}
+]
+synopsis: "An LR(1) parser generator"
+url {
+  src:
+    "https://gitlab.inria.fr/fpottier/menhir/repository/20201201/archive.tar.gz"
+  checksum: [
+    "md5=ca1047954bfe8c857425dc67eee46272"
+    "sha512=571e7de852a2ea7d1cbb27fb9fd0b716b6ba1f112d4aedf4548d41f907c9a9b74e1b557a26a7515c2a0e5407de6c2614cea17d51a088d845d4c6ceaec85a0ecb"
+  ]
+}
diff --git a/test.esy.lock/opam/menhirLib.20200624/opam b/test.esy.lock/opam/menhirLib.20200624/opam
deleted file mode 100644
index afcbe5d5e7..0000000000
--- a/test.esy.lock/opam/menhirLib.20200624/opam
+++ /dev/null
@@ -1,28 +0,0 @@
-opam-version: "2.0"
-maintainer: "francois.pottier@inria.fr"
-authors: [
-  "François Pottier <francois.pottier@inria.fr>"
-  "Yann Régis-Gianas <yrg@pps.univ-paris-diderot.fr>"
-]
-homepage: "http://gitlab.inria.fr/fpottier/menhir"
-dev-repo: "git+https://gitlab.inria.fr/fpottier/menhir.git"
-bug-reports: "menhir@inria.fr"
-build: [
-  ["dune" "build" "-p" name "-j" jobs]
-]
-depends: [
-  "ocaml"  { >= "4.02.3" }
-  "dune"   { >= "2.0.0"  }
-]
-conflicts: [
-  "menhir" { != version  }
-]
-synopsis: "Runtime support library for parsers generated by Menhir"
-url {
-  src:
-    "https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz"
-  checksum: [
-    "md5=c37ff53a4a69059e1f8223067b91bb8b"
-    "sha512=68cd165bd65c93fc9b14820a032b6d760674b3e811d8536c2e26e10f9fc5892720564f109484f12f8d08d849c2983c2eaf350d76ab1122a5b8a3c7674ab2bd39"
-  ]
-}
diff --git a/test.esy.lock/opam/menhirLib.20201201/opam b/test.esy.lock/opam/menhirLib.20201201/opam
new file mode 100644
index 0000000000..3d5290fd0f
--- /dev/null
+++ b/test.esy.lock/opam/menhirLib.20201201/opam
@@ -0,0 +1,28 @@
+opam-version: "2.0"
+maintainer: "francois.pottier@inria.fr"
+authors: [
+  "François Pottier <francois.pottier@inria.fr>"
+  "Yann Régis-Gianas <yrg@pps.univ-paris-diderot.fr>"
+]
+homepage: "http://gitlab.inria.fr/fpottier/menhir"
+dev-repo: "git+https://gitlab.inria.fr/fpottier/menhir.git"
+bug-reports: "menhir@inria.fr"
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+]
+depends: [
+  "ocaml"  { >= "4.02.3" }
+  "dune"   { >= "2.0.0"  }
+]
+conflicts: [
+  "menhir" { != version  }
+]
+synopsis: "Runtime support library for parsers generated by Menhir"
+url {
+  src:
+    "https://gitlab.inria.fr/fpottier/menhir/repository/20201201/archive.tar.gz"
+  checksum: [
+    "md5=ca1047954bfe8c857425dc67eee46272"
+    "sha512=571e7de852a2ea7d1cbb27fb9fd0b716b6ba1f112d4aedf4548d41f907c9a9b74e1b557a26a7515c2a0e5407de6c2614cea17d51a088d845d4c6ceaec85a0ecb"
+  ]
+}
diff --git a/test.esy.lock/opam/menhirSdk.20200624/opam b/test.esy.lock/opam/menhirSdk.20200624/opam
deleted file mode 100644
index af12216336..0000000000
--- a/test.esy.lock/opam/menhirSdk.20200624/opam
+++ /dev/null
@@ -1,28 +0,0 @@
-opam-version: "2.0"
-maintainer: "francois.pottier@inria.fr"
-authors: [
-  "François Pottier <francois.pottier@inria.fr>"
-  "Yann Régis-Gianas <yrg@pps.univ-paris-diderot.fr>"
-]
-homepage: "http://gitlab.inria.fr/fpottier/menhir"
-dev-repo: "git+https://gitlab.inria.fr/fpottier/menhir.git"
-bug-reports: "menhir@inria.fr"
-build: [
-  ["dune" "build" "-p" name "-j" jobs]
-]
-depends: [
-  "ocaml"  { >= "4.02.3" }
-  "dune"   { >= "2.0.0"  }
-]
-conflicts: [
-  "menhir" { != version  }
-]
-synopsis: "Compile-time library for auxiliary tools related to Menhir"
-url {
-  src:
-    "https://gitlab.inria.fr/fpottier/menhir/repository/20200624/archive.tar.gz"
-  checksum: [
-    "md5=c37ff53a4a69059e1f8223067b91bb8b"
-    "sha512=68cd165bd65c93fc9b14820a032b6d760674b3e811d8536c2e26e10f9fc5892720564f109484f12f8d08d849c2983c2eaf350d76ab1122a5b8a3c7674ab2bd39"
-  ]
-}
diff --git a/test.esy.lock/opam/menhirSdk.20201201/opam b/test.esy.lock/opam/menhirSdk.20201201/opam
new file mode 100644
index 0000000000..46afb20f24
--- /dev/null
+++ b/test.esy.lock/opam/menhirSdk.20201201/opam
@@ -0,0 +1,28 @@
+opam-version: "2.0"
+maintainer: "francois.pottier@inria.fr"
+authors: [
+  "François Pottier <francois.pottier@inria.fr>"
+  "Yann Régis-Gianas <yrg@pps.univ-paris-diderot.fr>"
+]
+homepage: "http://gitlab.inria.fr/fpottier/menhir"
+dev-repo: "git+https://gitlab.inria.fr/fpottier/menhir.git"
+bug-reports: "menhir@inria.fr"
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+]
+depends: [
+  "ocaml"  { >= "4.02.3" }
+  "dune"   { >= "2.0.0"  }
+]
+conflicts: [
+  "menhir" { != version  }
+]
+synopsis: "Compile-time library for auxiliary tools related to Menhir"
+url {
+  src:
+    "https://gitlab.inria.fr/fpottier/menhir/repository/20201201/archive.tar.gz"
+  checksum: [
+    "md5=ca1047954bfe8c857425dc67eee46272"
+    "sha512=571e7de852a2ea7d1cbb27fb9fd0b716b6ba1f112d4aedf4548d41f907c9a9b74e1b557a26a7515c2a0e5407de6c2614cea17d51a088d845d4c6ceaec85a0ecb"
+  ]
+}
diff --git a/test.esy.lock/opam/odoc.1.5.1/opam b/test.esy.lock/opam/odoc.1.5.1/opam
deleted file mode 100644
index a7ccb1dca0..0000000000
--- a/test.esy.lock/opam/odoc.1.5.1/opam
+++ /dev/null
@@ -1,52 +0,0 @@
-opam-version: "2.0"
-
-homepage: "http://github.com/ocaml/odoc"
-doc: "https://ocaml.github.io/odoc/"
-bug-reports: "https://github.com/ocaml/odoc/issues"
-license: "ISC"
-
-authors: [
-  "Thomas Refis <trefis@janestreet.com>"
-  "David Sheets <sheets@alum.mit.edu>"
-  "Leo White <leo@lpw25.net>"
-  "Anton Bachin <antonbachin@yahoo.com>"
-  "Jon Ludlam <jon@recoil.org>"
-]
-maintainer: "Jon Ludlam <jon@recoil.org>"
-dev-repo: "git+https://github.com/ocaml/odoc.git"
-
-synopsis: "OCaml documentation generator"
-description: """
-Odoc is a documentation generator for OCaml. It reads doc comments,
-delimited with `(** ... *)`, and outputs HTML. 
-"""
-
-depends: [
-  "astring"
-  "cmdliner"
-  "cppo" {build}
-  "dune"
-  "fpath"
-  "ocaml" {>= "4.02.0" & < "4.12"}
-  "result"
-  "tyxml" {>= "4.3.0"}
-
-  "alcotest" {dev & >= "0.8.3"}
-  "markup" {dev & >= "0.8.0"}
-  "ocamlfind" {dev}
-  "sexplib" {dev & >= "113.33.00"}
-
-  "bisect_ppx" {with-test & >= "1.3.0"}
-]
-
-build: [
-  ["dune" "subst"] {pinned}
-  ["dune" "build" "-p" name "-j" jobs]
-]
-url {
-  src: "https://github.com/ocaml/odoc/releases/download/1.5.1/odoc-1.5.1.tbz"
-  checksum: [
-    "sha256=ea14721344e2aab6b63f2884782d37e94a1ed8ab91147a1c08a29710d99d354f"
-    "sha512=b2d12277d61e1e52354128d459d2ad49bea24a4d46db89790769c2843c4b00beaee3ea7d0215211079174c0bd893de6bf52dcbb71e46622728be7491d91058b2"
-  ]
-}
diff --git a/test.esy.lock/opam/odoc.1.5.2/opam b/test.esy.lock/opam/odoc.1.5.2/opam
new file mode 100644
index 0000000000..f59e640771
--- /dev/null
+++ b/test.esy.lock/opam/odoc.1.5.2/opam
@@ -0,0 +1,53 @@
+opam-version: "2.0"
+
+homepage: "http://github.com/ocaml/odoc"
+doc: "https://ocaml.github.io/odoc/"
+bug-reports: "https://github.com/ocaml/odoc/issues"
+license: "ISC"
+
+authors: [
+  "Thomas Refis <trefis@janestreet.com>"
+  "David Sheets <sheets@alum.mit.edu>"
+  "Leo White <leo@lpw25.net>"
+  "Anton Bachin <antonbachin@yahoo.com>"
+  "Jon Ludlam <jon@recoil.org>"
+]
+maintainer: "Anton Bachin <antonbachin@yahoo.com>"
+dev-repo: "git+https://github.com/ocaml/odoc.git"
+
+synopsis: "OCaml documentation generator"
+description: """
+Odoc is a documentation generator for OCaml. It reads doc comments,
+delimited with `(** ... *)`, and outputs HTML. 
+"""
+
+depends: [
+  "astring"
+  "cmdliner"
+  "cppo" {build}
+  "dune"
+  "fpath"
+  "ocaml" {>= "4.02.0"}
+  "result"
+  "tyxml" {>= "4.3.0"}
+
+  "alcotest" {dev & >= "0.8.3"}
+  "markup" {dev & >= "1.0.0"}
+  "ocamlfind" {dev}
+  "sexplib" {dev & >= "113.33.00"}
+
+  "bisect_ppx" {with-test & >= "1.3.0"}
+]
+
+build: [
+  ["dune" "subst"] {pinned}
+  ["dune" "build" "-p" name "-j" jobs]
+]
+x-commit-hash: "c0df8ce2171fa9645a41f371429aa3ddc16de5c1"
+url {
+  src: "https://github.com/ocaml/odoc/releases/download/1.5.2/odoc-1.5.2.tbz"
+  checksum: [
+    "sha256=d24463f2660bc28c72cda001478360158e953721c9e23fb361ec4783113c4871"
+    "sha512=e6c83630325de422f31cda8f88c038d213969f8b98e989593c057658f3956c0855860c9bc38f61b6479929516ca95aee689ddfba3ad8c47d821c4fdf54524cf9"
+  ]
+}
diff --git a/test.esy.lock/opam/ppx_deriving.4.5/opam b/test.esy.lock/opam/ppx_deriving.4.5/opam
deleted file mode 100644
index 62efe36445..0000000000
--- a/test.esy.lock/opam/ppx_deriving.4.5/opam
+++ /dev/null
@@ -1,35 +0,0 @@
-opam-version: "2.0"
-maintainer: "thierry.martinez@inria.fr"
-authors: [ "whitequark <whitequark@whitequark.org>" ]
-license: "MIT"
-homepage: "https://github.com/ocaml-ppx/ppx_deriving"
-doc: "https://ocaml-ppx.github.io/ppx_deriving/"
-bug-reports: "https://github.com/ocaml-ppx/ppx_deriving/issues"
-dev-repo: "git+https://github.com/ocaml-ppx/ppx_deriving.git"
-tags: [ "syntax" ]
-build: [
-  ["dune" "subst"] {pinned}
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-  ["dune" "build" "@doc" "-p" name "-j" jobs] {with-doc}
-]
-depends: [
-  "dune"     {>= "1.6.3"}
-  "cppo"     {build}
-  "ppxfind"  {build}
-  "ocaml-migrate-parsetree" {< "2.0.0"}
-  "ppx_derivers"
-  "ppx_tools"  {>= "4.02.3"}
-  "result"
-  "ounit"      {with-test}
-  "ocaml" {>= "4.02" & < "4.12.0"}
-]
-synopsis: "Type-driven code generation for OCaml >=4.02.2"
-description: """
-ppx_deriving provides common infrastructure for generating
-code based on type definitions, and a set of useful plugins
-for common tasks.
-"""
-url {
-  src: "https://github.com/ocaml-ppx/ppx_deriving/archive/v4.5.tar.gz"
-  checksum: "sha512=f79153c5231ba1e03a3491fde95ca82ecb62fe05b60a649a374d2fbc5ea5dd9242126de7dfbe917c22fd7077c026c940e18c6b36c5ce0ec4bb6e07f11d2b710b"}
diff --git a/test.esy.lock/opam/ppx_deriving.5.1/opam b/test.esy.lock/opam/ppx_deriving.5.1/opam
new file mode 100644
index 0000000000..0396de61ca
--- /dev/null
+++ b/test.esy.lock/opam/ppx_deriving.5.1/opam
@@ -0,0 +1,41 @@
+opam-version: "2.0"
+maintainer: "whitequark <whitequark@whitequark.org>"
+authors: [ "whitequark <whitequark@whitequark.org>" ]
+license: "MIT"
+homepage: "https://github.com/ocaml-ppx/ppx_deriving"
+doc: "https://ocaml-ppx.github.io/ppx_deriving/"
+bug-reports: "https://github.com/ocaml-ppx/ppx_deriving/issues"
+dev-repo: "git+https://github.com/ocaml-ppx/ppx_deriving.git"
+tags: [ "syntax" ]
+build: [
+  ["dune" "subst"] {dev}
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+  ["dune" "build" "@doc" "-p" name "-j" jobs] {with-doc}
+]
+depends: [
+  "ocaml" {>= "4.07.0" & < "4.12"}
+  "dune" {>= "1.6.3"}
+  "cppo" {build}
+  "ocamlfind"
+  "ocaml-migrate-parsetree" {< "2.0.0"}
+  "ppx_derivers"
+  "ppxlib" {>= "0.14.0" & < "0.16.0"}
+  "result"
+  "ounit" {with-test}
+]
+synopsis: "Type-driven code generation for OCaml"
+description: """
+ppx_deriving provides common infrastructure for generating
+code based on type definitions, and a set of useful plugins
+for common tasks.
+"""
+url {
+  src:
+    "https://github.com/ocaml-ppx/ppx_deriving/releases/download/v5.1/ppx_deriving-v5.1.tbz"
+  checksum: [
+    "sha256=b04f3b22b754e65af50812730695863192ae410e802e074b55ebbb8c4f73c4c4"
+    "sha512=abcccda4878a82b0d0eedcc23127da6ae5c10bface59335a226a714752a46b987bff01f48fbe432910b26bfc7b332b301d191da71a9da0db593d86335bc83cd9"
+  ]
+}
+x-commit-hash: "b29509ff51f79f0f47dd85d60ab837ded5d2c6e4"
diff --git a/test.esy.lock/opam/ppx_deriving_yojson.3.5.3/opam b/test.esy.lock/opam/ppx_deriving_yojson.3.5.3/opam
deleted file mode 100644
index 289dd8327d..0000000000
--- a/test.esy.lock/opam/ppx_deriving_yojson.3.5.3/opam
+++ /dev/null
@@ -1,38 +0,0 @@
-opam-version: "2.0"
-maintainer: "whitequark <whitequark@whitequark.org>"
-authors: [ "whitequark <whitequark@whitequark.org>" ]
-license: "MIT"
-homepage: "https://github.com/ocaml-ppx/ppx_deriving_yojson"
-bug-reports: "https://github.com/ocaml-ppx/ppx_deriving_yojson/issues"
-dev-repo: "git://github.com/ocaml-ppx/ppx_deriving_yojson.git"
-tags: [ "syntax" "json" ]
-build: [
-  ["dune" "subst"] {dev}
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-depends: [
-  "ocaml" {>= "4.04.0"}
-  "yojson" {>= "1.6.0" & < "2.0.0"}
-  "result"
-  "ppx_deriving" {>= "4.5" & < "5.0"}
-  "ppx_tools"
-  "ppxfind" {build}
-  "dune" {>= "1.0"}
-  "cppo" {build}
-  "ounit" {with-test & >= "2.0.0"}
-]
-synopsis:
-  "JSON codec generator for OCaml"
-description: """
-ppx_deriving_yojson is a ppx_deriving plugin that provides
-a JSON codec generator.
-"""
-url {
-  src:
-    "https://github.com/ocaml-ppx/ppx_deriving_yojson/archive/v3.5.3.tar.gz"
-  checksum: [
-    "md5=e5185e4ac9d149a332566139df55d408"
-    "sha512=550fe8c400fa57f3f33f4cec509df061db0d62353e0d05ffb64e02aaef74324369840297507553d9b8a8cba81f980c210d23177bf184dbe58b952a7df4aa2176"
-  ]
-}
diff --git a/test.esy.lock/opam/ppx_deriving_yojson.3.6.1/opam b/test.esy.lock/opam/ppx_deriving_yojson.3.6.1/opam
new file mode 100644
index 0000000000..2f5c6c245d
--- /dev/null
+++ b/test.esy.lock/opam/ppx_deriving_yojson.3.6.1/opam
@@ -0,0 +1,37 @@
+opam-version: "2.0"
+maintainer: "whitequark <whitequark@whitequark.org>"
+authors: [ "whitequark <whitequark@whitequark.org>" ]
+license: "MIT"
+homepage: "https://github.com/ocaml-ppx/ppx_deriving_yojson"
+bug-reports: "https://github.com/ocaml-ppx/ppx_deriving_yojson/issues"
+dev-repo: "git+https://github.com/ocaml-ppx/ppx_deriving_yojson.git"
+tags: [ "syntax" "json" ]
+build: [
+  ["dune" "subst"] {dev}
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+]
+depends: [
+  "ocaml" {>= "4.05.0"}
+  "dune" {>= "1.0"}
+  "yojson" {>= "1.6.0" & < "2.0.0"}
+  "result"
+  "ppx_deriving" {>= "5.1"}
+  "ppxlib" {>= "0.14.0"}
+  "ounit" {with-test & >= "2.0.0"}
+]
+synopsis:
+  "JSON codec generator for OCaml"
+description: """
+ppx_deriving_yojson is a ppx_deriving plugin that provides
+a JSON codec generator.
+"""
+url {
+  src:
+    "https://github.com/ocaml-ppx/ppx_deriving_yojson/releases/download/v3.6.1/ppx_deriving_yojson-v3.6.1.tbz"
+  checksum: [
+    "sha256=712ee9207c70dd144e72cd689bee2d2beb120b804e77c74ec6f7b843a88944e6"
+    "sha512=d8c828902b8441f73e08fc03e2173ce81a09cccfe091471fbcffe098b2272739b98a05e8308016da3efeb3d4d1abd7d941bfaac42c85961ea40915ddce526577"
+  ]
+}
+x-commit-hash: "d0abe462de8bab52d763eeafd751e8ea1ba211ac"
diff --git a/test.esy.lock/opam/ppx_tools.6.2/opam b/test.esy.lock/opam/ppx_tools.6.2/opam
deleted file mode 100644
index 9e8b874706..0000000000
--- a/test.esy.lock/opam/ppx_tools.6.2/opam
+++ /dev/null
@@ -1,21 +0,0 @@
-opam-version: "2.0"
-synopsis: "Tools for authors of ppx rewriters and other syntactic tools"
-maintainer: "Kate <kit.ty.kate@disroot.org>"
-authors: "Alain Frisch <alain.frisch@lexifi.com>"
-license: "MIT"
-tags: [ "syntax" ]
-homepage: "https://github.com/ocaml-ppx/ppx_tools"
-bug-reports: "https://github.com/ocaml-ppx/ppx_tools/issues"
-dev-repo: "git://github.com/ocaml-ppx/ppx_tools.git"
-build: ["dune" "build" "-p" name "-j" jobs]
-depends: [
-  "ocaml" {>= "4.08.0" & < "4.12.0"}
-  "dune" {>= "1.6"}
-]
-url {
-  src: "https://github.com/ocaml-ppx/ppx_tools/archive/6.2.tar.gz"
-  checksum: [
-    "md5=68b05e0794c475c384b9285d1156d1f3"
-    "sha512=fc3943c69901ef46843355c3482d5a1481d05ee94fb0a344ec04101059a02cbaa76fed5742cfae82730edf378f2e140d859a5cf590653f85359255d451f07dc8"
-  ]
-}
diff --git a/test.esy.lock/opam/ppxfind.1.4/opam b/test.esy.lock/opam/ppxfind.1.4/opam
deleted file mode 100644
index 57eefe4e65..0000000000
--- a/test.esy.lock/opam/ppxfind.1.4/opam
+++ /dev/null
@@ -1,41 +0,0 @@
-opam-version: "2.0"
-synopsis: "Tool combining ocamlfind and ppx"
-description: """
-Ppxfind is a small command line tool that among other things allows
-to use old style ppx rewriters with jbuilder.
-"""
-maintainer: ["Jérémie Dimino <jeremie@dimino.org>"]
-authors: ["Jérémie Dimino <jeremie@dimino.org>"]
-license: "BSD3"
-homepage: "https://github.com/jeremiedimino/ppxfind"
-doc: "https://jeremiedimino.github.io/ppxfind/"
-bug-reports: "https://github.com/jeremiedimino/ppxfind/issues"
-depends: [
-  "dune" {>= "2.0"}
-  "ocaml-migrate-parsetree" {>= "1.6.0" & < "2.0.0"}
-  "ocamlfind"
-  "ocaml" {>= "4.02.3"}
-]
-build: [
-  ["dune" "subst"] {pinned}
-  [
-    "dune"
-    "build"
-    "-p"
-    name
-    "-j"
-    jobs
-    "@install"
-    "@runtest" {with-test}
-    "@doc" {with-doc}
-  ]
-]
-dev-repo: "git+https://github.com/jeremiedimino/ppxfind.git"
-url {
-  src:
-    "https://github.com/jeremiedimino/ppxfind/releases/download/1.4/ppxfind-1.4.tbz"
-  checksum: [
-    "sha256=98291c69f04f7f7b7cdad1b5d786c70fc595559d4663cc04cb711ac132db4971"
-    "sha512=f80b0ee09fb536aa9f154da80d06a1b68ba3b10605fb7338bd6449beb5c8d00e983bf66b4a63e12659ae1410fea56d0a2c4cfd43584616438504628035bcb981"
-  ]
-}
diff --git a/test.esy.lock/opam/ppxlib.0.15.0/opam b/test.esy.lock/opam/ppxlib.0.15.0/opam
index 084b18884c..f32985ad85 100644
--- a/test.esy.lock/opam/ppxlib.0.15.0/opam
+++ b/test.esy.lock/opam/ppxlib.0.15.0/opam
@@ -14,7 +14,7 @@ run-test: [
   ["dune" "runtest" "-p" name "-j" jobs] { ocaml:version >= "4.10" }
 ]
 depends: [
-  "ocaml"                   {>= "4.04.1" & < "4.12"}
+  "ocaml"                   {>= "4.04.1"}
   "dune"                    {>= "1.11"}
   "ocaml-compiler-libs"     {>= "v0.11.0"}
   "ocaml-migrate-parsetree" {>= "1.5.0" & < "2.0.0"}
diff --git a/test.esy.lock/opam/reason.3.6.0/opam b/test.esy.lock/opam/reason.3.6.0/opam
deleted file mode 100644
index 3e9119724e..0000000000
--- a/test.esy.lock/opam/reason.3.6.0/opam
+++ /dev/null
@@ -1,32 +0,0 @@
-opam-version: "2.0"
-maintainer: "Jordan Walke <jordojw@gmail.com>"
-authors: [ "Jordan Walke <jordojw@gmail.com>" ]
-license: "MIT"
-homepage: "https://github.com/facebook/reason"
-doc: "http://reasonml.github.io/"
-bug-reports: "https://github.com/facebook/reason/issues"
-dev-repo: "git://github.com/facebook/reason.git"
-tags: [ "syntax" ]
-build: [
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
-depends: [
-  "ocaml"         {>= "4.03" & < "4.11"}
-  "dune"          {>= "1.4"}
-  "ocamlfind"     {build}
-  "menhir"        {>= "20170418"}
-  "merlin-extend" {>= "0.4"}
-  "fix"
-  "result"
-  "ocaml-migrate-parsetree" {< "2.0.0"}
-]
-synopsis: "Reason: Syntax & Toolchain for OCaml"
-description: """
-Reason gives OCaml a new syntax that is remniscient of languages like
-JavaScript. It's also the umbrella project for a set of tools for the OCaml &
-JavaScript ecosystem."""
-url {
-  src: "https://registry.npmjs.org/@esy-ocaml/reason/-/reason-3.6.0.tgz"
-  checksum: "md5=d4d729804bc509bca0ac6223e06f7314"
-}
diff --git a/test.esy.lock/opam/reason.3.6.2/opam b/test.esy.lock/opam/reason.3.6.2/opam
new file mode 100644
index 0000000000..9408643bc9
--- /dev/null
+++ b/test.esy.lock/opam/reason.3.6.2/opam
@@ -0,0 +1,31 @@
+opam-version: "2.0"
+maintainer: "Jordan Walke <jordojw@gmail.com>"
+authors: [ "Jordan Walke <jordojw@gmail.com>" ]
+license: "MIT"
+homepage: "https://github.com/facebook/reason"
+doc: "http://reasonml.github.io/"
+bug-reports: "https://github.com/facebook/reason/issues"
+dev-repo: "git://github.com/facebook/reason.git"
+tags: [ "syntax" ]
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+]
+depends: [
+  "ocaml"         {>= "4.03" & < "4.12"}
+  "dune"          {>= "1.4"}
+  "ocamlfind"     {build}
+  "menhir"        {>= "20170418"}
+  "merlin-extend" {>= "0.6"}
+  "ppx_derivers" {< "2.0"}
+  "fix"
+  "result"
+]
+synopsis: "Reason: Syntax & Toolchain for OCaml"
+description: """
+Reason gives OCaml a new syntax that is remniscient of languages like
+JavaScript. It's also the umbrella project for a set of tools for the OCaml &
+JavaScript ecosystem."""
+url {
+  src: "https://registry.npmjs.org/@esy-ocaml/reason/-/reason-3.6.2.tgz"
+  checksum: "md5=d6de40f280f1c229f9cb26eb4015f1c5"
+}
diff --git a/test.esy.lock/opam/stdlib-shims.0.1.0/opam b/test.esy.lock/opam/stdlib-shims.0.1.0/opam
index 0d1079d893..c6f3529a33 100644
--- a/test.esy.lock/opam/stdlib-shims.0.1.0/opam
+++ b/test.esy.lock/opam/stdlib-shims.0.1.0/opam
@@ -8,9 +8,9 @@ bug-reports: "https://github.com/ocaml/stdlib-shims/issues"
 tags: ["stdlib" "compatibility" "org:ocaml"]
 license: ["typeof OCaml system"]
 depends: [
-  "ocaml" {>="4.02.3"}
+  "ocaml" {>= "4.02.3"}
   "dune"
- ("dune" {>= "2.7.0"} | "dune" & "ocaml" {<"4.12.0~~"})
+ ("dune" {>= "2.8.0"} | "ocaml" {< "4.12.0~~"})
 ]
 build: [ "dune" "build" "-p" name "-j" jobs ]
 synopsis: "Backport some of the new stdlib features to older compiler"

From a0c75c61f1eb265f1da557cbb4e5c1f6f221c02b Mon Sep 17 00:00:00 2001
From: Bryan Phelps <bryphe@outrunlabs.com>
Date: Thu, 3 Dec 2020 17:10:28 -0800
Subject: [PATCH 06/21] Remove debug logging

---
 src/Store/Features.re | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Store/Features.re b/src/Store/Features.re
index 1531b3e58d..013aaea18a 100644
--- a/src/Store/Features.re
+++ b/src/Store/Features.re
@@ -117,7 +117,6 @@ module Internal = {
       ) => {
     switch (scope) {
     | All =>
-  prerr_endline ("Updating all: " ++ Feature_Editor.show_msg(msg));
       let (layout', effects) =
         Feature_Layout.fold(
           (prev, editor) => {

From 2cac6bfdcf4d7f2b5caad405904f854bf4c32d7f Mon Sep 17 00:00:00 2001
From: Bryan Phelps <bryphe@outrunlabs.com>
Date: Thu, 3 Dec 2020 17:10:59 -0800
Subject: [PATCH 07/21] Formatting

---
 src/Components/ContextMenu.re               |  2 +-
 src/Components/FileExplorer/FileTreeView.re |  2 +-
 src/Components/FileIcon.re                  |  2 +-
 src/Components/Tabs.re                      |  4 +--
 src/Core/ConfigurationParser.re             |  6 ++---
 src/Feature/Editor/Editor.re                | 21 +++++++--------
 src/Feature/Editor/Minimap.re               | 13 ++++-----
 src/Feature/Editor/SurfaceView.re           | 15 ++++++-----
 src/Feature/Layout/View.re                  |  2 +-
 src/Feature/Logging/Feature_Logging.re      | 30 ++++++++++-----------
 src/Feature/Menus/Feature_Menus.re          |  4 +--
 src/Feature/StatusBar/Feature_StatusBar.re  |  2 +-
 src/Feature/Vim/Feature_Vim.re              |  2 +-
 src/Store/KeyBindingsStoreConnector.re      |  2 +-
 14 files changed, 53 insertions(+), 54 deletions(-)

diff --git a/src/Components/ContextMenu.re b/src/Components/ContextMenu.re
index d276c9a976..e0a9747b04 100644
--- a/src/Components/ContextMenu.re
+++ b/src/Components/ContextMenu.re
@@ -137,7 +137,7 @@ module Menu = {
 
       let height =
         switch (maybeRef) {
-        | Some((node: node)) => node#measurements().height
+        | Some(node: node) => node#measurements().height
         | None => List.length(items) * 20
         };
       let width = Constants.menuWidth;
diff --git a/src/Components/FileExplorer/FileTreeView.re b/src/Components/FileExplorer/FileTreeView.re
index 97b47cb579..33de0abc83 100644
--- a/src/Components/FileExplorer/FileTreeView.re
+++ b/src/Components/FileExplorer/FileTreeView.re
@@ -72,7 +72,7 @@ let nodeView =
   let tooltipText = {
     let path = node.path;
     switch (decoration) {
-    | Some((decoration: Feature_Decorations.Decoration.t)) =>
+    | Some(decoration: Feature_Decorations.Decoration.t) =>
       path ++ " • " ++ decoration.tooltip
     | None => path
     };
diff --git a/src/Components/FileIcon.re b/src/Components/FileIcon.re
index 30c6ae7e47..c4e876045f 100644
--- a/src/Components/FileIcon.re
+++ b/src/Components/FileIcon.re
@@ -28,7 +28,7 @@ let setiIcon = (~icon, ~fontSize, ~fg, ()) => {
 let make = (~font: UiFont.t, ~iconTheme, ~languageInfo, ~path, ()) => {
   switch (getFileIcon(~iconTheme, ~languageInfo, path)) {
   | None => React.empty
-  | Some((icon: IconTheme.IconDefinition.t)) =>
+  | Some(icon: IconTheme.IconDefinition.t) =>
     <setiIcon
       fontSize={font.size}
       fg={icon.fontColor}
diff --git a/src/Components/Tabs.re b/src/Components/Tabs.re
index 8d8801a8bf..df85eb3ec8 100644
--- a/src/Components/Tabs.re
+++ b/src/Components/Tabs.re
@@ -21,10 +21,10 @@ let measureChildOffset: (int, option(node)) => option((int, int)) =
           fun
           | [] => None
 
-          | [(child: node), ..._] when i == index =>
+          | [child: node, ..._] when i == index =>
             Some((offset, child#measurements().width))
 
-          | [(child: node), ...rest] =>
+          | [child: node, ...rest] =>
             loop(i + 1, offset + child#measurements().width, rest)
         );
 
diff --git a/src/Core/ConfigurationParser.re b/src/Core/ConfigurationParser.re
index fdeff8ea51..b9286f6595 100644
--- a/src/Core/ConfigurationParser.re
+++ b/src/Core/ConfigurationParser.re
@@ -132,9 +132,9 @@ let parseFontLigatures = json =>
 
     let isAlphaNumeric = (
       fun
-      | 'a'..'z'
-      | 'A'..'Z'
-      | '0'..'9' => true
+      | 'a' .. 'z'
+      | 'A' .. 'Z'
+      | '0' .. '9' => true
       | _ => false
     );
 
diff --git a/src/Feature/Editor/Editor.re b/src/Feature/Editor/Editor.re
index 434848b5ea..cb38da9fd2 100644
--- a/src/Feature/Editor/Editor.re
+++ b/src/Feature/Editor/Editor.re
@@ -101,21 +101,20 @@ type t = {
   // Number of lines to preserve before or after the cursor, when scrolling.
   // Like the `scrolloff` vim setting or the `editor.cursorSurroundingLines` VSCode setting.
   verticalScrollMargin: int,
-
   renderNonce: int,
 };
 
 let shouldRender = (editorA, editorB) => {
- // TODO: View lines different?
- // TODO: Diagnostics different?
- // TODO: Wrapping different?
- // TODO: Move cursor rendering
- // TODO: Move definition rendering
- editorA.key !== editorB.key
- || editorA.renderNonce != editorB.renderNonce
- || editorA.scrollX != editorB.scrollX
- || editorA.scrollY != editorB.scrollY
- || editorA.buffer !== editorB.buffer;
+  // TODO: View lines different?
+  // TODO: Diagnostics different?
+  // TODO: Wrapping different?
+  // TODO: Move cursor rendering
+  // TODO: Move definition rendering
+  editorA.key !== editorB.key
+  || editorA.renderNonce != editorB.renderNonce
+  || editorA.scrollX != editorB.scrollX
+  || editorA.scrollY != editorB.scrollY
+  || editorA.buffer !== editorB.buffer;
 };
 
 let key = ({key, _}) => key;
diff --git a/src/Feature/Editor/Minimap.re b/src/Feature/Editor/Minimap.re
index 073218f327..025d678e95 100644
--- a/src/Feature/Editor/Minimap.re
+++ b/src/Feature/Editor/Minimap.re
@@ -13,13 +13,14 @@ open Revery.UI;
 module BufferHighlights = Oni_Syntax.BufferHighlights;
 module Diagnostic = Feature_Diagnostics.Diagnostic;
 
-let layerCondition = Revery.UI.Layer.Condition.make((previousEditor, newEditor) => {
+let layerCondition =
+  Revery.UI.Layer.Condition.make((previousEditor, newEditor) =>
     if (Editor.shouldRender(previousEditor, newEditor)) {
-       true 
+      true;
     } else {
-       false 
+      false;
     }
-});
+  );
 
 module Constants = {
   include Constants;
@@ -271,8 +272,8 @@ let%component make =
     |> Option.value(~default=React.empty);
 
   <Layer
-    backgroundColor={backgroundColor}
-    condition=layerCondition(editor)
+    backgroundColor
+    condition={layerCondition(editor)}
     style={Styles.container(backgroundColor)}
     onMouseDown
     onMouseMove
diff --git a/src/Feature/Editor/SurfaceView.re b/src/Feature/Editor/SurfaceView.re
index 47f047c03c..cc94ff50c5 100644
--- a/src/Feature/Editor/SurfaceView.re
+++ b/src/Feature/Editor/SurfaceView.re
@@ -40,13 +40,14 @@ let renderRulers = (~context: Draw.context, ~colors: Colors.t, rulers) => {
   |> List.iter(Draw.ruler(~context, ~color=colors.rulerForeground));
 };
 
-let layerCondition = Revery.UI.Layer.Condition.make((previousEditor, newEditor) => {
+let layerCondition =
+  Revery.UI.Layer.Condition.make((previousEditor, newEditor) =>
     if (Editor.shouldRender(previousEditor, newEditor)) {
-       true 
+      true;
     } else {
-       false 
+      false;
     }
-})
+  );
 
 let%component make =
               (
@@ -182,9 +183,9 @@ let%component make =
     |> Option.value(~default=React.empty);
 
   <Layer
-    key=Editor.key(editor)
-    backgroundColor={Colors.(colors.editorBackground)}
-    condition=layerCondition(editor)
+    key={Editor.key(editor)}
+    backgroundColor=Colors.(colors.editorBackground)
+    condition={layerCondition(editor)}
     onBoundingBoxChanged={bbox => maybeBbox := Some(bbox)}
     style={Styles.bufferViewClipped(
       gutterWidth,
diff --git a/src/Feature/Layout/View.re b/src/Feature/Layout/View.re
index dc52e60bb9..bf335254ac 100644
--- a/src/Feature/Layout/View.re
+++ b/src/Feature/Layout/View.re
@@ -172,7 +172,7 @@ module Tab = {
 
     let fileIconView =
       switch (icon) {
-      | Some((icon: IconTheme.IconDefinition.t)) =>
+      | Some(icon: IconTheme.IconDefinition.t) =>
         <FontIcon
           fontFamily={Revery.Font.Family.fromFile("seti.ttf")}
           icon={icon.fontCharacter}
diff --git a/src/Feature/Logging/Feature_Logging.re b/src/Feature/Logging/Feature_Logging.re
index 0f639b5e1d..680580f97f 100644
--- a/src/Feature/Logging/Feature_Logging.re
+++ b/src/Feature/Logging/Feature_Logging.re
@@ -30,13 +30,14 @@ module Effects = {
       dispatch(toMsg(logFileName));
     });
 
-  let toggleDebugDraw = Isolinear.Effect.create(~name="Feature.Logging.toggleDebugDraw", () => {
-    if (Revery.Debug.isEnabled()) {
-        Revery.Debug.disable()
-    } else {
-        Revery.Debug.enable()
-    };
-  })
+  let toggleDebugDraw =
+    Isolinear.Effect.create(~name="Feature.Logging.toggleDebugDraw", () =>
+      if (Revery.Debug.isEnabled()) {
+        Revery.Debug.disable();
+      } else {
+        Revery.Debug.enable();
+      }
+    );
 };
 
 // UPDATE
@@ -53,10 +54,7 @@ let update = (msg, _model) =>
         (),
         Effect(Effects.traceToFile(~toMsg=str => LogFileStarted(str))),
       )
-    | ToggleRenderPerformanceView => (
-        (),
-        Effect(Effects.toggleDebugDraw)
-    )
+    | ToggleRenderPerformanceView => ((), Effect(Effects.toggleDebugDraw))
     }
   | LogFileStarted(filePath) => (
       (),
@@ -77,11 +75,11 @@ module Commands = {
 
   let showDebugVisualization =
     define(
-        ~category="Debug",
-        ~title="Render performance",
-        "oni.debug.toggleRenderPerformance",
-        Command(ToggleRenderPerformanceView)
-    )
+      ~category="Debug",
+      ~title="Render performance",
+      "oni.debug.toggleRenderPerformance",
+      Command(ToggleRenderPerformanceView),
+    );
 };
 
 module Contributions = {
diff --git a/src/Feature/Menus/Feature_Menus.re b/src/Feature/Menus/Feature_Menus.re
index 3c3de4513e..e76d1d7f68 100644
--- a/src/Feature/Menus/Feature_Menus.re
+++ b/src/Feature/Menus/Feature_Menus.re
@@ -72,7 +72,7 @@ let commandPalette = (contextKeys, commands, menus: Menu.Lookup.t) => {
   StringMap.merge(
     (_id, commandItem, menuItem) =>
       switch (commandItem, menuItem) {
-      | (Some(_), Some((menuItem: Menu.item)))
+      | (Some(_), Some(menuItem: Menu.item))
           when
             WhenExpr.evaluate(
               menuItem.isVisibleWhen,
@@ -80,7 +80,7 @@ let commandPalette = (contextKeys, commands, menus: Menu.Lookup.t) => {
             ) =>
         None
 
-      | (Some(commandItem), Some((menuItem: Menu.item))) =>
+      | (Some(commandItem), Some(menuItem: Menu.item)) =>
         Some(
           Menu.{...commandItem, group: menuItem.group, index: menuItem.index},
         )
diff --git a/src/Feature/StatusBar/Feature_StatusBar.re b/src/Feature/StatusBar/Feature_StatusBar.re
index 8f5fc3d19e..dd108d76b8 100644
--- a/src/Feature/StatusBar/Feature_StatusBar.re
+++ b/src/Feature/StatusBar/Feature_StatusBar.re
@@ -186,7 +186,7 @@ module Styles = {
 
 let positionToString =
   fun
-  | Some((loc: CharacterPosition.t)) =>
+  | Some(loc: CharacterPosition.t) =>
     Printf.sprintf(
       "%n,%n",
       EditorCoreTypes.LineNumber.toOneBased(loc.line),
diff --git a/src/Feature/Vim/Feature_Vim.re b/src/Feature/Vim/Feature_Vim.re
index d97c9a2c09..27b13d0c8a 100644
--- a/src/Feature/Vim/Feature_Vim.re
+++ b/src/Feature/Vim/Feature_Vim.re
@@ -48,7 +48,7 @@ let update = (msg, model: model) => {
       );
     (model, Effect(eff));
   | PasteCompleted({mode}) => (model, ModeUpdated(mode))
-  | SettingChanged(({fullName, value, _}: Vim.Setting.t)) => (
+  | SettingChanged({fullName, value, _}: Vim.Setting.t) => (
       {...model, settings: model.settings |> StringMap.add(fullName, value)},
       SettingsChanged,
     )
diff --git a/src/Store/KeyBindingsStoreConnector.re b/src/Store/KeyBindingsStoreConnector.re
index 801db0bf67..b76d065e43 100644
--- a/src/Store/KeyBindingsStoreConnector.re
+++ b/src/Store/KeyBindingsStoreConnector.re
@@ -513,7 +513,7 @@ let start = maybeKeyBindingsFilePath => {
         );
       } else {
         switch (Command.Lookup.get(command, CommandManager.current(state))) {
-        | Some((command: Command.t(_))) => (
+        | Some(command: Command.t(_)) => (
             state,
             executeCommandEffect(command.msg),
           )

From 336959cf6964db72af6c22738bd68263a300211b Mon Sep 17 00:00:00 2001
From: Bryan Phelps <bryphe@outrunlabs.com>
Date: Wed, 9 Dec 2020 12:56:05 -0800
Subject: [PATCH 08/21] Add changelog entry

---
 CHANGES_CURRENT.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES_CURRENT.md b/CHANGES_CURRENT.md
index 33b24276aa..3b90ec00a4 100644
--- a/CHANGES_CURRENT.md
+++ b/CHANGES_CURRENT.md
@@ -35,6 +35,7 @@
 - #2736 - Switch to model-based animation for notification yOffset
 - #2407 - Migrate color transitions to model-based animation
 - #2766 - Remove initial dock aniamtion (fixes #1131)
+- #2798 - Improve rendering performance with layers (experimental)
 
 ### Documentation
 

From 4e31d9a589789b00a4f3100c607da84b03c78fdc Mon Sep 17 00:00:00 2001
From: Bryan Phelps <bryphe@outrunlabs.com>
Date: Wed, 9 Dec 2020 12:59:02 -0800
Subject: [PATCH 09/21] Fix typo

---
 CHANGES_CURRENT.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES_CURRENT.md b/CHANGES_CURRENT.md
index 3b90ec00a4..b2a1e64b16 100644
--- a/CHANGES_CURRENT.md
+++ b/CHANGES_CURRENT.md
@@ -34,7 +34,7 @@
 
 - #2736 - Switch to model-based animation for notification yOffset
 - #2407 - Migrate color transitions to model-based animation
-- #2766 - Remove initial dock aniamtion (fixes #1131)
+- #2766 - Remove initial dock animation (fixes #1131)
 - #2798 - Improve rendering performance with layers (experimental)
 
 ### Documentation

From fcb6890026e9b575052f3902db5579f7ea7c4a74 Mon Sep 17 00:00:00 2001
From: Bryan Phelps <bryphe@outrunlabs.com>
Date: Wed, 9 Dec 2020 13:09:32 -0800
Subject: [PATCH 10/21] Bring back layer for vim list

---
 src/Components/VimList/Component_VimList.re | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/Components/VimList/Component_VimList.re b/src/Components/VimList/Component_VimList.re
index a280716ec8..c328750b35 100644
--- a/src/Components/VimList/Component_VimList.re
+++ b/src/Components/VimList/Component_VimList.re
@@ -5,6 +5,7 @@ open Utility;
 
 [@deriving show]
 type model('item) = {
+  key: [@opaque] Brisk_reconciler.Key.t,
   scrollY: float,
   rowHeight: int,
   items: array('item),
@@ -21,6 +22,7 @@ type model('item) = {
 };
 
 let create = (~rowHeight) => {
+  key: Brisk_reconciler.Key.create(),
   scrollY: 0.,
   rowHeight,
   items: [||],
@@ -669,6 +671,12 @@ module View = {
       Spring.Options.create(~stiffness=310., ~damping=30., ());
   };
 
+  module LayerConditions = {
+    let root = Revery.UI.Layer.Condition.make((previous: Obj.t, newObj: Obj.t) => {
+      previous != newObj
+    });
+  }
+
   module Styles = {
     open Style;
 
@@ -936,7 +944,12 @@ module View = {
             ? <Oni_Components.ScrollShadow.Bottom /> : React.empty;
 
         (
-          <View style=Style.[flexGrow(1), flexDirection(`Column)]>
+          <Layer 
+            key={model.key}
+            style=Style.[flexGrow(1), flexDirection(`Column)]
+            condition=LayerConditions.root(Obj.repr(model))
+            backgroundColor=Revery.Colors.black
+            >
             <View
               style=Style.[flexGrow(1), position(`Relative)]
               onDimensionsChanged={({height, width}) => {
@@ -973,7 +986,7 @@ module View = {
               dispatch={msg => dispatch(SearchContext(msg))}
               theme
             />
-          </View>,
+          </Layer>,
           hooks,
         );
       });

From e1c200c9a4e32f8ade209fbd96503eb2a0ece485 Mon Sep 17 00:00:00 2001
From: Bryan Phelps <bryphe@outrunlabs.com>
Date: Wed, 9 Dec 2020 13:11:15 -0800
Subject: [PATCH 11/21] Pick up background color for vim list

---
 src/Components/VimList/Component_VimList.re | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Components/VimList/Component_VimList.re b/src/Components/VimList/Component_VimList.re
index c328750b35..088fff10c0 100644
--- a/src/Components/VimList/Component_VimList.re
+++ b/src/Components/VimList/Component_VimList.re
@@ -948,7 +948,7 @@ module View = {
             key={model.key}
             style=Style.[flexGrow(1), flexDirection(`Column)]
             condition=LayerConditions.root(Obj.repr(model))
-            backgroundColor=Revery.Colors.black
+            backgroundColor=Feature_Theme.Colors.SideBar.background.from(theme)
             >
             <View
               style=Style.[flexGrow(1), position(`Relative)]

From a52ba7850c06419f7fd55e238e3f3ccb0402961c Mon Sep 17 00:00:00 2001
From: Bryan Phelps <bryphe@outrunlabs.com>
Date: Wed, 9 Dec 2020 13:49:27 -0800
Subject: [PATCH 12/21] Implemental experimental.ui.layers configuration
 setting

---
 .../Accordion/Component_Accordion.re          |  4 ++
 src/Components/ContextMenu.re                 |  2 +-
 .../FileExplorer/Component_FileExplorer.rei   |  1 +
 src/Components/FileExplorer/FileTreeView.re   |  4 +-
 src/Components/FileExplorer/View.re           |  2 +
 src/Components/FileIcon.re                    |  2 +-
 src/Components/OniLayer.re                    | 58 +++++++++++++++++++
 src/Components/VimList/Component_VimList.re   | 34 +++++++----
 src/Components/VimTree/Component_VimTree.re   |  2 +
 src/Components/VimTree/Component_VimTree.rei  |  1 +
 src/Components/dune                           |  4 +-
 src/Core/ConfigurationParser.re               |  6 +-
 .../Configuration/GlobalConfiguration.re      |  2 +
 src/Feature/Editor/Editor.re                  |  1 -
 src/Feature/Editor/Minimap.re                 |  6 +-
 src/Feature/Editor/SurfaceView.re             |  7 ++-
 src/Feature/Explorer/Feature_Explorer.re      |  3 +
 src/Feature/Explorer/Feature_Explorer.rei     |  1 +
 src/Feature/Extensions/Feature_Extensions.rei |  1 +
 src/Feature/Extensions/ListView.re            | 13 ++++-
 src/Feature/Layout/View.re                    |  2 +-
 src/Feature/Menus/Feature_Menus.re            |  4 +-
 src/Feature/Pane/DiagnosticsPaneView.re       |  2 +
 src/Feature/Pane/Feature_Pane.re              |  1 +
 src/Feature/Pane/LocationsPaneView.re         |  2 +
 src/Feature/Pane/NotificationsPaneView.re     |  2 +
 src/Feature/SCM/Feature_SCM.re                |  4 ++
 src/Feature/SCM/Feature_SCM.rei               |  1 +
 src/Feature/Search/Feature_Search.re          |  2 +
 src/Feature/Search/Feature_Search.rei         |  1 +
 src/Feature/StatusBar/Feature_StatusBar.re    |  2 +-
 src/Store/KeyBindingsStoreConnector.re        |  2 +-
 src/UI/SideBarView.re                         |  4 ++
 33 files changed, 153 insertions(+), 30 deletions(-)
 create mode 100644 src/Components/OniLayer.re

diff --git a/src/Components/Accordion/Component_Accordion.re b/src/Components/Accordion/Component_Accordion.re
index 73817334b5..c74d133ab8 100644
--- a/src/Components/Accordion/Component_Accordion.re
+++ b/src/Components/Accordion/Component_Accordion.re
@@ -135,6 +135,7 @@ module Common = {
 module VimList = {
   let make =
       (
+        ~config,
         ~showCount=true,
         ~title,
         ~expanded,
@@ -150,6 +151,7 @@ module VimList = {
     let count = Component_VimList.count(model);
     let contents =
       <Component_VimList.View
+        config
         font=uiFont
         isActive=isFocused
         focusedIndex=None
@@ -176,6 +178,7 @@ module VimList = {
 module VimTree = {
   let make =
       (
+        ~config,
         ~showCount=true,
         ~focusedIndex=None,
         ~title,
@@ -194,6 +197,7 @@ module VimTree = {
     let contents =
       count > 0
         ? <Component_VimTree.View
+            config
             isActive=isFocused
             font=uiFont
             focusedIndex
diff --git a/src/Components/ContextMenu.re b/src/Components/ContextMenu.re
index e0a9747b04..d276c9a976 100644
--- a/src/Components/ContextMenu.re
+++ b/src/Components/ContextMenu.re
@@ -137,7 +137,7 @@ module Menu = {
 
       let height =
         switch (maybeRef) {
-        | Some(node: node) => node#measurements().height
+        | Some((node: node)) => node#measurements().height
         | None => List.length(items) * 20
         };
       let width = Constants.menuWidth;
diff --git a/src/Components/FileExplorer/Component_FileExplorer.rei b/src/Components/FileExplorer/Component_FileExplorer.rei
index e44440ac53..8c5cba7a6d 100644
--- a/src/Components/FileExplorer/Component_FileExplorer.rei
+++ b/src/Components/FileExplorer/Component_FileExplorer.rei
@@ -43,6 +43,7 @@ let sub:
 module View: {
   let make:
     (
+      ~config: Oni_Core.Config.resolver,
       ~isFocused: bool,
       ~iconTheme: IconTheme.t,
       ~languageInfo: Exthost.LanguageInfo.t,
diff --git a/src/Components/FileExplorer/FileTreeView.re b/src/Components/FileExplorer/FileTreeView.re
index 33de0abc83..939b2b0a91 100644
--- a/src/Components/FileExplorer/FileTreeView.re
+++ b/src/Components/FileExplorer/FileTreeView.re
@@ -72,7 +72,7 @@ let nodeView =
   let tooltipText = {
     let path = node.path;
     switch (decoration) {
-    | Some(decoration: Feature_Decorations.Decoration.t) =>
+    | Some((decoration: Feature_Decorations.Decoration.t)) =>
       path ++ " • " ++ decoration.tooltip
     | None => path
     };
@@ -93,6 +93,7 @@ let getFileIcon = Model.getFileIcon;
 
 let make =
     (
+      ~config,
       ~rootName,
       ~isFocused,
       ~iconTheme,
@@ -110,6 +111,7 @@ let make =
       (),
     ) => {
   <Component_Accordion.VimTree
+    config
     title=rootName
     showCount=false
     isFocused
diff --git a/src/Components/FileExplorer/View.re b/src/Components/FileExplorer/View.re
index 938011a837..36a63ae216 100644
--- a/src/Components/FileExplorer/View.re
+++ b/src/Components/FileExplorer/View.re
@@ -2,6 +2,7 @@ open Revery.UI;
 
 let make =
     (
+      ~config,
       ~isFocused: bool,
       ~iconTheme,
       ~languageInfo,
@@ -18,6 +19,7 @@ let make =
   | {tree: Some(_), treeView, active, rootName, _} =>
     let focusedIndex = Model.getFocusedIndex(model);
     <FileTreeView
+      config
       rootName
       isFocused
       iconTheme
diff --git a/src/Components/FileIcon.re b/src/Components/FileIcon.re
index c4e876045f..30c6ae7e47 100644
--- a/src/Components/FileIcon.re
+++ b/src/Components/FileIcon.re
@@ -28,7 +28,7 @@ let setiIcon = (~icon, ~fontSize, ~fg, ()) => {
 let make = (~font: UiFont.t, ~iconTheme, ~languageInfo, ~path, ()) => {
   switch (getFileIcon(~iconTheme, ~languageInfo, path)) {
   | None => React.empty
-  | Some(icon: IconTheme.IconDefinition.t) =>
+  | Some((icon: IconTheme.IconDefinition.t)) =>
     <setiIcon
       fontSize={font.size}
       fg={icon.fontColor}
diff --git a/src/Components/OniLayer.re b/src/Components/OniLayer.re
new file mode 100644
index 0000000000..c468d4b9b8
--- /dev/null
+++ b/src/Components/OniLayer.re
@@ -0,0 +1,58 @@
+/*
+ * Label.re
+ *
+ * Container to help render Exthost.Label.t
+ */
+
+open Revery;
+open Revery.UI;
+open Oni_Core;
+
+let make =
+    (
+      ~key,
+      ~style,
+      ~condition,
+      ~backgroundColor,
+      ~config,
+      ~onMouseDown=?,
+      ~onMouseUp=?,
+      ~onMouseMove=?,
+      ~onMouseEnter=?,
+      ~onMouseLeave=?,
+      ~onMouseWheel=?,
+      ~onMouseOver=?,
+      ~onBoundingBoxChanged=?,
+      ~children,
+      (),
+    ) =>
+  if (Feature_Configuration.GlobalConfiguration.layers.get(config)) {
+    <Layer
+      key
+      style
+      condition
+      backgroundColor
+      ?onMouseDown
+      ?onMouseUp
+      ?onMouseMove
+      ?onMouseEnter
+      ?onMouseOver
+      ?onMouseLeave
+      ?onMouseWheel
+      ?onBoundingBoxChanged>
+      children
+    </Layer>;
+  } else {
+    <View
+      style
+      ?onMouseOver
+      ?onBoundingBoxChanged
+      ?onMouseDown
+      ?onMouseUp
+      ?onMouseMove
+      ?onMouseEnter
+      ?onMouseLeave
+      ?onMouseWheel>
+      children
+    </View>;
+  };
diff --git a/src/Components/VimList/Component_VimList.re b/src/Components/VimList/Component_VimList.re
index 088fff10c0..6807234690 100644
--- a/src/Components/VimList/Component_VimList.re
+++ b/src/Components/VimList/Component_VimList.re
@@ -672,10 +672,11 @@ module View = {
   };
 
   module LayerConditions = {
-    let root = Revery.UI.Layer.Condition.make((previous: Obj.t, newObj: Obj.t) => {
-      previous != newObj
-    });
-  }
+    let root =
+      Revery.UI.Layer.Condition.make((previous: Obj.t, newObj: Obj.t) => {
+        previous != newObj
+      });
+  };
 
   module Styles = {
     open Style;
@@ -812,6 +813,7 @@ module View = {
   let component = React.Expert.component("Component_VimList");
   let make:
     (
+      ~config: Oni_Core.Config.resolver,
       ~isActive: bool,
       ~font: UiFont.t,
       ~focusedIndex: option(int),
@@ -829,7 +831,17 @@ module View = {
       unit
     ) =>
     _ =
-    (~isActive, ~font, ~focusedIndex, ~theme, ~model, ~dispatch, ~render, ()) => {
+    (
+      ~config,
+      ~isActive,
+      ~font,
+      ~focusedIndex,
+      ~theme,
+      ~model,
+      ~dispatch,
+      ~render,
+      (),
+    ) => {
       component(hooks => {
         let {rowHeight, viewportWidth, viewportHeight, _} = model;
 
@@ -944,12 +956,14 @@ module View = {
             ? <Oni_Components.ScrollShadow.Bottom /> : React.empty;
 
         (
-          <Layer 
+          <Oni_Components.OniLayer
             key={model.key}
             style=Style.[flexGrow(1), flexDirection(`Column)]
-            condition=LayerConditions.root(Obj.repr(model))
-            backgroundColor=Feature_Theme.Colors.SideBar.background.from(theme)
-            >
+            condition={LayerConditions.root(Obj.repr(model))}
+            backgroundColor={
+              Feature_Theme.Colors.SideBar.background.from(theme)
+            }
+            config>
             <View
               style=Style.[flexGrow(1), position(`Relative)]
               onDimensionsChanged={({height, width}) => {
@@ -986,7 +1000,7 @@ module View = {
               dispatch={msg => dispatch(SearchContext(msg))}
               theme
             />
-          </Layer>,
+          </Oni_Components.OniLayer>,
           hooks,
         );
       });
diff --git a/src/Components/VimTree/Component_VimTree.re b/src/Components/VimTree/Component_VimTree.re
index f27f8b1691..bfc095bb05 100644
--- a/src/Components/VimTree/Component_VimTree.re
+++ b/src/Components/VimTree/Component_VimTree.re
@@ -452,6 +452,7 @@ module View = {
     </View>;
   let make =
       (
+        ~config,
         ~isActive,
         ~font,
         ~focusedIndex,
@@ -479,6 +480,7 @@ module View = {
     };
 
     <Component_VimList.View
+      config
       isActive
       font
       focusedIndex
diff --git a/src/Components/VimTree/Component_VimTree.rei b/src/Components/VimTree/Component_VimTree.rei
index 511f431a37..1c786cd194 100644
--- a/src/Components/VimTree/Component_VimTree.rei
+++ b/src/Components/VimTree/Component_VimTree.rei
@@ -77,6 +77,7 @@ module Contributions: {
 module View: {
   let make:
     (
+      ~config: Oni_Core.Config.resolver,
       ~isActive: bool,
       ~font: UiFont.t,
       ~focusedIndex: option(int),
diff --git a/src/Components/dune b/src/Components/dune
index ab97af108f..8fe274f2a2 100644
--- a/src/Components/dune
+++ b/src/Components/dune
@@ -5,5 +5,5 @@
   (pps brisk-reconciler.ppx ppx_deriving.show))
  (libraries str bigarray Revery.zed lwt lwt.unix Oni2.core Oni2.input
    Oni2.syntax Oni2.exthost Oni2.service.font Oni2.service.net
-   Oni2.feature.sneak Oni2.feature.theme Rench Revery Oni2.editor-core-types
-   isolinear))
+   Oni2.feature.configuration Oni2.feature.sneak Oni2.feature.theme Rench
+   Revery Oni2.editor-core-types isolinear))
diff --git a/src/Core/ConfigurationParser.re b/src/Core/ConfigurationParser.re
index 277d9c08cf..6c9d97edba 100644
--- a/src/Core/ConfigurationParser.re
+++ b/src/Core/ConfigurationParser.re
@@ -132,9 +132,9 @@ let parseFontLigatures = json =>
 
     let isAlphaNumeric = (
       fun
-      | 'a' .. 'z'
-      | 'A' .. 'Z'
-      | '0' .. '9' => true
+      | 'a'..'z'
+      | 'A'..'Z'
+      | '0'..'9' => true
       | _ => false
     );
 
diff --git a/src/Feature/Configuration/GlobalConfiguration.re b/src/Feature/Configuration/GlobalConfiguration.re
index 626f877b82..a92db6704a 100644
--- a/src/Feature/Configuration/GlobalConfiguration.re
+++ b/src/Feature/Configuration/GlobalConfiguration.re
@@ -40,3 +40,5 @@ let inactiveWindowOpacity =
 let animation = setting("ui.animation", bool, ~default=true);
 
 let contributions = [inactiveWindowOpacity.spec, animation.spec];
+
+let layers = setting("experimental.ui.layers", bool, ~default=false);
diff --git a/src/Feature/Editor/Editor.re b/src/Feature/Editor/Editor.re
index b14f520a17..908d9048fc 100644
--- a/src/Feature/Editor/Editor.re
+++ b/src/Feature/Editor/Editor.re
@@ -126,7 +126,6 @@ type t = {
   lastMouseScreenPosition: option(PixelPosition.t),
   lastMouseMoveTime: [@opaque] option(Revery.Time.t),
   lastMouseUpTime: [@opaque] option(Revery.Time.t),
-
   renderNonce: int,
 };
 
diff --git a/src/Feature/Editor/Minimap.re b/src/Feature/Editor/Minimap.re
index 7c36b7b634..d501f07d72 100644
--- a/src/Feature/Editor/Minimap.re
+++ b/src/Feature/Editor/Minimap.re
@@ -272,7 +272,9 @@ let%component make =
        })
     |> Option.value(~default=React.empty);
 
-  <Layer
+  <Oni_Components.OniLayer
+    key={Editor.key(editor)}
+    config
     backgroundColor
     condition={layerCondition(editor)}
     style={Styles.container(backgroundColor)}
@@ -515,5 +517,5 @@ let%component make =
       }}
     />
     yankHighlightElement
-  </Layer>;
+  </Oni_Components.OniLayer>;
 };
diff --git a/src/Feature/Editor/SurfaceView.re b/src/Feature/Editor/SurfaceView.re
index 07bde0bd42..dedc34a5d1 100644
--- a/src/Feature/Editor/SurfaceView.re
+++ b/src/Feature/Editor/SurfaceView.re
@@ -167,15 +167,16 @@ let%component make =
        )
     |> Option.value(~default=React.empty);
 
-  <Layer
+  <Oni_Components.OniLayer
+    config
     key={Editor.key(editor)}
     backgroundColor=Colors.(colors.editorBackground)
     condition={layerCondition(editor)}
-    onBoundingBoxChanged={bbox => maybeBbox := Some(bbox)}
     style={Styles.bufferViewClipped(
       gutterWidth,
       float(pixelWidth) -. gutterWidth,
     )}
+    onBoundingBoxChanged={bbox => maybeBbox := Some(bbox)}
     onMouseDown
     onMouseUp
     onMouseMove
@@ -263,5 +264,5 @@ let%component make =
       windowIsFocused
       colors
     />
-  </Layer>;
+  </Oni_Components.OniLayer>;
 };
diff --git a/src/Feature/Explorer/Feature_Explorer.re b/src/Feature/Explorer/Feature_Explorer.re
index 99b0a0e6f9..92bfb3b109 100644
--- a/src/Feature/Explorer/Feature_Explorer.re
+++ b/src/Feature/Explorer/Feature_Explorer.re
@@ -294,6 +294,7 @@ module View = {
   open Revery.UI;
   let%component make =
                 (
+                  ~config,
                   ~isFocused,
                   ~iconTheme,
                   ~languageInfo,
@@ -440,6 +441,7 @@ module View = {
 
       | Some(explorer) =>
         <Component_FileExplorer.View
+          config
           isFocused={isFocused && model.focus == FileExplorer}
           expanded={ExpandedState.isOpen(model.isFileExplorerExpanded)}
           iconTheme
@@ -456,6 +458,7 @@ module View = {
     <View style=Style.[flexDirection(`Column), flexGrow(1)]>
       explorerComponent
       <Component_Accordion.VimTree
+        config
         showCount=false
         title="Outline"
         expanded={ExpandedState.isOpen(model.isSymbolOutlineExpanded)}
diff --git a/src/Feature/Explorer/Feature_Explorer.rei b/src/Feature/Explorer/Feature_Explorer.rei
index c5711232bd..7bcec4a0f9 100644
--- a/src/Feature/Explorer/Feature_Explorer.rei
+++ b/src/Feature/Explorer/Feature_Explorer.rei
@@ -45,6 +45,7 @@ module View: {
   let make:
     (
       ~key: Brisk_reconciler.Key.t=?,
+      ~config: Oni_Core.Config.resolver,
       ~isFocused: bool,
       ~iconTheme: IconTheme.t,
       ~languageInfo: Exthost.LanguageInfo.t,
diff --git a/src/Feature/Extensions/Feature_Extensions.rei b/src/Feature/Extensions/Feature_Extensions.rei
index e3f8c40c72..414ec03fd4 100644
--- a/src/Feature/Extensions/Feature_Extensions.rei
+++ b/src/Feature/Extensions/Feature_Extensions.rei
@@ -78,6 +78,7 @@ module ListView: {
   let make:
     (
       ~key: Brisk_reconciler.Key.t=?,
+      ~config: Oni_Core.Config.resolver,
       ~model: model,
       ~theme: ColorTheme.Colors.t,
       ~font: UiFont.t,
diff --git a/src/Feature/Extensions/ListView.re b/src/Feature/Extensions/ListView.re
index 57472e79de..a7c2f8d634 100644
--- a/src/Feature/Extensions/ListView.re
+++ b/src/Feature/Extensions/ListView.re
@@ -112,7 +112,15 @@ let versionToString: option(Semver.t) => string =
   };
 
 let%component make =
-              (~model, ~theme, ~font: UiFont.t, ~isFocused, ~dispatch, ()) => {
+              (
+                ~config,
+                ~model,
+                ~theme,
+                ~font: UiFont.t,
+                ~isFocused,
+                ~dispatch,
+                (),
+              ) => {
   let%hook ({width, installedExpanded, bundledExpanded}, localDispatch) =
     Hooks.reducer(~initialState=default, reduce);
 
@@ -199,6 +207,7 @@ let%component make =
     if (Component_InputText.isEmpty(model.searchText)) {
       [
         <Component_Accordion.VimList
+          config
           title="Installed"
           expanded={installedExpanded || isInstalledFocused}
           model={Model.ViewModel.installed(model.viewModel)}
@@ -212,6 +221,7 @@ let%component make =
           onClick={_ => localDispatch(InstalledTitleClicked)}
         />,
         <Component_Accordion.VimList
+          config
           title="Bundled"
           expanded={bundledExpanded || isBundledFocused}
           model={Model.ViewModel.bundled(model.viewModel)}
@@ -229,6 +239,7 @@ let%component make =
     } else {
       let resultsList =
         <Component_VimList.View
+          config
           isActive={isInstalledFocused || isBundledFocused}
           font
           focusedIndex=None
diff --git a/src/Feature/Layout/View.re b/src/Feature/Layout/View.re
index bf335254ac..dc52e60bb9 100644
--- a/src/Feature/Layout/View.re
+++ b/src/Feature/Layout/View.re
@@ -172,7 +172,7 @@ module Tab = {
 
     let fileIconView =
       switch (icon) {
-      | Some(icon: IconTheme.IconDefinition.t) =>
+      | Some((icon: IconTheme.IconDefinition.t)) =>
         <FontIcon
           fontFamily={Revery.Font.Family.fromFile("seti.ttf")}
           icon={icon.fontCharacter}
diff --git a/src/Feature/Menus/Feature_Menus.re b/src/Feature/Menus/Feature_Menus.re
index e76d1d7f68..3c3de4513e 100644
--- a/src/Feature/Menus/Feature_Menus.re
+++ b/src/Feature/Menus/Feature_Menus.re
@@ -72,7 +72,7 @@ let commandPalette = (contextKeys, commands, menus: Menu.Lookup.t) => {
   StringMap.merge(
     (_id, commandItem, menuItem) =>
       switch (commandItem, menuItem) {
-      | (Some(_), Some(menuItem: Menu.item))
+      | (Some(_), Some((menuItem: Menu.item)))
           when
             WhenExpr.evaluate(
               menuItem.isVisibleWhen,
@@ -80,7 +80,7 @@ let commandPalette = (contextKeys, commands, menus: Menu.Lookup.t) => {
             ) =>
         None
 
-      | (Some(commandItem), Some(menuItem: Menu.item)) =>
+      | (Some(commandItem), Some((menuItem: Menu.item))) =>
         Some(
           Menu.{...commandItem, group: menuItem.group, index: menuItem.index},
         )
diff --git a/src/Feature/Pane/DiagnosticsPaneView.re b/src/Feature/Pane/DiagnosticsPaneView.re
index 3f841187dd..e2b2f46b21 100644
--- a/src/Feature/Pane/DiagnosticsPaneView.re
+++ b/src/Feature/Pane/DiagnosticsPaneView.re
@@ -32,6 +32,7 @@ module Styles = {
 
 let make =
     (
+      ~config,
       ~isFocused: bool,
       ~diagnosticsList: Component_VimTree.model(string, LocationListItem.t),
       ~theme,
@@ -54,6 +55,7 @@ let make =
       </View>;
     } else {
       <Component_VimTree.View
+        config
         font=uiFont
         isActive=isFocused
         focusedIndex=None
diff --git a/src/Feature/Pane/Feature_Pane.re b/src/Feature/Pane/Feature_Pane.re
index 8101c45ccd..bac8e2039d 100644
--- a/src/Feature/Pane/Feature_Pane.re
+++ b/src/Feature/Pane/Feature_Pane.re
@@ -763,6 +763,7 @@ module View = {
       </View>
       <View style=Styles.content>
         <content
+          config
           isFocused
           iconTheme
           languageInfo
diff --git a/src/Feature/Pane/LocationsPaneView.re b/src/Feature/Pane/LocationsPaneView.re
index b5ade19c09..ac75f169d7 100644
--- a/src/Feature/Pane/LocationsPaneView.re
+++ b/src/Feature/Pane/LocationsPaneView.re
@@ -38,6 +38,7 @@ module Styles = {
 
 let make =
     (
+      ~config,
       ~isFocused: bool,
       ~locationsList:
          Component_VimTree.model(location, Oni_Components.LocationListItem.t),
@@ -61,6 +62,7 @@ let make =
       </View>;
     } else {
       <Component_VimTree.View
+        config
         font=uiFont
         isActive=isFocused
         focusedIndex=None
diff --git a/src/Feature/Pane/NotificationsPaneView.re b/src/Feature/Pane/NotificationsPaneView.re
index bcb688f8c6..1d22b95dbc 100644
--- a/src/Feature/Pane/NotificationsPaneView.re
+++ b/src/Feature/Pane/NotificationsPaneView.re
@@ -31,6 +31,7 @@ module Styles = {
 
 let make =
     (
+      ~config,
       ~isFocused: bool,
       ~notificationsList:
          Component_VimList.model(Feature_Notification.notification),
@@ -52,6 +53,7 @@ let make =
       </View>;
     } else {
       <Component_VimList.View
+        config
         font=uiFont
         isActive=isFocused
         focusedIndex=None
diff --git a/src/Feature/SCM/Feature_SCM.re b/src/Feature/SCM/Feature_SCM.re
index e865777eef..d4570f5190 100644
--- a/src/Feature/SCM/Feature_SCM.re
+++ b/src/Feature/SCM/Feature_SCM.re
@@ -989,6 +989,7 @@ module Pane = {
 
   let groupView =
       (
+        ~config,
         ~provider,
         ~group: ResourceGroup.t,
         ~iconTheme,
@@ -1022,6 +1023,7 @@ module Pane = {
       />;
     };
     <Component_Accordion.VimList
+      config
       title=label
       expanded
       uiFont=font
@@ -1039,6 +1041,7 @@ module Pane = {
 
   let%component make =
                 (
+                  ~config,
                   ~model,
                   ~workingDirectory,
                   ~isFocused,
@@ -1081,6 +1084,7 @@ module Pane = {
               |> Option.value(~default=true);
 
             <groupView
+              config
               provider
               expanded
               group
diff --git a/src/Feature/SCM/Feature_SCM.rei b/src/Feature/SCM/Feature_SCM.rei
index 49d5b63fbe..c863efb41f 100644
--- a/src/Feature/SCM/Feature_SCM.rei
+++ b/src/Feature/SCM/Feature_SCM.rei
@@ -95,6 +95,7 @@ module Pane: {
   let make:
     (
       ~key: Brisk_reconciler.Key.t=?,
+      ~config: Oni_Core.Config.resolver,
       ~model: model,
       ~workingDirectory: string,
       ~isFocused: bool,
diff --git a/src/Feature/Search/Feature_Search.re b/src/Feature/Search/Feature_Search.re
index b9caf95bfe..5e3de8bf5f 100644
--- a/src/Feature/Search/Feature_Search.re
+++ b/src/Feature/Search/Feature_Search.re
@@ -257,6 +257,7 @@ module Styles = {
 
 let make =
     (
+      ~config,
       ~theme,
       ~uiFont: UiFont.t,
       ~iconTheme,
@@ -302,6 +303,7 @@ let make =
         text={Printf.sprintf("%n results", List.length(model.hits))}
       />
       <Component_VimTree.View
+        config
         isActive={isFocused && model.focus == ResultsPane}
         font=uiFont
         focusedIndex=None
diff --git a/src/Feature/Search/Feature_Search.rei b/src/Feature/Search/Feature_Search.rei
index 70ce825dd9..670a59b86f 100644
--- a/src/Feature/Search/Feature_Search.rei
+++ b/src/Feature/Search/Feature_Search.rei
@@ -32,6 +32,7 @@ let subscriptions:
 
 let make:
   (
+    ~config: Oni_Core.Config.resolver,
     ~theme: ColorTheme.Colors.t,
     ~uiFont: UiFont.t,
     ~iconTheme: IconTheme.t,
diff --git a/src/Feature/StatusBar/Feature_StatusBar.re b/src/Feature/StatusBar/Feature_StatusBar.re
index d0eaed2552..5d99b745b8 100644
--- a/src/Feature/StatusBar/Feature_StatusBar.re
+++ b/src/Feature/StatusBar/Feature_StatusBar.re
@@ -185,7 +185,7 @@ module Styles = {
 
 let positionToString =
   fun
-  | Some(loc: CharacterPosition.t) =>
+  | Some((loc: CharacterPosition.t)) =>
     Printf.sprintf(
       "%n,%n",
       EditorCoreTypes.LineNumber.toOneBased(loc.line),
diff --git a/src/Store/KeyBindingsStoreConnector.re b/src/Store/KeyBindingsStoreConnector.re
index b79330d6fc..a3d316e79d 100644
--- a/src/Store/KeyBindingsStoreConnector.re
+++ b/src/Store/KeyBindingsStoreConnector.re
@@ -114,7 +114,7 @@ let start = maybeKeyBindingsFilePath => {
         );
       } else {
         switch (Command.Lookup.get(command, CommandManager.current(state))) {
-        | Some(command: Command.t(_)) => (
+        | Some((command: Command.t(_))) => (
             state,
             executeCommandEffect(command.msg),
           )
diff --git a/src/UI/SideBarView.re b/src/UI/SideBarView.re
index 2927dada9f..4d5a97362b 100644
--- a/src/UI/SideBarView.re
+++ b/src/UI/SideBarView.re
@@ -83,6 +83,7 @@ let make = (~key=?, ~config, ~theme, ~state: State.t, ~dispatch, ()) => {
         | FileExplorer =>
           let dispatch = msg => dispatch(Actions.FileExplorer(msg));
           <Feature_Explorer.View
+            config
             isFocused={FocusManager.current(state) == Focus.FileExplorer}
             languageInfo={state.languageInfo}
             iconTheme={state.iconTheme}
@@ -97,6 +98,7 @@ let make = (~key=?, ~config, ~theme, ~state: State.t, ~dispatch, ()) => {
 
         | SCM =>
           <Feature_SCM.Pane
+            config
             model={state.scm}
             workingDirectory={Feature_Workspace.workingDirectory(
               state.workspace,
@@ -114,6 +116,7 @@ let make = (~key=?, ~config, ~theme, ~state: State.t, ~dispatch, ()) => {
             GlobalContext.current().dispatch(Actions.Search(msg));
 
           <Feature_Search
+            config
             isFocused={FocusManager.current(state) == Focus.Search}
             theme
             languageInfo={state.languageInfo}
@@ -129,6 +132,7 @@ let make = (~key=?, ~config, ~theme, ~state: State.t, ~dispatch, ()) => {
         | Extensions =>
           let extensionDispatch = msg => dispatch(Actions.Extensions(msg));
           <Feature_Extensions.ListView
+            config
             model={state.extensions}
             theme
             font

From 988e058de6170f19c40c7ac6ee2ccb133bfb8eef Mon Sep 17 00:00:00 2001
From: Bryan Phelps <bryphe@outrunlabs.com>
Date: Sat, 12 Dec 2020 10:30:21 -0800
Subject: [PATCH 13/21] Formatting

---
 src/Feature/Configuration/GlobalConfiguration.re | 2 +-
 src/Feature/Editor/Editor.re                     | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Feature/Configuration/GlobalConfiguration.re b/src/Feature/Configuration/GlobalConfiguration.re
index 07799a6570..5b7e4a8bab 100644
--- a/src/Feature/Configuration/GlobalConfiguration.re
+++ b/src/Feature/Configuration/GlobalConfiguration.re
@@ -47,5 +47,5 @@ let contributions = [
   inactiveWindowOpacity.spec,
   animation.spec,
   shadows.spec,
-  layers.spec
+  layers.spec,
 ];
diff --git a/src/Feature/Editor/Editor.re b/src/Feature/Editor/Editor.re
index b494af5b58..640a6077a3 100644
--- a/src/Feature/Editor/Editor.re
+++ b/src/Feature/Editor/Editor.re
@@ -127,10 +127,8 @@ type t = {
   lastMouseScreenPosition: option(PixelPosition.t),
   lastMouseMoveTime: [@opaque] option(Revery.Time.t),
   lastMouseUpTime: [@opaque] option(Revery.Time.t),
-
   // Layers
   renderNonce: int,
-
   // Animation
   isAnimationOverride: option(bool),
 };

From ecd39bfc465b30065a7c76e188e72d887495459a Mon Sep 17 00:00:00 2001
From: Bryan Phelps <bryphe@outrunlabs.com>
Date: Tue, 22 Dec 2020 12:43:59 -0800
Subject: [PATCH 14/21] Fix issues after merge

---
 src/Components/Output/Component_Output.re  | 2 ++
 src/Components/Output/Component_Output.rei | 1 +
 src/Feature/Pane/Feature_Pane.re           | 5 +++++
 3 files changed, 8 insertions(+)

diff --git a/src/Components/Output/Component_Output.re b/src/Components/Output/Component_Output.re
index f57c114a21..7f527b063a 100644
--- a/src/Components/Output/Component_Output.re
+++ b/src/Components/Output/Component_Output.re
@@ -69,6 +69,7 @@ module View = {
         ~editorFont: Service_Font.font,
         ~uiFont: UiFont.t,
         ~theme: ColorTheme.Colors.t,
+        ~config,
         ~model,
         ~dispatch,
         (),
@@ -77,6 +78,7 @@ module View = {
     let fg = Feature_Theme.Colors.Terminal.foreground.from(theme);
     <View style=Style.[backgroundColor(bg), flexGrow(1)]>
       <Component_VimList.View
+        config
         isActive
         font=uiFont
         focusedIndex=None
diff --git a/src/Components/Output/Component_Output.rei b/src/Components/Output/Component_Output.rei
index ea71708469..4d82650efc 100644
--- a/src/Components/Output/Component_Output.rei
+++ b/src/Components/Output/Component_Output.rei
@@ -45,6 +45,7 @@ module View: {
       ~editorFont: Service_Font.font,
       ~uiFont: UiFont.t,
       ~theme: ColorTheme.Colors.t,
+      ~config: Config.resolver,
       ~model: model,
       ~dispatch: msg => unit,
       unit
diff --git a/src/Feature/Pane/Feature_Pane.re b/src/Feature/Pane/Feature_Pane.re
index 58199f7c5e..60e606ff9e 100644
--- a/src/Feature/Pane/Feature_Pane.re
+++ b/src/Feature/Pane/Feature_Pane.re
@@ -652,6 +652,7 @@ module View = {
   };
   let content =
       (
+        ~config,
         ~isFocused,
         ~selected,
         ~theme,
@@ -675,6 +676,7 @@ module View = {
     switch (selected) {
     | Locations =>
       <LocationsPaneView
+        config
         isFocused
         locationsList
         iconTheme
@@ -687,6 +689,7 @@ module View = {
 
     | Diagnostics =>
       <DiagnosticsPaneView
+        config
         isFocused
         diagnosticsList
         iconTheme
@@ -698,6 +701,7 @@ module View = {
       />
     | Notifications =>
       <NotificationsPaneView
+        config
         isFocused
         notificationsList
         theme
@@ -716,6 +720,7 @@ module View = {
              editorFont
              uiFont
              theme
+             config
              dispatch=outputDispatch
            />
          })

From adb3f96906b49c104976172bdf026d83f9ebfb2b Mon Sep 17 00:00:00 2001
From: Bryan Phelps <bryphe@outrunlabs.com>
Date: Tue, 22 Dec 2020 13:04:15 -0800
Subject: [PATCH 15/21] Pick up resize optimization

---
 bench.esy.lock/index.json           | 14 +++++++-------
 esy.lock/index.json                 | 14 +++++++-------
 integrationtest.esy.lock/index.json | 14 +++++++-------
 package.json                        |  2 +-
 release.esy.lock/index.json         | 14 +++++++-------
 test.esy.lock/index.json            | 14 +++++++-------
 6 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/bench.esy.lock/index.json b/bench.esy.lock/index.json
index 4e7a3f958a..eeef586209 100644
--- a/bench.esy.lock/index.json
+++ b/bench.esy.lock/index.json
@@ -1,5 +1,5 @@
 {
-  "checksum": "ec8debddb879572da3ad9d410e8e94a1",
+  "checksum": "d78b825838caefb8daa88d0015fe1e70",
   "root": "Oni2@link-dev:./package.json",
   "node": {
     "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": {
@@ -118,7 +118,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "revery@github:revery-ui/revery#19467ad@d41d8cd9",
+        "revery@github:revery-ui/revery#0522bcd6@d41d8cd9",
         "isolinear@github:revery-ui/isolinear#53fc4eb@d41d8cd9",
         "@revery/timber@2.0.0@d41d8cd9",
         "@revery/esy-libvterm@1.0.3@d41d8cd9",
@@ -126,13 +126,13 @@
       ],
       "devDependencies": []
     },
-    "revery@github:revery-ui/revery#19467ad@d41d8cd9": {
-      "id": "revery@github:revery-ui/revery#19467ad@d41d8cd9",
+    "revery@github:revery-ui/revery#0522bcd6@d41d8cd9": {
+      "id": "revery@github:revery-ui/revery#0522bcd6@d41d8cd9",
       "name": "revery",
-      "version": "github:revery-ui/revery#19467ad",
+      "version": "github:revery-ui/revery#0522bcd6",
       "source": {
         "type": "install",
-        "source": [ "github:revery-ui/revery#19467ad" ]
+        "source": [ "github:revery-ui/revery#0522bcd6" ]
       },
       "overrides": [],
       "dependencies": [
@@ -995,7 +995,7 @@
       "overrides": [ "bench.json" ],
       "dependencies": [
         "revery-terminal@github:revery-ui/revery-terminal#a9cb168@d41d8cd9",
-        "revery@github:revery-ui/revery#19467ad@d41d8cd9",
+        "revery@github:revery-ui/revery#0522bcd6@d41d8cd9",
         "reperf@1.5.0@d41d8cd9",
         "rench@github:bryphe/rench#a976fe5@d41d8cd9",
         "refmterr@3.3.2@d41d8cd9",
diff --git a/esy.lock/index.json b/esy.lock/index.json
index 6dbffb53dc..d6c7c33537 100644
--- a/esy.lock/index.json
+++ b/esy.lock/index.json
@@ -1,5 +1,5 @@
 {
-  "checksum": "ec8debddb879572da3ad9d410e8e94a1",
+  "checksum": "d78b825838caefb8daa88d0015fe1e70",
   "root": "Oni2@link-dev:./package.json",
   "node": {
     "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": {
@@ -118,7 +118,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "revery@github:revery-ui/revery#19467ad@d41d8cd9",
+        "revery@github:revery-ui/revery#0522bcd6@d41d8cd9",
         "isolinear@github:revery-ui/isolinear#53fc4eb@d41d8cd9",
         "@revery/timber@2.0.0@d41d8cd9",
         "@revery/esy-libvterm@1.0.3@d41d8cd9",
@@ -126,13 +126,13 @@
       ],
       "devDependencies": []
     },
-    "revery@github:revery-ui/revery#19467ad@d41d8cd9": {
-      "id": "revery@github:revery-ui/revery#19467ad@d41d8cd9",
+    "revery@github:revery-ui/revery#0522bcd6@d41d8cd9": {
+      "id": "revery@github:revery-ui/revery#0522bcd6@d41d8cd9",
       "name": "revery",
-      "version": "github:revery-ui/revery#19467ad",
+      "version": "github:revery-ui/revery#0522bcd6",
       "source": {
         "type": "install",
-        "source": [ "github:revery-ui/revery#19467ad" ]
+        "source": [ "github:revery-ui/revery#0522bcd6" ]
       },
       "overrides": [],
       "dependencies": [
@@ -995,7 +995,7 @@
       "overrides": [],
       "dependencies": [
         "revery-terminal@github:revery-ui/revery-terminal#a9cb168@d41d8cd9",
-        "revery@github:revery-ui/revery#19467ad@d41d8cd9",
+        "revery@github:revery-ui/revery#0522bcd6@d41d8cd9",
         "rench@github:bryphe/rench#a976fe5@d41d8cd9",
         "refmterr@3.3.2@d41d8cd9",
         "reason-native-crash-utils@github:onivim/reason-native-crash-utils#38c8f00@d41d8cd9",
diff --git a/integrationtest.esy.lock/index.json b/integrationtest.esy.lock/index.json
index 840e5092ad..b2029259f9 100644
--- a/integrationtest.esy.lock/index.json
+++ b/integrationtest.esy.lock/index.json
@@ -1,5 +1,5 @@
 {
-  "checksum": "ec8debddb879572da3ad9d410e8e94a1",
+  "checksum": "d78b825838caefb8daa88d0015fe1e70",
   "root": "Oni2@link-dev:./package.json",
   "node": {
     "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": {
@@ -118,7 +118,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "revery@github:revery-ui/revery#19467ad@d41d8cd9",
+        "revery@github:revery-ui/revery#0522bcd6@d41d8cd9",
         "isolinear@github:revery-ui/isolinear#53fc4eb@d41d8cd9",
         "@revery/timber@2.0.0@d41d8cd9",
         "@revery/esy-libvterm@1.0.3@d41d8cd9",
@@ -126,13 +126,13 @@
       ],
       "devDependencies": []
     },
-    "revery@github:revery-ui/revery#19467ad@d41d8cd9": {
-      "id": "revery@github:revery-ui/revery#19467ad@d41d8cd9",
+    "revery@github:revery-ui/revery#0522bcd6@d41d8cd9": {
+      "id": "revery@github:revery-ui/revery#0522bcd6@d41d8cd9",
       "name": "revery",
-      "version": "github:revery-ui/revery#19467ad",
+      "version": "github:revery-ui/revery#0522bcd6",
       "source": {
         "type": "install",
-        "source": [ "github:revery-ui/revery#19467ad" ]
+        "source": [ "github:revery-ui/revery#0522bcd6" ]
       },
       "overrides": [],
       "dependencies": [
@@ -995,7 +995,7 @@
       "overrides": [ "integrationtest.json" ],
       "dependencies": [
         "revery-terminal@github:revery-ui/revery-terminal#a9cb168@d41d8cd9",
-        "revery@github:revery-ui/revery#19467ad@d41d8cd9",
+        "revery@github:revery-ui/revery#0522bcd6@d41d8cd9",
         "rench@github:bryphe/rench#a976fe5@d41d8cd9",
         "refmterr@3.3.2@d41d8cd9",
         "reason-native-crash-utils@github:onivim/reason-native-crash-utils#38c8f00@d41d8cd9",
diff --git a/package.json b/package.json
index 3ec087f2c3..cc0222a5e1 100644
--- a/package.json
+++ b/package.json
@@ -254,7 +254,7 @@
     "revery-terminal": "*"
   },
   "resolutions": {
-    "revery": "revery-ui/revery#19467ad",
+    "revery": "revery-ui/revery#0522bcd6",
     "esy-skia": "revery-ui/esy-skia#60e0260",
     "rench": "bryphe/rench#a976fe5",
     "isolinear": "revery-ui/isolinear#53fc4eb",
diff --git a/release.esy.lock/index.json b/release.esy.lock/index.json
index ce415dbc76..1620e48d35 100644
--- a/release.esy.lock/index.json
+++ b/release.esy.lock/index.json
@@ -1,5 +1,5 @@
 {
-  "checksum": "ec8debddb879572da3ad9d410e8e94a1",
+  "checksum": "d78b825838caefb8daa88d0015fe1e70",
   "root": "Oni2@link-dev:./package.json",
   "node": {
     "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": {
@@ -118,7 +118,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "revery@github:revery-ui/revery#19467ad@d41d8cd9",
+        "revery@github:revery-ui/revery#0522bcd6@d41d8cd9",
         "isolinear@github:revery-ui/isolinear#53fc4eb@d41d8cd9",
         "@revery/timber@2.0.0@d41d8cd9",
         "@revery/esy-libvterm@1.0.3@d41d8cd9",
@@ -126,13 +126,13 @@
       ],
       "devDependencies": []
     },
-    "revery@github:revery-ui/revery#19467ad@d41d8cd9": {
-      "id": "revery@github:revery-ui/revery#19467ad@d41d8cd9",
+    "revery@github:revery-ui/revery#0522bcd6@d41d8cd9": {
+      "id": "revery@github:revery-ui/revery#0522bcd6@d41d8cd9",
       "name": "revery",
-      "version": "github:revery-ui/revery#19467ad",
+      "version": "github:revery-ui/revery#0522bcd6",
       "source": {
         "type": "install",
-        "source": [ "github:revery-ui/revery#19467ad" ]
+        "source": [ "github:revery-ui/revery#0522bcd6" ]
       },
       "overrides": [],
       "dependencies": [
@@ -995,7 +995,7 @@
       "overrides": [ "release.json" ],
       "dependencies": [
         "revery-terminal@github:revery-ui/revery-terminal#a9cb168@d41d8cd9",
-        "revery@github:revery-ui/revery#19467ad@d41d8cd9",
+        "revery@github:revery-ui/revery#0522bcd6@d41d8cd9",
         "rench@github:bryphe/rench#a976fe5@d41d8cd9",
         "refmterr@3.3.2@d41d8cd9",
         "reason-native-crash-utils@github:onivim/reason-native-crash-utils#38c8f00@d41d8cd9",
diff --git a/test.esy.lock/index.json b/test.esy.lock/index.json
index d4bb7364d5..49f22a4742 100644
--- a/test.esy.lock/index.json
+++ b/test.esy.lock/index.json
@@ -1,5 +1,5 @@
 {
-  "checksum": "d22d177c9eb3af7e3d6ec55d7347be99",
+  "checksum": "0cee63e8dde82445073b659229488e8a",
   "root": "Oni2@link-dev:./package.json",
   "node": {
     "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": {
@@ -118,7 +118,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "revery@github:revery-ui/revery#19467ad@d41d8cd9",
+        "revery@github:revery-ui/revery#0522bcd6@d41d8cd9",
         "isolinear@github:revery-ui/isolinear#53fc4eb@d41d8cd9",
         "@revery/timber@2.0.0@d41d8cd9",
         "@revery/esy-libvterm@1.0.3@d41d8cd9",
@@ -126,13 +126,13 @@
       ],
       "devDependencies": []
     },
-    "revery@github:revery-ui/revery#19467ad@d41d8cd9": {
-      "id": "revery@github:revery-ui/revery#19467ad@d41d8cd9",
+    "revery@github:revery-ui/revery#0522bcd6@d41d8cd9": {
+      "id": "revery@github:revery-ui/revery#0522bcd6@d41d8cd9",
       "name": "revery",
-      "version": "github:revery-ui/revery#19467ad",
+      "version": "github:revery-ui/revery#0522bcd6",
       "source": {
         "type": "install",
-        "source": [ "github:revery-ui/revery#19467ad" ]
+        "source": [ "github:revery-ui/revery#0522bcd6" ]
       },
       "overrides": [],
       "dependencies": [
@@ -995,7 +995,7 @@
       "overrides": [ "test.json" ],
       "dependencies": [
         "revery-terminal@github:revery-ui/revery-terminal#a9cb168@d41d8cd9",
-        "revery@github:revery-ui/revery#19467ad@d41d8cd9",
+        "revery@github:revery-ui/revery#0522bcd6@d41d8cd9",
         "rench@github:bryphe/rench#a976fe5@d41d8cd9",
         "refmterr@3.3.2@d41d8cd9",
         "reason-native-crash-utils@github:onivim/reason-native-crash-utils#38c8f00@d41d8cd9",

From 2e353d7056b4e413bf64e1bc6cafbc2d9c34141b Mon Sep 17 00:00:00 2001
From: Bryan Phelps <bryphe@outrunlabs.com>
Date: Tue, 22 Dec 2020 13:28:41 -0800
Subject: [PATCH 16/21] Pick up high dpi fix

---
 bench.esy.lock/index.json           | 14 +++++++-------
 esy.lock/index.json                 | 14 +++++++-------
 integrationtest.esy.lock/index.json | 14 +++++++-------
 package.json                        |  2 +-
 release.esy.lock/index.json         | 14 +++++++-------
 test.esy.lock/index.json            | 14 +++++++-------
 6 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/bench.esy.lock/index.json b/bench.esy.lock/index.json
index eeef586209..ff82c80e2d 100644
--- a/bench.esy.lock/index.json
+++ b/bench.esy.lock/index.json
@@ -1,5 +1,5 @@
 {
-  "checksum": "d78b825838caefb8daa88d0015fe1e70",
+  "checksum": "4a6489cf2d38cb70d4ec12549b6fa24a",
   "root": "Oni2@link-dev:./package.json",
   "node": {
     "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": {
@@ -118,7 +118,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "revery@github:revery-ui/revery#0522bcd6@d41d8cd9",
+        "revery@github:revery-ui/revery#1be589e2@d41d8cd9",
         "isolinear@github:revery-ui/isolinear#53fc4eb@d41d8cd9",
         "@revery/timber@2.0.0@d41d8cd9",
         "@revery/esy-libvterm@1.0.3@d41d8cd9",
@@ -126,13 +126,13 @@
       ],
       "devDependencies": []
     },
-    "revery@github:revery-ui/revery#0522bcd6@d41d8cd9": {
-      "id": "revery@github:revery-ui/revery#0522bcd6@d41d8cd9",
+    "revery@github:revery-ui/revery#1be589e2@d41d8cd9": {
+      "id": "revery@github:revery-ui/revery#1be589e2@d41d8cd9",
       "name": "revery",
-      "version": "github:revery-ui/revery#0522bcd6",
+      "version": "github:revery-ui/revery#1be589e2",
       "source": {
         "type": "install",
-        "source": [ "github:revery-ui/revery#0522bcd6" ]
+        "source": [ "github:revery-ui/revery#1be589e2" ]
       },
       "overrides": [],
       "dependencies": [
@@ -995,7 +995,7 @@
       "overrides": [ "bench.json" ],
       "dependencies": [
         "revery-terminal@github:revery-ui/revery-terminal#a9cb168@d41d8cd9",
-        "revery@github:revery-ui/revery#0522bcd6@d41d8cd9",
+        "revery@github:revery-ui/revery#1be589e2@d41d8cd9",
         "reperf@1.5.0@d41d8cd9",
         "rench@github:bryphe/rench#a976fe5@d41d8cd9",
         "refmterr@3.3.2@d41d8cd9",
diff --git a/esy.lock/index.json b/esy.lock/index.json
index d6c7c33537..f5c1389b75 100644
--- a/esy.lock/index.json
+++ b/esy.lock/index.json
@@ -1,5 +1,5 @@
 {
-  "checksum": "d78b825838caefb8daa88d0015fe1e70",
+  "checksum": "4a6489cf2d38cb70d4ec12549b6fa24a",
   "root": "Oni2@link-dev:./package.json",
   "node": {
     "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": {
@@ -118,7 +118,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "revery@github:revery-ui/revery#0522bcd6@d41d8cd9",
+        "revery@github:revery-ui/revery#1be589e2@d41d8cd9",
         "isolinear@github:revery-ui/isolinear#53fc4eb@d41d8cd9",
         "@revery/timber@2.0.0@d41d8cd9",
         "@revery/esy-libvterm@1.0.3@d41d8cd9",
@@ -126,13 +126,13 @@
       ],
       "devDependencies": []
     },
-    "revery@github:revery-ui/revery#0522bcd6@d41d8cd9": {
-      "id": "revery@github:revery-ui/revery#0522bcd6@d41d8cd9",
+    "revery@github:revery-ui/revery#1be589e2@d41d8cd9": {
+      "id": "revery@github:revery-ui/revery#1be589e2@d41d8cd9",
       "name": "revery",
-      "version": "github:revery-ui/revery#0522bcd6",
+      "version": "github:revery-ui/revery#1be589e2",
       "source": {
         "type": "install",
-        "source": [ "github:revery-ui/revery#0522bcd6" ]
+        "source": [ "github:revery-ui/revery#1be589e2" ]
       },
       "overrides": [],
       "dependencies": [
@@ -995,7 +995,7 @@
       "overrides": [],
       "dependencies": [
         "revery-terminal@github:revery-ui/revery-terminal#a9cb168@d41d8cd9",
-        "revery@github:revery-ui/revery#0522bcd6@d41d8cd9",
+        "revery@github:revery-ui/revery#1be589e2@d41d8cd9",
         "rench@github:bryphe/rench#a976fe5@d41d8cd9",
         "refmterr@3.3.2@d41d8cd9",
         "reason-native-crash-utils@github:onivim/reason-native-crash-utils#38c8f00@d41d8cd9",
diff --git a/integrationtest.esy.lock/index.json b/integrationtest.esy.lock/index.json
index b2029259f9..89fceb8532 100644
--- a/integrationtest.esy.lock/index.json
+++ b/integrationtest.esy.lock/index.json
@@ -1,5 +1,5 @@
 {
-  "checksum": "d78b825838caefb8daa88d0015fe1e70",
+  "checksum": "4a6489cf2d38cb70d4ec12549b6fa24a",
   "root": "Oni2@link-dev:./package.json",
   "node": {
     "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": {
@@ -118,7 +118,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "revery@github:revery-ui/revery#0522bcd6@d41d8cd9",
+        "revery@github:revery-ui/revery#1be589e2@d41d8cd9",
         "isolinear@github:revery-ui/isolinear#53fc4eb@d41d8cd9",
         "@revery/timber@2.0.0@d41d8cd9",
         "@revery/esy-libvterm@1.0.3@d41d8cd9",
@@ -126,13 +126,13 @@
       ],
       "devDependencies": []
     },
-    "revery@github:revery-ui/revery#0522bcd6@d41d8cd9": {
-      "id": "revery@github:revery-ui/revery#0522bcd6@d41d8cd9",
+    "revery@github:revery-ui/revery#1be589e2@d41d8cd9": {
+      "id": "revery@github:revery-ui/revery#1be589e2@d41d8cd9",
       "name": "revery",
-      "version": "github:revery-ui/revery#0522bcd6",
+      "version": "github:revery-ui/revery#1be589e2",
       "source": {
         "type": "install",
-        "source": [ "github:revery-ui/revery#0522bcd6" ]
+        "source": [ "github:revery-ui/revery#1be589e2" ]
       },
       "overrides": [],
       "dependencies": [
@@ -995,7 +995,7 @@
       "overrides": [ "integrationtest.json" ],
       "dependencies": [
         "revery-terminal@github:revery-ui/revery-terminal#a9cb168@d41d8cd9",
-        "revery@github:revery-ui/revery#0522bcd6@d41d8cd9",
+        "revery@github:revery-ui/revery#1be589e2@d41d8cd9",
         "rench@github:bryphe/rench#a976fe5@d41d8cd9",
         "refmterr@3.3.2@d41d8cd9",
         "reason-native-crash-utils@github:onivim/reason-native-crash-utils#38c8f00@d41d8cd9",
diff --git a/package.json b/package.json
index cc0222a5e1..3a89f5fad6 100644
--- a/package.json
+++ b/package.json
@@ -254,7 +254,7 @@
     "revery-terminal": "*"
   },
   "resolutions": {
-    "revery": "revery-ui/revery#0522bcd6",
+    "revery": "revery-ui/revery#1be589e2",
     "esy-skia": "revery-ui/esy-skia#60e0260",
     "rench": "bryphe/rench#a976fe5",
     "isolinear": "revery-ui/isolinear#53fc4eb",
diff --git a/release.esy.lock/index.json b/release.esy.lock/index.json
index 1620e48d35..4d2305598d 100644
--- a/release.esy.lock/index.json
+++ b/release.esy.lock/index.json
@@ -1,5 +1,5 @@
 {
-  "checksum": "d78b825838caefb8daa88d0015fe1e70",
+  "checksum": "4a6489cf2d38cb70d4ec12549b6fa24a",
   "root": "Oni2@link-dev:./package.json",
   "node": {
     "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": {
@@ -118,7 +118,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "revery@github:revery-ui/revery#0522bcd6@d41d8cd9",
+        "revery@github:revery-ui/revery#1be589e2@d41d8cd9",
         "isolinear@github:revery-ui/isolinear#53fc4eb@d41d8cd9",
         "@revery/timber@2.0.0@d41d8cd9",
         "@revery/esy-libvterm@1.0.3@d41d8cd9",
@@ -126,13 +126,13 @@
       ],
       "devDependencies": []
     },
-    "revery@github:revery-ui/revery#0522bcd6@d41d8cd9": {
-      "id": "revery@github:revery-ui/revery#0522bcd6@d41d8cd9",
+    "revery@github:revery-ui/revery#1be589e2@d41d8cd9": {
+      "id": "revery@github:revery-ui/revery#1be589e2@d41d8cd9",
       "name": "revery",
-      "version": "github:revery-ui/revery#0522bcd6",
+      "version": "github:revery-ui/revery#1be589e2",
       "source": {
         "type": "install",
-        "source": [ "github:revery-ui/revery#0522bcd6" ]
+        "source": [ "github:revery-ui/revery#1be589e2" ]
       },
       "overrides": [],
       "dependencies": [
@@ -995,7 +995,7 @@
       "overrides": [ "release.json" ],
       "dependencies": [
         "revery-terminal@github:revery-ui/revery-terminal#a9cb168@d41d8cd9",
-        "revery@github:revery-ui/revery#0522bcd6@d41d8cd9",
+        "revery@github:revery-ui/revery#1be589e2@d41d8cd9",
         "rench@github:bryphe/rench#a976fe5@d41d8cd9",
         "refmterr@3.3.2@d41d8cd9",
         "reason-native-crash-utils@github:onivim/reason-native-crash-utils#38c8f00@d41d8cd9",
diff --git a/test.esy.lock/index.json b/test.esy.lock/index.json
index 49f22a4742..c9e3223389 100644
--- a/test.esy.lock/index.json
+++ b/test.esy.lock/index.json
@@ -1,5 +1,5 @@
 {
-  "checksum": "0cee63e8dde82445073b659229488e8a",
+  "checksum": "23f670687126f7ac41fed9dbcc174723",
   "root": "Oni2@link-dev:./package.json",
   "node": {
     "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": {
@@ -118,7 +118,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "revery@github:revery-ui/revery#0522bcd6@d41d8cd9",
+        "revery@github:revery-ui/revery#1be589e2@d41d8cd9",
         "isolinear@github:revery-ui/isolinear#53fc4eb@d41d8cd9",
         "@revery/timber@2.0.0@d41d8cd9",
         "@revery/esy-libvterm@1.0.3@d41d8cd9",
@@ -126,13 +126,13 @@
       ],
       "devDependencies": []
     },
-    "revery@github:revery-ui/revery#0522bcd6@d41d8cd9": {
-      "id": "revery@github:revery-ui/revery#0522bcd6@d41d8cd9",
+    "revery@github:revery-ui/revery#1be589e2@d41d8cd9": {
+      "id": "revery@github:revery-ui/revery#1be589e2@d41d8cd9",
       "name": "revery",
-      "version": "github:revery-ui/revery#0522bcd6",
+      "version": "github:revery-ui/revery#1be589e2",
       "source": {
         "type": "install",
-        "source": [ "github:revery-ui/revery#0522bcd6" ]
+        "source": [ "github:revery-ui/revery#1be589e2" ]
       },
       "overrides": [],
       "dependencies": [
@@ -995,7 +995,7 @@
       "overrides": [ "test.json" ],
       "dependencies": [
         "revery-terminal@github:revery-ui/revery-terminal#a9cb168@d41d8cd9",
-        "revery@github:revery-ui/revery#0522bcd6@d41d8cd9",
+        "revery@github:revery-ui/revery#1be589e2@d41d8cd9",
         "rench@github:bryphe/rench#a976fe5@d41d8cd9",
         "refmterr@3.3.2@d41d8cd9",
         "reason-native-crash-utils@github:onivim/reason-native-crash-utils#38c8f00@d41d8cd9",

From 3e3b3a13934f0485cdf81b1cc3b6a5f2be50d578 Mon Sep 17 00:00:00 2001
From: Bryan Phelps <bryphe@outrunlabs.com>
Date: Tue, 22 Dec 2020 13:52:04 -0800
Subject: [PATCH 17/21] Add scrollY as condition for vimlist

---
 src/Components/VimList/Component_VimList.re | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Components/VimList/Component_VimList.re b/src/Components/VimList/Component_VimList.re
index 73c5d759f5..43e041ffd9 100644
--- a/src/Components/VimList/Component_VimList.re
+++ b/src/Components/VimList/Component_VimList.re
@@ -691,7 +691,8 @@ module View = {
 
   module LayerConditions = {
     let root =
-      Revery.UI.Layer.Condition.make((previous: Obj.t, newObj: Obj.t) => {
+      Revery.UI.Layer.Condition.make(
+        (previous: (float, Obj.t), newObj: (float, Obj.t)) => {
         previous != newObj
       });
   };
@@ -977,7 +978,7 @@ module View = {
           <Oni_Components.OniLayer
             key={model.key}
             style=Style.[flexGrow(1), flexDirection(`Column)]
-            condition={LayerConditions.root(Obj.repr(model))}
+            condition={LayerConditions.root((scrollY, Obj.repr(model)))}
             backgroundColor={
               Feature_Theme.Colors.SideBar.background.from(theme)
             }

From c3c4b1a783c9f8f217ae780797d5febf550c1701 Mon Sep 17 00:00:00 2001
From: Bryan Phelps <bryphe@outrunlabs.com>
Date: Fri, 29 Jan 2021 17:00:53 -0800
Subject: [PATCH 18/21] Update lockfiles

---
 bench.esy.lock/index.json           | 14 +++++++-------
 esy.lock/index.json                 | 14 +++++++-------
 integrationtest.esy.lock/index.json | 14 +++++++-------
 release.esy.lock/index.json         | 14 +++++++-------
 test.esy.lock/index.json            | 14 +++++++-------
 5 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/bench.esy.lock/index.json b/bench.esy.lock/index.json
index f4f6a2ccd6..b42c721b3f 100644
--- a/bench.esy.lock/index.json
+++ b/bench.esy.lock/index.json
@@ -1,5 +1,5 @@
 {
-  "checksum": "c0c492ffdbdf69a629c8ac01d427079b",
+  "checksum": "b3f4b826e8ba47682d4f97a165faa49e",
   "root": "Oni2@link-dev:./package.json",
   "node": {
     "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": {
@@ -118,7 +118,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "revery@github:revery-ui/revery#0c3be5dd@d41d8cd9",
+        "revery@github:revery-ui/revery#ede4175c@d41d8cd9",
         "isolinear@github:revery-ui/isolinear#53fc4eb@d41d8cd9",
         "@revery/timber@2.0.0@d41d8cd9",
         "@revery/esy-libvterm@1.0.3@d41d8cd9",
@@ -126,13 +126,13 @@
       ],
       "devDependencies": []
     },
-    "revery@github:revery-ui/revery#0c3be5dd@d41d8cd9": {
-      "id": "revery@github:revery-ui/revery#0c3be5dd@d41d8cd9",
+    "revery@github:revery-ui/revery#ede4175c@d41d8cd9": {
+      "id": "revery@github:revery-ui/revery#ede4175c@d41d8cd9",
       "name": "revery",
-      "version": "github:revery-ui/revery#0c3be5dd",
+      "version": "github:revery-ui/revery#ede4175c",
       "source": {
         "type": "install",
-        "source": [ "github:revery-ui/revery#0c3be5dd" ]
+        "source": [ "github:revery-ui/revery#ede4175c" ]
       },
       "overrides": [],
       "dependencies": [
@@ -996,7 +996,7 @@
       "overrides": [ "bench.json" ],
       "dependencies": [
         "revery-terminal@github:revery-ui/revery-terminal#a9cb168@d41d8cd9",
-        "revery@github:revery-ui/revery#0c3be5dd@d41d8cd9",
+        "revery@github:revery-ui/revery#ede4175c@d41d8cd9",
         "reperf@1.5.0@d41d8cd9",
         "rench@github:bryphe/rench#a976fe5@d41d8cd9",
         "refmterr@3.3.2@d41d8cd9",
diff --git a/esy.lock/index.json b/esy.lock/index.json
index 94873b7069..2c00cc6b5a 100644
--- a/esy.lock/index.json
+++ b/esy.lock/index.json
@@ -1,5 +1,5 @@
 {
-  "checksum": "c0c492ffdbdf69a629c8ac01d427079b",
+  "checksum": "b3f4b826e8ba47682d4f97a165faa49e",
   "root": "Oni2@link-dev:./package.json",
   "node": {
     "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": {
@@ -118,7 +118,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "revery@github:revery-ui/revery#0c3be5dd@d41d8cd9",
+        "revery@github:revery-ui/revery#ede4175c@d41d8cd9",
         "isolinear@github:revery-ui/isolinear#53fc4eb@d41d8cd9",
         "@revery/timber@2.0.0@d41d8cd9",
         "@revery/esy-libvterm@1.0.3@d41d8cd9",
@@ -126,13 +126,13 @@
       ],
       "devDependencies": []
     },
-    "revery@github:revery-ui/revery#0c3be5dd@d41d8cd9": {
-      "id": "revery@github:revery-ui/revery#0c3be5dd@d41d8cd9",
+    "revery@github:revery-ui/revery#ede4175c@d41d8cd9": {
+      "id": "revery@github:revery-ui/revery#ede4175c@d41d8cd9",
       "name": "revery",
-      "version": "github:revery-ui/revery#0c3be5dd",
+      "version": "github:revery-ui/revery#ede4175c",
       "source": {
         "type": "install",
-        "source": [ "github:revery-ui/revery#0c3be5dd" ]
+        "source": [ "github:revery-ui/revery#ede4175c" ]
       },
       "overrides": [],
       "dependencies": [
@@ -996,7 +996,7 @@
       "overrides": [],
       "dependencies": [
         "revery-terminal@github:revery-ui/revery-terminal#a9cb168@d41d8cd9",
-        "revery@github:revery-ui/revery#0c3be5dd@d41d8cd9",
+        "revery@github:revery-ui/revery#ede4175c@d41d8cd9",
         "rench@github:bryphe/rench#a976fe5@d41d8cd9",
         "refmterr@3.3.2@d41d8cd9",
         "reason-native-crash-utils@github:onivim/reason-native-crash-utils#38c8f00@d41d8cd9",
diff --git a/integrationtest.esy.lock/index.json b/integrationtest.esy.lock/index.json
index 567348035a..1792bface6 100644
--- a/integrationtest.esy.lock/index.json
+++ b/integrationtest.esy.lock/index.json
@@ -1,5 +1,5 @@
 {
-  "checksum": "c0c492ffdbdf69a629c8ac01d427079b",
+  "checksum": "b3f4b826e8ba47682d4f97a165faa49e",
   "root": "Oni2@link-dev:./package.json",
   "node": {
     "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": {
@@ -118,7 +118,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "revery@github:revery-ui/revery#0c3be5dd@d41d8cd9",
+        "revery@github:revery-ui/revery#ede4175c@d41d8cd9",
         "isolinear@github:revery-ui/isolinear#53fc4eb@d41d8cd9",
         "@revery/timber@2.0.0@d41d8cd9",
         "@revery/esy-libvterm@1.0.3@d41d8cd9",
@@ -126,13 +126,13 @@
       ],
       "devDependencies": []
     },
-    "revery@github:revery-ui/revery#0c3be5dd@d41d8cd9": {
-      "id": "revery@github:revery-ui/revery#0c3be5dd@d41d8cd9",
+    "revery@github:revery-ui/revery#ede4175c@d41d8cd9": {
+      "id": "revery@github:revery-ui/revery#ede4175c@d41d8cd9",
       "name": "revery",
-      "version": "github:revery-ui/revery#0c3be5dd",
+      "version": "github:revery-ui/revery#ede4175c",
       "source": {
         "type": "install",
-        "source": [ "github:revery-ui/revery#0c3be5dd" ]
+        "source": [ "github:revery-ui/revery#ede4175c" ]
       },
       "overrides": [],
       "dependencies": [
@@ -996,7 +996,7 @@
       "overrides": [ "integrationtest.json" ],
       "dependencies": [
         "revery-terminal@github:revery-ui/revery-terminal#a9cb168@d41d8cd9",
-        "revery@github:revery-ui/revery#0c3be5dd@d41d8cd9",
+        "revery@github:revery-ui/revery#ede4175c@d41d8cd9",
         "rench@github:bryphe/rench#a976fe5@d41d8cd9",
         "refmterr@3.3.2@d41d8cd9",
         "reason-native-crash-utils@github:onivim/reason-native-crash-utils#38c8f00@d41d8cd9",
diff --git a/release.esy.lock/index.json b/release.esy.lock/index.json
index 4d7f151a0a..f30f05e84f 100644
--- a/release.esy.lock/index.json
+++ b/release.esy.lock/index.json
@@ -1,5 +1,5 @@
 {
-  "checksum": "c0c492ffdbdf69a629c8ac01d427079b",
+  "checksum": "b3f4b826e8ba47682d4f97a165faa49e",
   "root": "Oni2@link-dev:./package.json",
   "node": {
     "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": {
@@ -118,7 +118,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "revery@github:revery-ui/revery#0c3be5dd@d41d8cd9",
+        "revery@github:revery-ui/revery#ede4175c@d41d8cd9",
         "isolinear@github:revery-ui/isolinear#53fc4eb@d41d8cd9",
         "@revery/timber@2.0.0@d41d8cd9",
         "@revery/esy-libvterm@1.0.3@d41d8cd9",
@@ -126,13 +126,13 @@
       ],
       "devDependencies": []
     },
-    "revery@github:revery-ui/revery#0c3be5dd@d41d8cd9": {
-      "id": "revery@github:revery-ui/revery#0c3be5dd@d41d8cd9",
+    "revery@github:revery-ui/revery#ede4175c@d41d8cd9": {
+      "id": "revery@github:revery-ui/revery#ede4175c@d41d8cd9",
       "name": "revery",
-      "version": "github:revery-ui/revery#0c3be5dd",
+      "version": "github:revery-ui/revery#ede4175c",
       "source": {
         "type": "install",
-        "source": [ "github:revery-ui/revery#0c3be5dd" ]
+        "source": [ "github:revery-ui/revery#ede4175c" ]
       },
       "overrides": [],
       "dependencies": [
@@ -996,7 +996,7 @@
       "overrides": [ "release.json" ],
       "dependencies": [
         "revery-terminal@github:revery-ui/revery-terminal#a9cb168@d41d8cd9",
-        "revery@github:revery-ui/revery#0c3be5dd@d41d8cd9",
+        "revery@github:revery-ui/revery#ede4175c@d41d8cd9",
         "rench@github:bryphe/rench#a976fe5@d41d8cd9",
         "refmterr@3.3.2@d41d8cd9",
         "reason-native-crash-utils@github:onivim/reason-native-crash-utils#38c8f00@d41d8cd9",
diff --git a/test.esy.lock/index.json b/test.esy.lock/index.json
index 542090b148..81026c1a08 100644
--- a/test.esy.lock/index.json
+++ b/test.esy.lock/index.json
@@ -1,5 +1,5 @@
 {
-  "checksum": "9df68a1a0e664fe73be6c4ac681465e0",
+  "checksum": "9ef830acc3062423558e2c377f05ee2d",
   "root": "Oni2@link-dev:./package.json",
   "node": {
     "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": {
@@ -118,7 +118,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "revery@github:revery-ui/revery#0c3be5dd@d41d8cd9",
+        "revery@github:revery-ui/revery#ede4175c@d41d8cd9",
         "isolinear@github:revery-ui/isolinear#53fc4eb@d41d8cd9",
         "@revery/timber@2.0.0@d41d8cd9",
         "@revery/esy-libvterm@1.0.3@d41d8cd9",
@@ -126,13 +126,13 @@
       ],
       "devDependencies": []
     },
-    "revery@github:revery-ui/revery#0c3be5dd@d41d8cd9": {
-      "id": "revery@github:revery-ui/revery#0c3be5dd@d41d8cd9",
+    "revery@github:revery-ui/revery#ede4175c@d41d8cd9": {
+      "id": "revery@github:revery-ui/revery#ede4175c@d41d8cd9",
       "name": "revery",
-      "version": "github:revery-ui/revery#0c3be5dd",
+      "version": "github:revery-ui/revery#ede4175c",
       "source": {
         "type": "install",
-        "source": [ "github:revery-ui/revery#0c3be5dd" ]
+        "source": [ "github:revery-ui/revery#ede4175c" ]
       },
       "overrides": [],
       "dependencies": [
@@ -996,7 +996,7 @@
       "overrides": [ "test.json" ],
       "dependencies": [
         "revery-terminal@github:revery-ui/revery-terminal#a9cb168@d41d8cd9",
-        "revery@github:revery-ui/revery#0c3be5dd@d41d8cd9",
+        "revery@github:revery-ui/revery#ede4175c@d41d8cd9",
         "rench@github:bryphe/rench#a976fe5@d41d8cd9",
         "refmterr@3.3.2@d41d8cd9",
         "reason-native-crash-utils@github:onivim/reason-native-crash-utils#38c8f00@d41d8cd9",

From 201bdbe5933aeb4b26d4c2bfeabd000b48db83a0 Mon Sep 17 00:00:00 2001
From: Bryan Phelps <bryphe@outrunlabs.com>
Date: Fri, 5 Feb 2021 14:58:06 -0800
Subject: [PATCH 19/21] Add theme check for layer condition in vimlist

---
 src/Components/VimList/Component_VimList.re | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Components/VimList/Component_VimList.re b/src/Components/VimList/Component_VimList.re
index 97c6482623..1413654693 100644
--- a/src/Components/VimList/Component_VimList.re
+++ b/src/Components/VimList/Component_VimList.re
@@ -765,8 +765,11 @@ module View = {
   module LayerConditions = {
     let root =
       Revery.UI.Layer.Condition.make(
-        (previous: (float, Obj.t), newObj: (float, Obj.t)) => {
-        previous != newObj
+        (previous: (ColorTheme.Colors.t, float, Obj.t), newObj: (ColorTheme.Colors.t, float, Obj.t)) => {
+        let (previousTheme, previousScrollY, previousModel) = previous;
+        let (newTheme, newScrollY, newModel) = newObj;
+
+        newModel != previousModel || newScrollY != previousScrollY || !ColorTheme.Colors.equal(previousTheme, newTheme)
       });
   };
 
@@ -1058,7 +1061,7 @@ module View = {
           <Oni_Components.OniLayer
             key={model.key}
             style=Style.[flexGrow(1), flexDirection(`Column)]
-            condition={LayerConditions.root((scrollY, Obj.repr(model)))}
+            condition={LayerConditions.root((theme, scrollY, Obj.repr(model)))}
             backgroundColor={
               Feature_Theme.Colors.SideBar.background.from(theme)
             }

From 89a5d1410652cf2465702a4cdcd62a87fc4b7087 Mon Sep 17 00:00:00 2001
From: Bryan Phelps <bryphe@outrunlabs.com>
Date: Fri, 5 Feb 2021 15:04:52 -0800
Subject: [PATCH 20/21] Fix warnings

---
 src/Components/OniLayer.re                  |  2 --
 src/Components/VimList/Component_VimList.re | 15 ++++++++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/Components/OniLayer.re b/src/Components/OniLayer.re
index c468d4b9b8..beb37445bc 100644
--- a/src/Components/OniLayer.re
+++ b/src/Components/OniLayer.re
@@ -4,9 +4,7 @@
  * Container to help render Exthost.Label.t
  */
 
-open Revery;
 open Revery.UI;
-open Oni_Core;
 
 let make =
     (
diff --git a/src/Components/VimList/Component_VimList.re b/src/Components/VimList/Component_VimList.re
index 1413654693..b3071d2fd3 100644
--- a/src/Components/VimList/Component_VimList.re
+++ b/src/Components/VimList/Component_VimList.re
@@ -765,11 +765,16 @@ module View = {
   module LayerConditions = {
     let root =
       Revery.UI.Layer.Condition.make(
-        (previous: (ColorTheme.Colors.t, float, Obj.t), newObj: (ColorTheme.Colors.t, float, Obj.t)) => {
+        (
+          previous: (ColorTheme.Colors.t, float, Obj.t),
+          newObj: (ColorTheme.Colors.t, float, Obj.t),
+        ) => {
         let (previousTheme, previousScrollY, previousModel) = previous;
         let (newTheme, newScrollY, newModel) = newObj;
 
-        newModel != previousModel || newScrollY != previousScrollY || !ColorTheme.Colors.equal(previousTheme, newTheme)
+        newModel != previousModel
+        || newScrollY != previousScrollY
+        || !ColorTheme.Colors.equal(previousTheme, newTheme);
       });
   };
 
@@ -1061,7 +1066,11 @@ module View = {
           <Oni_Components.OniLayer
             key={model.key}
             style=Style.[flexGrow(1), flexDirection(`Column)]
-            condition={LayerConditions.root((theme, scrollY, Obj.repr(model)))}
+            condition={LayerConditions.root((
+              theme,
+              scrollY,
+              Obj.repr(model),
+            ))}
             backgroundColor={
               Feature_Theme.Colors.SideBar.background.from(theme)
             }

From 6b17359d212c830370172564161b3ec0dd44189e Mon Sep 17 00:00:00 2001
From: Bryan Phelps <bryphe@outrunlabs.com>
Date: Tue, 23 Feb 2021 13:38:41 -0800
Subject: [PATCH 21/21] Update lockfiles

---
 bench.esy.lock/index.json                     | 46 +++++++--------
 .../opam/{csexp.1.3.2 => csexp.1.4.0}/opam    |  8 +--
 esy.lock/index.json                           | 46 +++++++--------
 .../opam/{csexp.1.3.2 => csexp.1.4.0}/opam    |  8 +--
 integrationtest.esy.lock/index.json           | 46 +++++++--------
 .../opam/{csexp.1.3.2 => csexp.1.4.0}/opam    |  8 +--
 release.esy.lock/index.json                   | 46 +++++++--------
 .../opam/{csexp.1.3.2 => csexp.1.4.0}/opam    |  8 +--
 test.esy.lock/index.json                      | 46 +++++++--------
 test.esy.lock/opam/csexp.1.3.2/opam           | 58 -------------------
 test.esy.lock/opam/csexp.1.4.0/opam           | 58 +++++++++++++++++++
 11 files changed, 189 insertions(+), 189 deletions(-)
 rename bench.esy.lock/opam/{csexp.1.3.2 => csexp.1.4.0}/opam (80%)
 rename esy.lock/opam/{csexp.1.3.2 => csexp.1.4.0}/opam (80%)
 rename integrationtest.esy.lock/opam/{csexp.1.3.2 => csexp.1.4.0}/opam (80%)
 rename release.esy.lock/opam/{csexp.1.3.2 => csexp.1.4.0}/opam (80%)
 delete mode 100644 test.esy.lock/opam/csexp.1.3.2/opam
 create mode 100644 test.esy.lock/opam/csexp.1.4.0/opam

diff --git a/bench.esy.lock/index.json b/bench.esy.lock/index.json
index fafdcae6d4..e117040633 100644
--- a/bench.esy.lock/index.json
+++ b/bench.esy.lock/index.json
@@ -1,5 +1,5 @@
 {
-  "checksum": "40328b48c38d724195d5bef2b9abc4cf",
+  "checksum": "9187316d415d1edd7521645a1992e105",
   "root": "Oni2@link-dev:./package.json",
   "node": {
     "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": {
@@ -118,7 +118,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "revery@github:revery-ui/revery#0c3be5dd@d41d8cd9",
+        "revery@github:revery-ui/revery#ede4175c@d41d8cd9",
         "isolinear@github:revery-ui/isolinear#53fc4eb@d41d8cd9",
         "@revery/timber@2.0.0@d41d8cd9",
         "@revery/esy-libvterm@1.0.3@d41d8cd9",
@@ -126,13 +126,13 @@
       ],
       "devDependencies": []
     },
-    "revery@github:revery-ui/revery#0c3be5dd@d41d8cd9": {
-      "id": "revery@github:revery-ui/revery#0c3be5dd@d41d8cd9",
+    "revery@github:revery-ui/revery#ede4175c@d41d8cd9": {
+      "id": "revery@github:revery-ui/revery#ede4175c@d41d8cd9",
       "name": "revery",
-      "version": "github:revery-ui/revery#0c3be5dd",
+      "version": "github:revery-ui/revery#ede4175c",
       "source": {
         "type": "install",
-        "source": [ "github:revery-ui/revery#0c3be5dd" ]
+        "source": [ "github:revery-ui/revery#ede4175c" ]
       },
       "overrides": [],
       "dependencies": [
@@ -415,14 +415,14 @@
       "dependencies": [ "brace-expansion@1.1.11@d41d8cd9" ],
       "devDependencies": []
     },
-    "lodash@4.17.20@d41d8cd9": {
-      "id": "lodash@4.17.20@d41d8cd9",
+    "lodash@4.17.21@d41d8cd9": {
+      "id": "lodash@4.17.21@d41d8cd9",
       "name": "lodash",
-      "version": "4.17.20",
+      "version": "4.17.21",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz#sha1:b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
+          "archive:https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz#sha1:679591c564c3bffaae8454cf0b3df370c3d6911c"
         ]
       },
       "overrides": [],
@@ -996,7 +996,7 @@
       "overrides": [ "bench.json" ],
       "dependencies": [
         "revery-terminal@github:revery-ui/revery-terminal#a9cb168@d41d8cd9",
-        "revery@github:revery-ui/revery#0c3be5dd@d41d8cd9",
+        "revery@github:revery-ui/revery#ede4175c@d41d8cd9",
         "reperf@1.5.0@d41d8cd9",
         "rench@github:bryphe/rench#a976fe5@d41d8cd9",
         "refmterr@3.3.2@d41d8cd9",
@@ -1041,7 +1041,7 @@
       "devDependencies": [
         "shelljs@0.8.4@d41d8cd9", "reperf@1.5.0@d41d8cd9",
         "rcedit@2.0.0@d41d8cd9", "plist@3.0.1@d41d8cd9",
-        "ocaml@4.10.0@d41d8cd9", "lodash@4.17.20@d41d8cd9",
+        "ocaml@4.10.0@d41d8cd9", "lodash@4.17.21@d41d8cd9",
         "innosetup-compiler@5.5.9@d41d8cd9", "fs-extra@7.0.1@d41d8cd9",
         "@opam/ocaml-lsp-server@github:ocaml/ocaml-lsp:ocaml-lsp-server.opam#966a28f@d41d8cd9"
       ]
@@ -2635,7 +2635,7 @@
         "@opam/dune-build-info@opam:2.6.2@03ffe168",
         "@opam/dune@opam:2.5.0@e0bac278",
         "@opam/dot-merlin-reader@opam:3.4.2@55baebb0",
-        "@opam/csexp@opam:1.3.2@5cea14af", "@esy-ocaml/substs@0.0.1@d41d8cd9"
+        "@opam/csexp@opam:1.4.0@bd1cb034", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9",
@@ -2647,7 +2647,7 @@
         "@opam/dune-build-info@opam:2.6.2@03ffe168",
         "@opam/dune@opam:2.5.0@e0bac278",
         "@opam/dot-merlin-reader@opam:3.4.2@55baebb0",
-        "@opam/csexp@opam:1.3.2@5cea14af"
+        "@opam/csexp@opam:1.4.0@bd1cb034"
       ]
     },
     "@opam/ocaml-compiler-libs@opam:v0.12.3@f0f069bd": {
@@ -3486,7 +3486,7 @@
         "@opam/yojson@github:onivim/yojson:yojson.opam#f480aef@d41d8cd9",
         "@opam/result@opam:1.5@6b753c82",
         "@opam/ocamlfind@opam:1.8.1@b7dc3072",
-        "@opam/dune@opam:2.5.0@e0bac278", "@opam/csexp@opam:1.3.2@5cea14af",
+        "@opam/dune@opam:2.5.0@e0bac278", "@opam/csexp@opam:1.4.0@bd1cb034",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
@@ -3494,7 +3494,7 @@
         "@opam/yojson@github:onivim/yojson:yojson.opam#f480aef@d41d8cd9",
         "@opam/result@opam:1.5@6b753c82",
         "@opam/ocamlfind@opam:1.8.1@b7dc3072",
-        "@opam/dune@opam:2.5.0@e0bac278", "@opam/csexp@opam:1.3.2@5cea14af"
+        "@opam/dune@opam:2.5.0@e0bac278", "@opam/csexp@opam:1.4.0@bd1cb034"
       ]
     },
     "@opam/dir@github:bryphe/reason-native:dir.opam#e16590c@d41d8cd9": {
@@ -3607,20 +3607,20 @@
         "@opam/base-bytes@opam:base@19d0c2ff"
       ]
     },
-    "@opam/csexp@opam:1.3.2@5cea14af": {
-      "id": "@opam/csexp@opam:1.3.2@5cea14af",
+    "@opam/csexp@opam:1.4.0@bd1cb034": {
+      "id": "@opam/csexp@opam:1.4.0@bd1cb034",
       "name": "@opam/csexp",
-      "version": "opam:1.3.2",
+      "version": "opam:1.4.0",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/sha256/f2/f21f427b277f07e8bfd050e00c640a5893c1bf4b689147640fa383255dcf1c4a#sha256:f21f427b277f07e8bfd050e00c640a5893c1bf4b689147640fa383255dcf1c4a",
-          "archive:https://github.com/ocaml-dune/csexp/releases/download/1.3.2/csexp-1.3.2.tbz#sha256:f21f427b277f07e8bfd050e00c640a5893c1bf4b689147640fa383255dcf1c4a"
+          "archive:https://opam.ocaml.org/cache/sha256/8e/8e3d6fca87f102a126dee8b72a2a0d146f10439c47218dfc149d51bf3edf364e#sha256:8e3d6fca87f102a126dee8b72a2a0d146f10439c47218dfc149d51bf3edf364e",
+          "archive:https://github.com/ocaml-dune/csexp/releases/download/1.4.0/csexp-1.4.0.tbz#sha256:8e3d6fca87f102a126dee8b72a2a0d146f10439c47218dfc149d51bf3edf364e"
         ],
         "opam": {
           "name": "csexp",
-          "version": "1.3.2",
-          "path": "bench.esy.lock/opam/csexp.1.3.2"
+          "version": "1.4.0",
+          "path": "bench.esy.lock/opam/csexp.1.4.0"
         }
       },
       "overrides": [],
diff --git a/bench.esy.lock/opam/csexp.1.3.2/opam b/bench.esy.lock/opam/csexp.1.4.0/opam
similarity index 80%
rename from bench.esy.lock/opam/csexp.1.3.2/opam
rename to bench.esy.lock/opam/csexp.1.4.0/opam
index 1508d17af4..ef29a05aba 100644
--- a/bench.esy.lock/opam/csexp.1.3.2/opam
+++ b/bench.esy.lock/opam/csexp.1.4.0/opam
@@ -47,12 +47,12 @@ build: [
     "@doc" {with-doc}
   ]
 ]
-x-commit-hash: "19a2e7bc171a707059c73d78dd18e4e3ff03ac9b"
+x-commit-hash: "0e1b2044c8d1ff187c27cec3e46d9cde14892650"
 url {
   src:
-    "https://github.com/ocaml-dune/csexp/releases/download/1.3.2/csexp-1.3.2.tbz"
+    "https://github.com/ocaml-dune/csexp/releases/download/1.4.0/csexp-1.4.0.tbz"
   checksum: [
-    "sha256=f21f427b277f07e8bfd050e00c640a5893c1bf4b689147640fa383255dcf1c4a"
-    "sha512=ff1bd6a7c6bb3a73ca9ab0506c9ec1f357657deaa9ecc7eb32955817d9b0f266d976af3e2b8fc34c621cb0caf1fde55f9a609dd184e2054f500bf09afeb83026"
+    "sha256=8e3d6fca87f102a126dee8b72a2a0d146f10439c47218dfc149d51bf3edf364e"
+    "sha512=604a5094fbbf61f497b342ad0aa8ec25275b2a904cd0c1823fc40daa54a15796b360374ff495c0d8ca3b4c1e6723b2ce37e030857fae131222606de818fb8129"
   ]
 }
diff --git a/esy.lock/index.json b/esy.lock/index.json
index c816976469..58958f1eb1 100644
--- a/esy.lock/index.json
+++ b/esy.lock/index.json
@@ -1,5 +1,5 @@
 {
-  "checksum": "40328b48c38d724195d5bef2b9abc4cf",
+  "checksum": "9187316d415d1edd7521645a1992e105",
   "root": "Oni2@link-dev:./package.json",
   "node": {
     "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": {
@@ -118,7 +118,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "revery@github:revery-ui/revery#0c3be5dd@d41d8cd9",
+        "revery@github:revery-ui/revery#ede4175c@d41d8cd9",
         "isolinear@github:revery-ui/isolinear#53fc4eb@d41d8cd9",
         "@revery/timber@2.0.0@d41d8cd9",
         "@revery/esy-libvterm@1.0.3@d41d8cd9",
@@ -126,13 +126,13 @@
       ],
       "devDependencies": []
     },
-    "revery@github:revery-ui/revery#0c3be5dd@d41d8cd9": {
-      "id": "revery@github:revery-ui/revery#0c3be5dd@d41d8cd9",
+    "revery@github:revery-ui/revery#ede4175c@d41d8cd9": {
+      "id": "revery@github:revery-ui/revery#ede4175c@d41d8cd9",
       "name": "revery",
-      "version": "github:revery-ui/revery#0c3be5dd",
+      "version": "github:revery-ui/revery#ede4175c",
       "source": {
         "type": "install",
-        "source": [ "github:revery-ui/revery#0c3be5dd" ]
+        "source": [ "github:revery-ui/revery#ede4175c" ]
       },
       "overrides": [],
       "dependencies": [
@@ -415,14 +415,14 @@
       "dependencies": [ "brace-expansion@1.1.11@d41d8cd9" ],
       "devDependencies": []
     },
-    "lodash@4.17.20@d41d8cd9": {
-      "id": "lodash@4.17.20@d41d8cd9",
+    "lodash@4.17.21@d41d8cd9": {
+      "id": "lodash@4.17.21@d41d8cd9",
       "name": "lodash",
-      "version": "4.17.20",
+      "version": "4.17.21",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz#sha1:b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
+          "archive:https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz#sha1:679591c564c3bffaae8454cf0b3df370c3d6911c"
         ]
       },
       "overrides": [],
@@ -996,7 +996,7 @@
       "overrides": [],
       "dependencies": [
         "revery-terminal@github:revery-ui/revery-terminal#a9cb168@d41d8cd9",
-        "revery@github:revery-ui/revery#0c3be5dd@d41d8cd9",
+        "revery@github:revery-ui/revery#ede4175c@d41d8cd9",
         "rench@github:bryphe/rench#a976fe5@d41d8cd9",
         "refmterr@3.3.2@d41d8cd9",
         "reason-native-crash-utils@github:onivim/reason-native-crash-utils#38c8f00@d41d8cd9",
@@ -1040,7 +1040,7 @@
       "devDependencies": [
         "shelljs@0.8.4@d41d8cd9", "reperf@1.5.0@d41d8cd9",
         "rcedit@2.0.0@d41d8cd9", "plist@3.0.1@d41d8cd9",
-        "ocaml@4.10.0@d41d8cd9", "lodash@4.17.20@d41d8cd9",
+        "ocaml@4.10.0@d41d8cd9", "lodash@4.17.21@d41d8cd9",
         "innosetup-compiler@5.5.9@d41d8cd9", "fs-extra@7.0.1@d41d8cd9",
         "@opam/ocaml-lsp-server@github:ocaml/ocaml-lsp:ocaml-lsp-server.opam#966a28f@d41d8cd9"
       ]
@@ -2634,7 +2634,7 @@
         "@opam/dune-build-info@opam:2.6.2@03ffe168",
         "@opam/dune@opam:2.5.0@e0bac278",
         "@opam/dot-merlin-reader@opam:3.4.2@55baebb0",
-        "@opam/csexp@opam:1.3.2@5cea14af", "@esy-ocaml/substs@0.0.1@d41d8cd9"
+        "@opam/csexp@opam:1.4.0@bd1cb034", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9",
@@ -2646,7 +2646,7 @@
         "@opam/dune-build-info@opam:2.6.2@03ffe168",
         "@opam/dune@opam:2.5.0@e0bac278",
         "@opam/dot-merlin-reader@opam:3.4.2@55baebb0",
-        "@opam/csexp@opam:1.3.2@5cea14af"
+        "@opam/csexp@opam:1.4.0@bd1cb034"
       ]
     },
     "@opam/ocaml-compiler-libs@opam:v0.12.3@f0f069bd": {
@@ -3485,7 +3485,7 @@
         "@opam/yojson@github:onivim/yojson:yojson.opam#f480aef@d41d8cd9",
         "@opam/result@opam:1.5@6b753c82",
         "@opam/ocamlfind@opam:1.8.1@b7dc3072",
-        "@opam/dune@opam:2.5.0@e0bac278", "@opam/csexp@opam:1.3.2@5cea14af",
+        "@opam/dune@opam:2.5.0@e0bac278", "@opam/csexp@opam:1.4.0@bd1cb034",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
@@ -3493,7 +3493,7 @@
         "@opam/yojson@github:onivim/yojson:yojson.opam#f480aef@d41d8cd9",
         "@opam/result@opam:1.5@6b753c82",
         "@opam/ocamlfind@opam:1.8.1@b7dc3072",
-        "@opam/dune@opam:2.5.0@e0bac278", "@opam/csexp@opam:1.3.2@5cea14af"
+        "@opam/dune@opam:2.5.0@e0bac278", "@opam/csexp@opam:1.4.0@bd1cb034"
       ]
     },
     "@opam/dir@github:bryphe/reason-native:dir.opam#e16590c@d41d8cd9": {
@@ -3606,20 +3606,20 @@
         "@opam/base-bytes@opam:base@19d0c2ff"
       ]
     },
-    "@opam/csexp@opam:1.3.2@5cea14af": {
-      "id": "@opam/csexp@opam:1.3.2@5cea14af",
+    "@opam/csexp@opam:1.4.0@bd1cb034": {
+      "id": "@opam/csexp@opam:1.4.0@bd1cb034",
       "name": "@opam/csexp",
-      "version": "opam:1.3.2",
+      "version": "opam:1.4.0",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/sha256/f2/f21f427b277f07e8bfd050e00c640a5893c1bf4b689147640fa383255dcf1c4a#sha256:f21f427b277f07e8bfd050e00c640a5893c1bf4b689147640fa383255dcf1c4a",
-          "archive:https://github.com/ocaml-dune/csexp/releases/download/1.3.2/csexp-1.3.2.tbz#sha256:f21f427b277f07e8bfd050e00c640a5893c1bf4b689147640fa383255dcf1c4a"
+          "archive:https://opam.ocaml.org/cache/sha256/8e/8e3d6fca87f102a126dee8b72a2a0d146f10439c47218dfc149d51bf3edf364e#sha256:8e3d6fca87f102a126dee8b72a2a0d146f10439c47218dfc149d51bf3edf364e",
+          "archive:https://github.com/ocaml-dune/csexp/releases/download/1.4.0/csexp-1.4.0.tbz#sha256:8e3d6fca87f102a126dee8b72a2a0d146f10439c47218dfc149d51bf3edf364e"
         ],
         "opam": {
           "name": "csexp",
-          "version": "1.3.2",
-          "path": "esy.lock/opam/csexp.1.3.2"
+          "version": "1.4.0",
+          "path": "esy.lock/opam/csexp.1.4.0"
         }
       },
       "overrides": [],
diff --git a/esy.lock/opam/csexp.1.3.2/opam b/esy.lock/opam/csexp.1.4.0/opam
similarity index 80%
rename from esy.lock/opam/csexp.1.3.2/opam
rename to esy.lock/opam/csexp.1.4.0/opam
index 1508d17af4..ef29a05aba 100644
--- a/esy.lock/opam/csexp.1.3.2/opam
+++ b/esy.lock/opam/csexp.1.4.0/opam
@@ -47,12 +47,12 @@ build: [
     "@doc" {with-doc}
   ]
 ]
-x-commit-hash: "19a2e7bc171a707059c73d78dd18e4e3ff03ac9b"
+x-commit-hash: "0e1b2044c8d1ff187c27cec3e46d9cde14892650"
 url {
   src:
-    "https://github.com/ocaml-dune/csexp/releases/download/1.3.2/csexp-1.3.2.tbz"
+    "https://github.com/ocaml-dune/csexp/releases/download/1.4.0/csexp-1.4.0.tbz"
   checksum: [
-    "sha256=f21f427b277f07e8bfd050e00c640a5893c1bf4b689147640fa383255dcf1c4a"
-    "sha512=ff1bd6a7c6bb3a73ca9ab0506c9ec1f357657deaa9ecc7eb32955817d9b0f266d976af3e2b8fc34c621cb0caf1fde55f9a609dd184e2054f500bf09afeb83026"
+    "sha256=8e3d6fca87f102a126dee8b72a2a0d146f10439c47218dfc149d51bf3edf364e"
+    "sha512=604a5094fbbf61f497b342ad0aa8ec25275b2a904cd0c1823fc40daa54a15796b360374ff495c0d8ca3b4c1e6723b2ce37e030857fae131222606de818fb8129"
   ]
 }
diff --git a/integrationtest.esy.lock/index.json b/integrationtest.esy.lock/index.json
index 125dfcfbd8..ae50cf1f7d 100644
--- a/integrationtest.esy.lock/index.json
+++ b/integrationtest.esy.lock/index.json
@@ -1,5 +1,5 @@
 {
-  "checksum": "40328b48c38d724195d5bef2b9abc4cf",
+  "checksum": "9187316d415d1edd7521645a1992e105",
   "root": "Oni2@link-dev:./package.json",
   "node": {
     "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": {
@@ -118,7 +118,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "revery@github:revery-ui/revery#0c3be5dd@d41d8cd9",
+        "revery@github:revery-ui/revery#ede4175c@d41d8cd9",
         "isolinear@github:revery-ui/isolinear#53fc4eb@d41d8cd9",
         "@revery/timber@2.0.0@d41d8cd9",
         "@revery/esy-libvterm@1.0.3@d41d8cd9",
@@ -126,13 +126,13 @@
       ],
       "devDependencies": []
     },
-    "revery@github:revery-ui/revery#0c3be5dd@d41d8cd9": {
-      "id": "revery@github:revery-ui/revery#0c3be5dd@d41d8cd9",
+    "revery@github:revery-ui/revery#ede4175c@d41d8cd9": {
+      "id": "revery@github:revery-ui/revery#ede4175c@d41d8cd9",
       "name": "revery",
-      "version": "github:revery-ui/revery#0c3be5dd",
+      "version": "github:revery-ui/revery#ede4175c",
       "source": {
         "type": "install",
-        "source": [ "github:revery-ui/revery#0c3be5dd" ]
+        "source": [ "github:revery-ui/revery#ede4175c" ]
       },
       "overrides": [],
       "dependencies": [
@@ -415,14 +415,14 @@
       "dependencies": [ "brace-expansion@1.1.11@d41d8cd9" ],
       "devDependencies": []
     },
-    "lodash@4.17.20@d41d8cd9": {
-      "id": "lodash@4.17.20@d41d8cd9",
+    "lodash@4.17.21@d41d8cd9": {
+      "id": "lodash@4.17.21@d41d8cd9",
       "name": "lodash",
-      "version": "4.17.20",
+      "version": "4.17.21",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz#sha1:b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
+          "archive:https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz#sha1:679591c564c3bffaae8454cf0b3df370c3d6911c"
         ]
       },
       "overrides": [],
@@ -996,7 +996,7 @@
       "overrides": [ "integrationtest.json" ],
       "dependencies": [
         "revery-terminal@github:revery-ui/revery-terminal#a9cb168@d41d8cd9",
-        "revery@github:revery-ui/revery#0c3be5dd@d41d8cd9",
+        "revery@github:revery-ui/revery#ede4175c@d41d8cd9",
         "rench@github:bryphe/rench#a976fe5@d41d8cd9",
         "refmterr@3.3.2@d41d8cd9",
         "reason-native-crash-utils@github:onivim/reason-native-crash-utils#38c8f00@d41d8cd9",
@@ -1040,7 +1040,7 @@
       "devDependencies": [
         "shelljs@0.8.4@d41d8cd9", "reperf@1.5.0@d41d8cd9",
         "rcedit@2.0.0@d41d8cd9", "plist@3.0.1@d41d8cd9",
-        "ocaml@4.10.0@d41d8cd9", "lodash@4.17.20@d41d8cd9",
+        "ocaml@4.10.0@d41d8cd9", "lodash@4.17.21@d41d8cd9",
         "innosetup-compiler@5.5.9@d41d8cd9", "fs-extra@7.0.1@d41d8cd9",
         "@opam/ocaml-lsp-server@github:ocaml/ocaml-lsp:ocaml-lsp-server.opam#966a28f@d41d8cd9"
       ]
@@ -2635,7 +2635,7 @@
         "@opam/dune-build-info@opam:2.6.2@03ffe168",
         "@opam/dune@opam:2.5.0@e0bac278",
         "@opam/dot-merlin-reader@opam:3.4.2@55baebb0",
-        "@opam/csexp@opam:1.3.2@5cea14af", "@esy-ocaml/substs@0.0.1@d41d8cd9"
+        "@opam/csexp@opam:1.4.0@bd1cb034", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9",
@@ -2647,7 +2647,7 @@
         "@opam/dune-build-info@opam:2.6.2@03ffe168",
         "@opam/dune@opam:2.5.0@e0bac278",
         "@opam/dot-merlin-reader@opam:3.4.2@55baebb0",
-        "@opam/csexp@opam:1.3.2@5cea14af"
+        "@opam/csexp@opam:1.4.0@bd1cb034"
       ]
     },
     "@opam/ocaml-compiler-libs@opam:v0.12.3@f0f069bd": {
@@ -3486,7 +3486,7 @@
         "@opam/yojson@github:onivim/yojson:yojson.opam#f480aef@d41d8cd9",
         "@opam/result@opam:1.5@6b753c82",
         "@opam/ocamlfind@opam:1.8.1@b7dc3072",
-        "@opam/dune@opam:2.5.0@e0bac278", "@opam/csexp@opam:1.3.2@5cea14af",
+        "@opam/dune@opam:2.5.0@e0bac278", "@opam/csexp@opam:1.4.0@bd1cb034",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
@@ -3494,7 +3494,7 @@
         "@opam/yojson@github:onivim/yojson:yojson.opam#f480aef@d41d8cd9",
         "@opam/result@opam:1.5@6b753c82",
         "@opam/ocamlfind@opam:1.8.1@b7dc3072",
-        "@opam/dune@opam:2.5.0@e0bac278", "@opam/csexp@opam:1.3.2@5cea14af"
+        "@opam/dune@opam:2.5.0@e0bac278", "@opam/csexp@opam:1.4.0@bd1cb034"
       ]
     },
     "@opam/dir@github:bryphe/reason-native:dir.opam#e16590c@d41d8cd9": {
@@ -3607,20 +3607,20 @@
         "@opam/base-bytes@opam:base@19d0c2ff"
       ]
     },
-    "@opam/csexp@opam:1.3.2@5cea14af": {
-      "id": "@opam/csexp@opam:1.3.2@5cea14af",
+    "@opam/csexp@opam:1.4.0@bd1cb034": {
+      "id": "@opam/csexp@opam:1.4.0@bd1cb034",
       "name": "@opam/csexp",
-      "version": "opam:1.3.2",
+      "version": "opam:1.4.0",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/sha256/f2/f21f427b277f07e8bfd050e00c640a5893c1bf4b689147640fa383255dcf1c4a#sha256:f21f427b277f07e8bfd050e00c640a5893c1bf4b689147640fa383255dcf1c4a",
-          "archive:https://github.com/ocaml-dune/csexp/releases/download/1.3.2/csexp-1.3.2.tbz#sha256:f21f427b277f07e8bfd050e00c640a5893c1bf4b689147640fa383255dcf1c4a"
+          "archive:https://opam.ocaml.org/cache/sha256/8e/8e3d6fca87f102a126dee8b72a2a0d146f10439c47218dfc149d51bf3edf364e#sha256:8e3d6fca87f102a126dee8b72a2a0d146f10439c47218dfc149d51bf3edf364e",
+          "archive:https://github.com/ocaml-dune/csexp/releases/download/1.4.0/csexp-1.4.0.tbz#sha256:8e3d6fca87f102a126dee8b72a2a0d146f10439c47218dfc149d51bf3edf364e"
         ],
         "opam": {
           "name": "csexp",
-          "version": "1.3.2",
-          "path": "integrationtest.esy.lock/opam/csexp.1.3.2"
+          "version": "1.4.0",
+          "path": "integrationtest.esy.lock/opam/csexp.1.4.0"
         }
       },
       "overrides": [],
diff --git a/integrationtest.esy.lock/opam/csexp.1.3.2/opam b/integrationtest.esy.lock/opam/csexp.1.4.0/opam
similarity index 80%
rename from integrationtest.esy.lock/opam/csexp.1.3.2/opam
rename to integrationtest.esy.lock/opam/csexp.1.4.0/opam
index 1508d17af4..ef29a05aba 100644
--- a/integrationtest.esy.lock/opam/csexp.1.3.2/opam
+++ b/integrationtest.esy.lock/opam/csexp.1.4.0/opam
@@ -47,12 +47,12 @@ build: [
     "@doc" {with-doc}
   ]
 ]
-x-commit-hash: "19a2e7bc171a707059c73d78dd18e4e3ff03ac9b"
+x-commit-hash: "0e1b2044c8d1ff187c27cec3e46d9cde14892650"
 url {
   src:
-    "https://github.com/ocaml-dune/csexp/releases/download/1.3.2/csexp-1.3.2.tbz"
+    "https://github.com/ocaml-dune/csexp/releases/download/1.4.0/csexp-1.4.0.tbz"
   checksum: [
-    "sha256=f21f427b277f07e8bfd050e00c640a5893c1bf4b689147640fa383255dcf1c4a"
-    "sha512=ff1bd6a7c6bb3a73ca9ab0506c9ec1f357657deaa9ecc7eb32955817d9b0f266d976af3e2b8fc34c621cb0caf1fde55f9a609dd184e2054f500bf09afeb83026"
+    "sha256=8e3d6fca87f102a126dee8b72a2a0d146f10439c47218dfc149d51bf3edf364e"
+    "sha512=604a5094fbbf61f497b342ad0aa8ec25275b2a904cd0c1823fc40daa54a15796b360374ff495c0d8ca3b4c1e6723b2ce37e030857fae131222606de818fb8129"
   ]
 }
diff --git a/release.esy.lock/index.json b/release.esy.lock/index.json
index eecbebdebd..60b87003fa 100644
--- a/release.esy.lock/index.json
+++ b/release.esy.lock/index.json
@@ -1,5 +1,5 @@
 {
-  "checksum": "40328b48c38d724195d5bef2b9abc4cf",
+  "checksum": "9187316d415d1edd7521645a1992e105",
   "root": "Oni2@link-dev:./package.json",
   "node": {
     "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": {
@@ -118,7 +118,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "revery@github:revery-ui/revery#0c3be5dd@d41d8cd9",
+        "revery@github:revery-ui/revery#ede4175c@d41d8cd9",
         "isolinear@github:revery-ui/isolinear#53fc4eb@d41d8cd9",
         "@revery/timber@2.0.0@d41d8cd9",
         "@revery/esy-libvterm@1.0.3@d41d8cd9",
@@ -126,13 +126,13 @@
       ],
       "devDependencies": []
     },
-    "revery@github:revery-ui/revery#0c3be5dd@d41d8cd9": {
-      "id": "revery@github:revery-ui/revery#0c3be5dd@d41d8cd9",
+    "revery@github:revery-ui/revery#ede4175c@d41d8cd9": {
+      "id": "revery@github:revery-ui/revery#ede4175c@d41d8cd9",
       "name": "revery",
-      "version": "github:revery-ui/revery#0c3be5dd",
+      "version": "github:revery-ui/revery#ede4175c",
       "source": {
         "type": "install",
-        "source": [ "github:revery-ui/revery#0c3be5dd" ]
+        "source": [ "github:revery-ui/revery#ede4175c" ]
       },
       "overrides": [],
       "dependencies": [
@@ -415,14 +415,14 @@
       "dependencies": [ "brace-expansion@1.1.11@d41d8cd9" ],
       "devDependencies": []
     },
-    "lodash@4.17.20@d41d8cd9": {
-      "id": "lodash@4.17.20@d41d8cd9",
+    "lodash@4.17.21@d41d8cd9": {
+      "id": "lodash@4.17.21@d41d8cd9",
       "name": "lodash",
-      "version": "4.17.20",
+      "version": "4.17.21",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz#sha1:b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
+          "archive:https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz#sha1:679591c564c3bffaae8454cf0b3df370c3d6911c"
         ]
       },
       "overrides": [],
@@ -996,7 +996,7 @@
       "overrides": [ "release.json" ],
       "dependencies": [
         "revery-terminal@github:revery-ui/revery-terminal#a9cb168@d41d8cd9",
-        "revery@github:revery-ui/revery#0c3be5dd@d41d8cd9",
+        "revery@github:revery-ui/revery#ede4175c@d41d8cd9",
         "rench@github:bryphe/rench#a976fe5@d41d8cd9",
         "refmterr@3.3.2@d41d8cd9",
         "reason-native-crash-utils@github:onivim/reason-native-crash-utils#38c8f00@d41d8cd9",
@@ -1040,7 +1040,7 @@
       "devDependencies": [
         "shelljs@0.8.4@d41d8cd9", "reperf@1.5.0@d41d8cd9",
         "rcedit@2.0.0@d41d8cd9", "plist@3.0.1@d41d8cd9",
-        "ocaml@4.10.0@d41d8cd9", "lodash@4.17.20@d41d8cd9",
+        "ocaml@4.10.0@d41d8cd9", "lodash@4.17.21@d41d8cd9",
         "innosetup-compiler@5.5.9@d41d8cd9", "fs-extra@7.0.1@d41d8cd9",
         "@opam/ocaml-lsp-server@github:ocaml/ocaml-lsp:ocaml-lsp-server.opam#966a28f@d41d8cd9"
       ]
@@ -2634,7 +2634,7 @@
         "@opam/dune-build-info@opam:2.6.2@03ffe168",
         "@opam/dune@opam:2.5.0@e0bac278",
         "@opam/dot-merlin-reader@opam:3.4.2@55baebb0",
-        "@opam/csexp@opam:1.3.2@5cea14af", "@esy-ocaml/substs@0.0.1@d41d8cd9"
+        "@opam/csexp@opam:1.4.0@bd1cb034", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9",
@@ -2646,7 +2646,7 @@
         "@opam/dune-build-info@opam:2.6.2@03ffe168",
         "@opam/dune@opam:2.5.0@e0bac278",
         "@opam/dot-merlin-reader@opam:3.4.2@55baebb0",
-        "@opam/csexp@opam:1.3.2@5cea14af"
+        "@opam/csexp@opam:1.4.0@bd1cb034"
       ]
     },
     "@opam/ocaml-compiler-libs@opam:v0.12.3@f0f069bd": {
@@ -3485,7 +3485,7 @@
         "@opam/yojson@github:onivim/yojson:yojson.opam#f480aef@d41d8cd9",
         "@opam/result@opam:1.5@6b753c82",
         "@opam/ocamlfind@opam:1.8.1@b7dc3072",
-        "@opam/dune@opam:2.5.0@e0bac278", "@opam/csexp@opam:1.3.2@5cea14af",
+        "@opam/dune@opam:2.5.0@e0bac278", "@opam/csexp@opam:1.4.0@bd1cb034",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
@@ -3493,7 +3493,7 @@
         "@opam/yojson@github:onivim/yojson:yojson.opam#f480aef@d41d8cd9",
         "@opam/result@opam:1.5@6b753c82",
         "@opam/ocamlfind@opam:1.8.1@b7dc3072",
-        "@opam/dune@opam:2.5.0@e0bac278", "@opam/csexp@opam:1.3.2@5cea14af"
+        "@opam/dune@opam:2.5.0@e0bac278", "@opam/csexp@opam:1.4.0@bd1cb034"
       ]
     },
     "@opam/dir@github:bryphe/reason-native:dir.opam#e16590c@d41d8cd9": {
@@ -3606,20 +3606,20 @@
         "@opam/base-bytes@opam:base@19d0c2ff"
       ]
     },
-    "@opam/csexp@opam:1.3.2@5cea14af": {
-      "id": "@opam/csexp@opam:1.3.2@5cea14af",
+    "@opam/csexp@opam:1.4.0@bd1cb034": {
+      "id": "@opam/csexp@opam:1.4.0@bd1cb034",
       "name": "@opam/csexp",
-      "version": "opam:1.3.2",
+      "version": "opam:1.4.0",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/sha256/f2/f21f427b277f07e8bfd050e00c640a5893c1bf4b689147640fa383255dcf1c4a#sha256:f21f427b277f07e8bfd050e00c640a5893c1bf4b689147640fa383255dcf1c4a",
-          "archive:https://github.com/ocaml-dune/csexp/releases/download/1.3.2/csexp-1.3.2.tbz#sha256:f21f427b277f07e8bfd050e00c640a5893c1bf4b689147640fa383255dcf1c4a"
+          "archive:https://opam.ocaml.org/cache/sha256/8e/8e3d6fca87f102a126dee8b72a2a0d146f10439c47218dfc149d51bf3edf364e#sha256:8e3d6fca87f102a126dee8b72a2a0d146f10439c47218dfc149d51bf3edf364e",
+          "archive:https://github.com/ocaml-dune/csexp/releases/download/1.4.0/csexp-1.4.0.tbz#sha256:8e3d6fca87f102a126dee8b72a2a0d146f10439c47218dfc149d51bf3edf364e"
         ],
         "opam": {
           "name": "csexp",
-          "version": "1.3.2",
-          "path": "release.esy.lock/opam/csexp.1.3.2"
+          "version": "1.4.0",
+          "path": "release.esy.lock/opam/csexp.1.4.0"
         }
       },
       "overrides": [],
diff --git a/release.esy.lock/opam/csexp.1.3.2/opam b/release.esy.lock/opam/csexp.1.4.0/opam
similarity index 80%
rename from release.esy.lock/opam/csexp.1.3.2/opam
rename to release.esy.lock/opam/csexp.1.4.0/opam
index 1508d17af4..ef29a05aba 100644
--- a/release.esy.lock/opam/csexp.1.3.2/opam
+++ b/release.esy.lock/opam/csexp.1.4.0/opam
@@ -47,12 +47,12 @@ build: [
     "@doc" {with-doc}
   ]
 ]
-x-commit-hash: "19a2e7bc171a707059c73d78dd18e4e3ff03ac9b"
+x-commit-hash: "0e1b2044c8d1ff187c27cec3e46d9cde14892650"
 url {
   src:
-    "https://github.com/ocaml-dune/csexp/releases/download/1.3.2/csexp-1.3.2.tbz"
+    "https://github.com/ocaml-dune/csexp/releases/download/1.4.0/csexp-1.4.0.tbz"
   checksum: [
-    "sha256=f21f427b277f07e8bfd050e00c640a5893c1bf4b689147640fa383255dcf1c4a"
-    "sha512=ff1bd6a7c6bb3a73ca9ab0506c9ec1f357657deaa9ecc7eb32955817d9b0f266d976af3e2b8fc34c621cb0caf1fde55f9a609dd184e2054f500bf09afeb83026"
+    "sha256=8e3d6fca87f102a126dee8b72a2a0d146f10439c47218dfc149d51bf3edf364e"
+    "sha512=604a5094fbbf61f497b342ad0aa8ec25275b2a904cd0c1823fc40daa54a15796b360374ff495c0d8ca3b4c1e6723b2ce37e030857fae131222606de818fb8129"
   ]
 }
diff --git a/test.esy.lock/index.json b/test.esy.lock/index.json
index cdc7d20e6a..c118d79ef1 100644
--- a/test.esy.lock/index.json
+++ b/test.esy.lock/index.json
@@ -1,5 +1,5 @@
 {
-  "checksum": "a5399061763f87bd3877ff1b8f3a5d0f",
+  "checksum": "ff9c8795c7241d8ebbdbdfa6debc51d9",
   "root": "Oni2@link-dev:./package.json",
   "node": {
     "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": {
@@ -118,7 +118,7 @@
       },
       "overrides": [],
       "dependencies": [
-        "revery@github:revery-ui/revery#0c3be5dd@d41d8cd9",
+        "revery@github:revery-ui/revery#ede4175c@d41d8cd9",
         "isolinear@github:revery-ui/isolinear#53fc4eb@d41d8cd9",
         "@revery/timber@2.0.0@d41d8cd9",
         "@revery/esy-libvterm@1.0.3@d41d8cd9",
@@ -126,13 +126,13 @@
       ],
       "devDependencies": []
     },
-    "revery@github:revery-ui/revery#0c3be5dd@d41d8cd9": {
-      "id": "revery@github:revery-ui/revery#0c3be5dd@d41d8cd9",
+    "revery@github:revery-ui/revery#ede4175c@d41d8cd9": {
+      "id": "revery@github:revery-ui/revery#ede4175c@d41d8cd9",
       "name": "revery",
-      "version": "github:revery-ui/revery#0c3be5dd",
+      "version": "github:revery-ui/revery#ede4175c",
       "source": {
         "type": "install",
-        "source": [ "github:revery-ui/revery#0c3be5dd" ]
+        "source": [ "github:revery-ui/revery#ede4175c" ]
       },
       "overrides": [],
       "dependencies": [
@@ -415,14 +415,14 @@
       "dependencies": [ "brace-expansion@1.1.11@d41d8cd9" ],
       "devDependencies": []
     },
-    "lodash@4.17.20@d41d8cd9": {
-      "id": "lodash@4.17.20@d41d8cd9",
+    "lodash@4.17.21@d41d8cd9": {
+      "id": "lodash@4.17.21@d41d8cd9",
       "name": "lodash",
-      "version": "4.17.20",
+      "version": "4.17.21",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz#sha1:b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
+          "archive:https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz#sha1:679591c564c3bffaae8454cf0b3df370c3d6911c"
         ]
       },
       "overrides": [],
@@ -996,7 +996,7 @@
       "overrides": [ "test.json" ],
       "dependencies": [
         "revery-terminal@github:revery-ui/revery-terminal#a9cb168@d41d8cd9",
-        "revery@github:revery-ui/revery#0c3be5dd@d41d8cd9",
+        "revery@github:revery-ui/revery#ede4175c@d41d8cd9",
         "rench@github:bryphe/rench#a976fe5@d41d8cd9",
         "refmterr@3.3.2@d41d8cd9",
         "reason-native-crash-utils@github:onivim/reason-native-crash-utils#38c8f00@d41d8cd9",
@@ -1041,7 +1041,7 @@
       "devDependencies": [
         "shelljs@0.8.4@d41d8cd9", "reperf@1.5.0@d41d8cd9",
         "rcedit@2.0.0@d41d8cd9", "plist@3.0.1@d41d8cd9",
-        "ocaml@4.10.0@d41d8cd9", "lodash@4.17.20@d41d8cd9",
+        "ocaml@4.10.0@d41d8cd9", "lodash@4.17.21@d41d8cd9",
         "innosetup-compiler@5.5.9@d41d8cd9", "fs-extra@7.0.1@d41d8cd9",
         "@opam/ocaml-lsp-server@github:ocaml/ocaml-lsp:ocaml-lsp-server.opam#966a28f@d41d8cd9"
       ]
@@ -2635,7 +2635,7 @@
         "@opam/dune-build-info@opam:2.6.2@03ffe168",
         "@opam/dune@opam:2.5.0@e0bac278",
         "@opam/dot-merlin-reader@opam:3.4.2@55baebb0",
-        "@opam/csexp@opam:1.3.2@5cea14af", "@esy-ocaml/substs@0.0.1@d41d8cd9"
+        "@opam/csexp@opam:1.4.0@bd1cb034", "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
         "ocaml@4.10.0@d41d8cd9",
@@ -2647,7 +2647,7 @@
         "@opam/dune-build-info@opam:2.6.2@03ffe168",
         "@opam/dune@opam:2.5.0@e0bac278",
         "@opam/dot-merlin-reader@opam:3.4.2@55baebb0",
-        "@opam/csexp@opam:1.3.2@5cea14af"
+        "@opam/csexp@opam:1.4.0@bd1cb034"
       ]
     },
     "@opam/ocaml-compiler-libs@opam:v0.12.3@f0f069bd": {
@@ -3486,7 +3486,7 @@
         "@opam/yojson@github:onivim/yojson:yojson.opam#f480aef@d41d8cd9",
         "@opam/result@opam:1.5@6b753c82",
         "@opam/ocamlfind@opam:1.8.1@b7dc3072",
-        "@opam/dune@opam:2.5.0@e0bac278", "@opam/csexp@opam:1.3.2@5cea14af",
+        "@opam/dune@opam:2.5.0@e0bac278", "@opam/csexp@opam:1.4.0@bd1cb034",
         "@esy-ocaml/substs@0.0.1@d41d8cd9"
       ],
       "devDependencies": [
@@ -3494,7 +3494,7 @@
         "@opam/yojson@github:onivim/yojson:yojson.opam#f480aef@d41d8cd9",
         "@opam/result@opam:1.5@6b753c82",
         "@opam/ocamlfind@opam:1.8.1@b7dc3072",
-        "@opam/dune@opam:2.5.0@e0bac278", "@opam/csexp@opam:1.3.2@5cea14af"
+        "@opam/dune@opam:2.5.0@e0bac278", "@opam/csexp@opam:1.4.0@bd1cb034"
       ]
     },
     "@opam/dir@github:bryphe/reason-native:dir.opam#e16590c@d41d8cd9": {
@@ -3607,20 +3607,20 @@
         "@opam/base-bytes@opam:base@19d0c2ff"
       ]
     },
-    "@opam/csexp@opam:1.3.2@5cea14af": {
-      "id": "@opam/csexp@opam:1.3.2@5cea14af",
+    "@opam/csexp@opam:1.4.0@bd1cb034": {
+      "id": "@opam/csexp@opam:1.4.0@bd1cb034",
       "name": "@opam/csexp",
-      "version": "opam:1.3.2",
+      "version": "opam:1.4.0",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://opam.ocaml.org/cache/sha256/f2/f21f427b277f07e8bfd050e00c640a5893c1bf4b689147640fa383255dcf1c4a#sha256:f21f427b277f07e8bfd050e00c640a5893c1bf4b689147640fa383255dcf1c4a",
-          "archive:https://github.com/ocaml-dune/csexp/releases/download/1.3.2/csexp-1.3.2.tbz#sha256:f21f427b277f07e8bfd050e00c640a5893c1bf4b689147640fa383255dcf1c4a"
+          "archive:https://opam.ocaml.org/cache/sha256/8e/8e3d6fca87f102a126dee8b72a2a0d146f10439c47218dfc149d51bf3edf364e#sha256:8e3d6fca87f102a126dee8b72a2a0d146f10439c47218dfc149d51bf3edf364e",
+          "archive:https://github.com/ocaml-dune/csexp/releases/download/1.4.0/csexp-1.4.0.tbz#sha256:8e3d6fca87f102a126dee8b72a2a0d146f10439c47218dfc149d51bf3edf364e"
         ],
         "opam": {
           "name": "csexp",
-          "version": "1.3.2",
-          "path": "test.esy.lock/opam/csexp.1.3.2"
+          "version": "1.4.0",
+          "path": "test.esy.lock/opam/csexp.1.4.0"
         }
       },
       "overrides": [],
diff --git a/test.esy.lock/opam/csexp.1.3.2/opam b/test.esy.lock/opam/csexp.1.3.2/opam
deleted file mode 100644
index 1508d17af4..0000000000
--- a/test.esy.lock/opam/csexp.1.3.2/opam
+++ /dev/null
@@ -1,58 +0,0 @@
-opam-version: "2.0"
-synopsis: "Parsing and printing of S-expressions in Canonical form"
-description: """
-
-This library provides minimal support for Canonical S-expressions
-[1]. Canonical S-expressions are a binary encoding of S-expressions
-that is super simple and well suited for communication between
-programs.
-
-This library only provides a few helpers for simple applications. If
-you need more advanced support, such as parsing from more fancy input
-sources, you should consider copying the code of this library given
-how simple parsing S-expressions in canonical form is.
-
-To avoid a dependency on a particular S-expression library, the only
-module of this library is parameterised by the type of S-expressions.
-
-[1] https://en.wikipedia.org/wiki/Canonical_S-expressions
-"""
-maintainer: ["Jeremie Dimino <jeremie@dimino.org>"]
-authors: [
-  "Quentin Hocquet <mefyl@gruntech.org>"
-  "Jane Street Group, LLC <opensource@janestreet.com>"
-  "Jeremie Dimino <jeremie@dimino.org>"
-]
-license: "MIT"
-homepage: "https://github.com/ocaml-dune/csexp"
-doc: "https://ocaml-dune.github.io/csexp/"
-bug-reports: "https://github.com/ocaml-dune/csexp/issues"
-depends: [
-  "dune" {>= "1.11"}
-  "ocaml" {>= "4.02.3"}
-  "result" {>= "1.5"}
-]
-dev-repo: "git+https://github.com/ocaml-dune/csexp.git"
-build: [
-  ["dune" "subst"] {pinned}
-  [
-    "dune"
-    "build"
-    "-p"
-    name
-    "-j"
-    jobs
-    "@install"
-#   "@runtest" {with-test & ocaml:version >= "4.04"}
-    "@doc" {with-doc}
-  ]
-]
-x-commit-hash: "19a2e7bc171a707059c73d78dd18e4e3ff03ac9b"
-url {
-  src:
-    "https://github.com/ocaml-dune/csexp/releases/download/1.3.2/csexp-1.3.2.tbz"
-  checksum: [
-    "sha256=f21f427b277f07e8bfd050e00c640a5893c1bf4b689147640fa383255dcf1c4a"
-    "sha512=ff1bd6a7c6bb3a73ca9ab0506c9ec1f357657deaa9ecc7eb32955817d9b0f266d976af3e2b8fc34c621cb0caf1fde55f9a609dd184e2054f500bf09afeb83026"
-  ]
-}
diff --git a/test.esy.lock/opam/csexp.1.4.0/opam b/test.esy.lock/opam/csexp.1.4.0/opam
new file mode 100644
index 0000000000..ef29a05aba
--- /dev/null
+++ b/test.esy.lock/opam/csexp.1.4.0/opam
@@ -0,0 +1,58 @@
+opam-version: "2.0"
+synopsis: "Parsing and printing of S-expressions in Canonical form"
+description: """
+
+This library provides minimal support for Canonical S-expressions
+[1]. Canonical S-expressions are a binary encoding of S-expressions
+that is super simple and well suited for communication between
+programs.
+
+This library only provides a few helpers for simple applications. If
+you need more advanced support, such as parsing from more fancy input
+sources, you should consider copying the code of this library given
+how simple parsing S-expressions in canonical form is.
+
+To avoid a dependency on a particular S-expression library, the only
+module of this library is parameterised by the type of S-expressions.
+
+[1] https://en.wikipedia.org/wiki/Canonical_S-expressions
+"""
+maintainer: ["Jeremie Dimino <jeremie@dimino.org>"]
+authors: [
+  "Quentin Hocquet <mefyl@gruntech.org>"
+  "Jane Street Group, LLC <opensource@janestreet.com>"
+  "Jeremie Dimino <jeremie@dimino.org>"
+]
+license: "MIT"
+homepage: "https://github.com/ocaml-dune/csexp"
+doc: "https://ocaml-dune.github.io/csexp/"
+bug-reports: "https://github.com/ocaml-dune/csexp/issues"
+depends: [
+  "dune" {>= "1.11"}
+  "ocaml" {>= "4.02.3"}
+  "result" {>= "1.5"}
+]
+dev-repo: "git+https://github.com/ocaml-dune/csexp.git"
+build: [
+  ["dune" "subst"] {pinned}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+#   "@runtest" {with-test & ocaml:version >= "4.04"}
+    "@doc" {with-doc}
+  ]
+]
+x-commit-hash: "0e1b2044c8d1ff187c27cec3e46d9cde14892650"
+url {
+  src:
+    "https://github.com/ocaml-dune/csexp/releases/download/1.4.0/csexp-1.4.0.tbz"
+  checksum: [
+    "sha256=8e3d6fca87f102a126dee8b72a2a0d146f10439c47218dfc149d51bf3edf364e"
+    "sha512=604a5094fbbf61f497b342ad0aa8ec25275b2a904cd0c1823fc40daa54a15796b360374ff495c0d8ca3b4c1e6723b2ce37e030857fae131222606de818fb8129"
+  ]
+}