From d6582b24eaddc4d688ab969e8b01ce9ee584f6e2 Mon Sep 17 00:00:00 2001
From: Antonio Nuno Monteiro <anmonteiro@gmail.com>
Date: Thu, 26 Oct 2023 14:41:10 -0700
Subject: [PATCH] Update Melange to latest tip (without belt by default), other
 misc pkgs (#1128)

---
 ocaml/default.nix          | 28 ++++++++++++++++++++--------
 ocaml/gluten/default.nix   |  8 ++++----
 ocaml/h2/hpack.nix         |  4 ++--
 ocaml/melange-packages.nix |  4 ++--
 ocaml/melange/default.nix  |  6 +++---
 overlay/default.nix        |  6 +++---
 6 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/ocaml/default.nix b/ocaml/default.nix
index 8254b323f..688533932 100644
--- a/ocaml/default.nix
+++ b/ocaml/default.nix
@@ -601,7 +601,21 @@ with oself;
     doCheck = lib.versionAtLeast ocaml.version "5.0";
   });
 
-  data-encoding = disableTests osuper.data-encoding;
+  json-data-encoding = osuper.json-data-encoding.overrideAttrs (o: {
+    src = fetchFromGitLab {
+      owner = "nomadic-labs";
+      repo = "data-encoding";
+      rev = "v1.0.1";
+      hash = "sha256-768uEfqo5pTW9VhmmHNjtoI5eA7KA6epTsjeq2uJC1I=";
+    };
+    propagatedBuildInputs = o.propagatedBuildInputs ++ [ hex ];
+    # Tests need js_of_ocaml
+    doCheck = false;
+  });
+  data-encoding = osuper.data-encoding.overrideAttrs (o: {
+    inherit (json-data-encoding) src doCheck;
+    propagatedBuildInputs = o.propagatedBuildInputs ++ [ ppx_expect ];
+  });
 
   dataloader = callPackage ./dataloader { };
   dataloader-lwt = callPackage ./dataloader/lwt.nix { };
@@ -1670,8 +1684,8 @@ with oself;
 
   odoc-parser = osuper.odoc-parser.overrideAttrs (_: {
     src = builtins.fetchurl {
-      url = https://github.com/ocaml/odoc/releases/download/v2.3.0/odoc-2.3.0.tbz;
-      sha256 = "0v4dfhxgbx0nz37vi0difb7aiz5fp34yg06wn8b92f7wxygjsvf4";
+      url = https://github.com/ocaml/odoc/releases/download/2.3.1/odoc-2.3.1.tbz;
+      sha256 = "00z6fzxfjy5cvgddbp6vi9y8py94cz8m0vbbrgyvswvya01h3qin";
     };
     propagatedBuildInputs = [ astring camlp-streams ];
     postPatch = ''
@@ -2524,11 +2538,9 @@ with oself;
   });
 
   zmq = osuper.zmq.overrideAttrs (_: {
-    src = fetchFromGitHub {
-      owner = "issuu";
-      repo = "ocaml-zmq";
-      rev = "76519114b6b1092aeccaa4d21504695c6b0cd0a2";
-      hash = "sha256-jjOh6bgHiPI7CZhq4NdMT6yqGSaZ9N5WBIcyTzriwBs=";
+    src = builtins.fetchurl {
+      url = https://github.com/issuu/ocaml-zmq/releases/download/5.2.2/zmq-5.2.2.tbz;
+      sha256 = "0qgzdnk99xrd842g4f6na5djygf5fli2sfjn1ppqar7ma1m4xdqk";
     };
   });
 } // janeStreet // (
diff --git a/ocaml/gluten/default.nix b/ocaml/gluten/default.nix
index aded5765f..f64e0308b 100644
--- a/ocaml/gluten/default.nix
+++ b/ocaml/gluten/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, buildDunePackage, bigstringaf, faraday, ke }:
+{ fetchFromGitHub, buildDunePackage, bigstringaf, faraday }:
 
 buildDunePackage {
   pname = "gluten";
@@ -7,8 +7,8 @@ buildDunePackage {
   src = fetchFromGitHub {
     owner = "anmonteiro";
     repo = "gluten";
-    rev = "e8efb527eb92924793615714c973cd9ee32d490b";
-    hash = "sha256-7T2VwdNjkqMEAqHlfe0TgroOnj/O/RDdlSy3ySIzXCw=";
+    rev = "166e1e917710e1e43b04d33a368b6701a9f8b1f5";
+    hash = "sha256-wl6fgMVz996su8+pRFzjvQa2BPDtsIo1eQ9X2REzJsc=";
   };
-  propagatedBuildInputs = [ bigstringaf faraday ke ];
+  propagatedBuildInputs = [ bigstringaf faraday ];
 }
diff --git a/ocaml/h2/hpack.nix b/ocaml/h2/hpack.nix
index a4b51a845..f355d35ce 100644
--- a/ocaml/h2/hpack.nix
+++ b/ocaml/h2/hpack.nix
@@ -7,8 +7,8 @@ buildDunePackage {
   src = fetchFromGitHub {
     owner = "anmonteiro";
     repo = "ocaml-h2";
-    rev = "f92e6889aec5edfae0234ffd204142b5095af07d";
-    hash = "sha256-qcod6R5zQwQssAZTO2XhHiePvsYbLE/Zt7Gx7DTheDc=";
+    rev = "c694398c1b429db622638e94f9a6f8fbce2a208a";
+    hash = "sha256-MJtzongD3EhHNueVK+DtyyAn6vyF28NBB/0mcXOQRao=";
   };
   propagatedBuildInputs = [ angstrom faraday ];
 }
diff --git a/ocaml/melange-packages.nix b/ocaml/melange-packages.nix
index fe957f516..8b5703a05 100644
--- a/ocaml/melange-packages.nix
+++ b/ocaml/melange-packages.nix
@@ -75,8 +75,8 @@ with oself;
     src = fetchFromGitHub {
       owner = "anmonteiro";
       repo = "melange-relay";
-      rev = "cf654d4dd9b694b968a20e23db29a273e059e945";
-      hash = "sha256-Gy5Z/1WmhQy+xQvW0Ef2b9kmh4eLz2Cv+wUG+yAPp+0=";
+      rev = "3b9430c441b0d15fb435d80c2f5d5993200be182";
+      hash = "sha256-z58p6Cz9HjAI55d1PVuVbW121qWaWMtDfYk7CKIg0VY=";
     };
     nativeBuildInputs = [ melange ];
     propagatedBuildInputs = [
diff --git a/ocaml/melange/default.nix b/ocaml/melange/default.nix
index e862362d7..2c0a5fa84 100644
--- a/ocaml/melange/default.nix
+++ b/ocaml/melange/default.nix
@@ -22,8 +22,8 @@ buildDunePackage {
   src = fetchFromGitHub {
     owner = "melange-re";
     repo = "melange";
-    rev = "2.1.0";
-    hash = "sha256-kdguJxSQkGShL4RN9N2K52USy9I4SovjcH/F4NiS/8Y=";
+    rev = "c5bf086511ed4830018e67ca63df86045dbe356d";
+    hash = "sha256-axGv65Odh4gaPA+fovezkx2HNs9K2K4uqFSWjGVs+yE=";
     fetchSubmodules = true;
   };
 
@@ -36,7 +36,7 @@ buildDunePackage {
 
   postInstall = ''
     wrapProgram "$out/bin/melc" \
-      --set MELANGELIB "$OCAMLFIND_DESTDIR/melange/melange:$OCAMLFIND_DESTDIR/melange/js/melange:$OCAMLFIND_DESTDIR/melange/belt/melange"
+      --set MELANGELIB "$OCAMLFIND_DESTDIR/melange/melange:$OCAMLFIND_DESTDIR/melange/js/melange"
   '';
 
   meta.mainProgram = "melc";
diff --git a/overlay/default.nix b/overlay/default.nix
index 7d4a908f6..3d518f2fe 100644
--- a/overlay/default.nix
+++ b/overlay/default.nix
@@ -265,8 +265,8 @@ in
         src = fetchFromGitHub {
           owner = "anmonteiro";
           repo = "relay";
-          rev = "f36197ca47bb0ec1d33175397491b1173643eec4";
-          hash = "sha256-yKuO29g79kDtIlvBpuIYAW4lq/v+nEPmAw1HvfeK24k=";
+          rev = "fa42044a06b50117d3d511c0ea7893d29058cdce";
+          hash = "sha256-DAGrgfl41w1v1llq82iyNcQSfuBCPhiTmn5WM9tqGkQ=";
           sparseCheckout = [ "compiler" ];
         };
         dontBuild = true;
@@ -280,7 +280,7 @@ in
       pname = "relay";
       version = "n/a";
       src = "${melange-relay-compiler-src}/compiler";
-      cargoHash = "sha256-yjeRsSQ4cPk6uO4NNqKDp/6cBWPQaQGgFvT8HK1rC6s=";
+      cargoHash = "sha256-4QAmf3ZqC4uxlpoyG8slBTEXYOuzT5GLRBZcVjjSBxQ=";
 
       nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];
       # Needed to get openssl-sys to use pkg-config.