Rely on h2/gluten forks until changes are incorporated upstream

dialohq · Apr 17, 2024 · 1a0e2be · 1a0e2be
1 parent 824ada9
commit 1a0e2be
Show file tree

Hide file tree

Showing 3 changed files with 108 additions and 8 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -8,9 +8,12 @@
     };
     flake-parts.url = "github:hercules-ci/flake-parts";
     nix-filter.url = "github:numtide/nix-filter";
+    ocaml-overlay.url =
+      "github:nix-ocaml/nix-overlays/a6364bea92bb35b01a3a70eed9a5cdb1063e128e";
+    ocaml-overlay.inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  outputs = inputs@{ flake-parts, nix-filter, ... }:
+  outputs = inputs@{ flake-parts, nix-filter, ocaml-overlay, ... }:
     flake-parts.lib.mkFlake { inherit inputs; } {
       systems =
         [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
@@ -19,14 +22,14 @@
 
       perSystem = { config, self', inputs', system, ... }:
         let
-          pkgs = (import inputs.nixpkgs {
+          pkgs = (((import inputs.nixpkgs {
             inherit system;
             config.allowUnfree = true;
-            overlays = [ ];
-          }).extend (self: super: {
+            overlays = [ ocaml-overlay.outputs.overlays ];
+          })).extend (import ./overlay.nix)).extend (self: super: {
             ocamlPackages = super.ocaml-ng.ocamlPackages_5_1;
           });
-          camlPkgs = pkgs.ocamlPackages;
+          camlPkgs = pkgs.ocaml-ng.ocamlPackages_5_1;
           bechamel-notty = camlPkgs.buildDunePackage {
             pname = "bechamel-notty";
             version = "0.5.0";
@@ -112,8 +115,8 @@
                 core_unix
                 ppx_deriving_yojson
                 cohttp-lwt-unix
-                h2-eio
-                h2-async
+                camlPkgs.h2-eio
+                camlPkgs.h2-async
                 tls-async
                 self'.packages.grpc
                 self'.packages.grpc-lwt

diff --git a/overlay.nix b/overlay.nix
@@ -0,0 +1,41 @@
+self: super: let
+  inherit (super) fetchFromGitHub;
+in {
+  ocaml-ng =
+    super.ocaml-ng
+    // {
+      ocamlPackages_5_1 =
+        super.ocaml-ng.ocamlPackages_5_1.overrideScope'
+        (oself: super:
+          {
+            h2 = super.h2.overrideAttrs (_: {
+              src = fetchFromGitHub {
+                owner = "dialohq";
+                repo = "ocaml-h2";
+                rev = "fc872de80a4d64725cd0651ab21399676be9de39";
+                sha256 = "sha256-4FmTkc3sCHzuzDJoYtiLnsewXc8sjWS7FgcOJJTZ5fk=";
+                fetchSubmodules = true;
+              };
+            });
+            h2-eio = super.h2-eio.overrideAttrs (_: {
+              src = fetchFromGitHub {
+                owner = "dialohq";
+                repo = "ocaml-h2";
+                rev = "fc872de80a4d64725cd0651ab21399676be9de39";
+                sha256 = "sha256-4FmTkc3sCHzuzDJoYtiLnsewXc8sjWS7FgcOJJTZ5fk=";
+                fetchSubmodules = true;
+              };
+            });
+            gluten-eio = super.gluten-eio.overrideAttrs (_: {
+              src = fetchFromGitHub {
+                owner = "dialohq";
+                repo = "gluten";
+                rev = "94f64daa376a6c860b0af7cdfb9daea54ec939b0";
+                sha256 = "sha256-nJp+BLfqzjgnY9Mamrgbj2q5KDip8i3EMpjYL+ntV2w=";
+                fetchSubmodules = true;
+              };
+            });
+          });
+    };
+}
+