From 58960d0229c2805c1affccdd58d010d824b63ecf Mon Sep 17 00:00:00 2001
From: Antonio Nuno Monteiro <anmonteiro@gmail.com>
Date: Tue, 18 May 2021 20:58:59 -0700
Subject: [PATCH] Unbreak a few packages (#77)

* nothing to fix here

this was added in https://github.com/NixOS/nixpkgs/commit/81c3f7b8ff75572939ff8ad5781cb9f9a7906be5
and we don't need it in the static build.

* Unbreak a few packages

* httpaf / h2

* websocketaf
---
 ci.nix                        | 5 -----
 default.nix                   | 1 -
 ocaml/gluten/default.nix      | 9 +++------
 ocaml/h2/default.nix          | 6 +++---
 ocaml/httpaf/default.nix      | 4 ++--
 ocaml/websocketaf/default.nix | 4 ++--
 6 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/ci.nix b/ci.nix
index bb681d858..803fb9948 100644
--- a/ci.nix
+++ b/ci.nix
@@ -121,11 +121,6 @@ let
     "mirage-net-xen"
     "netchannel"
 
-    # broken
-    "httpaf-mirage"
-    "h2-mirage"
-    "websocketaf-mirage"
-
     # doesn't work with my fork of http/af
     "paf"
     "git-paf"
diff --git a/default.nix b/default.nix
index b6b24f8f9..993ef27f6 100644
--- a/default.nix
+++ b/default.nix
@@ -26,7 +26,6 @@ in
 {
   # Stripped down postgres without the `bin` part, to allow static linking
   # with musl
-  # FIXME: gssSupport is currently problematic for static because libkrb5 fails
   libpq = super.postgresql.override { enableSystemd = false; gssSupport = false; };
 
   ocamlPackages = oPs.ocamlPackages_4_12;
diff --git a/ocaml/gluten/default.nix b/ocaml/gluten/default.nix
index abbe922db..4894d2e50 100644
--- a/ocaml/gluten/default.nix
+++ b/ocaml/gluten/default.nix
@@ -3,10 +3,10 @@
 with ocamlPackages;
 let
   buildGluten = args: buildDunePackage (rec {
-    version = "0.2.1";
+    version = "0.2.2-dev";
     src = builtins.fetchurl {
-      url = https://github.com/anmonteiro/gluten/archive/410be2e.tar.gz;
-      sha256 = "1ngx9kci10pzgfjkzc3xczx8ppbhsqli5h3gfhzifpn09fkwkxrk";
+      url = https://github.com/anmonteiro/gluten/archive/475c361.tar.gz;
+      sha256 = "0la1r30k6siv064nvlml85qk7m70ysnzwq0mnk7vm34656vh6m05";
     };
   } // args);
 
@@ -48,8 +48,5 @@ in
       mirage-flow
       cstruct
     ];
-    meta = {
-      broken = true;
-    };
   };
 } else { })
diff --git a/ocaml/h2/default.nix b/ocaml/h2/default.nix
index 927758b2f..b781f09db 100644
--- a/ocaml/h2/default.nix
+++ b/ocaml/h2/default.nix
@@ -3,10 +3,10 @@
 with ocamlPackages;
 let
   buildH2 = args: buildDunePackage (rec {
-    version = "0.8.0";
+    version = "0.8.0-dev";
     src = builtins.fetchurl {
-      url = "https://github.com/anmonteiro/ocaml-h2/releases/download/${version}/h2-${version}.tbz";
-      sha256 = "0qcn3yvyz0h419fjg9nb20csfmwmh3ihz0zb0jfzdycf5w4mlry6";
+      url = https://github.com/anmonteiro/ocaml-h2/archive/93c7e071a0bf8e0b7360cc9d7dc4532cbe0943e9.tar.gz;
+      sha256 = "16jvwbifcq26p6g8w5q49biqjfs2yw82dryfls5zd9cblawzifsb";
     };
   } // args);
 in
diff --git a/ocaml/httpaf/default.nix b/ocaml/httpaf/default.nix
index 8e4eaeb32..a4d777cf6 100644
--- a/ocaml/httpaf/default.nix
+++ b/ocaml/httpaf/default.nix
@@ -7,7 +7,7 @@ buildDunePackage {
   pname = "httpaf";
   propagatedBuildInputs = [ angstrom faraday ];
   src = builtins.fetchurl {
-    url = https://github.com/anmonteiro/httpaf/archive/b78a84204fb10f48f9e38f3acec6ff9c759e0963.tar.gz;
-    sha256 = "1x72xlamxaqrkplzn0wfd6hzkc7cc11inqwn03zp541qkrjfh0g2";
+    url = https://github.com/anmonteiro/httpaf/archive/559019829b7ed267a5b4b86aed1e7d7795214bcd.tar.gz;
+    sha256 = "1v4h9m485i3gfy9xdgz94sm31jbhi53c7n9ry7q615a6ih78vfnb";
   };
 }
diff --git a/ocaml/websocketaf/default.nix b/ocaml/websocketaf/default.nix
index 757be96b4..42358f92e 100644
--- a/ocaml/websocketaf/default.nix
+++ b/ocaml/websocketaf/default.nix
@@ -5,8 +5,8 @@ let
   buildWebsocketaf = args: buildDunePackage ({
     version = "0.0.1-dev";
     src = builtins.fetchurl {
-      url = https://github.com/anmonteiro/websocketaf/archive/fb9926b6f653252e4ba5009bbb171a11c0e4e6fc.tar.gz;
-      sha256 = "105cbpcdbsx11p63v3s2cld1sixhm5kjjj4g6k9jvi2gs2p808hg";
+      url = https://github.com/anmonteiro/websocketaf/archive/d75942f936821231cb4ff46b95cf2753d7329233.tar.gz;
+      sha256 = "14y3cj3sd8kgijj7mw20rfr8hr7asj6mll6n4b9sjj02pqhfqqaz";
     };
   } // args);