From d31bb1e0761e9fd7215558eff3ed2e5db55306df Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 24 Sep 2024 20:33:56 +0200
Subject: [PATCH] =?UTF-8?q?piaf:=200.1.0=20=E2=86=92=200.2.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocaml-modules/piaf/default.nix            | 59 ++++++++++---------
 1 file changed, 32 insertions(+), 27 deletions(-)

diff --git a/pkgs/development/ocaml-modules/piaf/default.nix b/pkgs/development/ocaml-modules/piaf/default.nix
index 991764336657..9c2e481b76e4 100644
--- a/pkgs/development/ocaml-modules/piaf/default.nix
+++ b/pkgs/development/ocaml-modules/piaf/default.nix
@@ -1,52 +1,57 @@
-{ alcotest-lwt
+{ alcotest
 , buildDunePackage
-, ocaml
-, bigarray-compat
-, dune-site
 , fetchurl
-, gluten-lwt-unix
+, eio-ssl
+, faraday
+, h2-eio
+, httpun-eio
+, httpun-ws
+, ipaddr
+, ke
 , lib
 , logs
 , magic-mime
-, mrmime
-, psq
-, rresult
+, pecu
+, prettym
+, unstrctrd
 , uri
+, uutf
+, dune-site
+, eio_main
 }:
 
-lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
-  "piaf is not available for OCaml ${ocaml.version}"
-
 buildDunePackage rec {
   pname = "piaf";
-  version = "0.1.0";
+  version = "0.2.0";
 
   src = fetchurl {
     url = "https://github.com/anmonteiro/piaf/releases/download/${version}/piaf-${version}.tbz";
-    hash = "sha256-AMO+ptGox33Bi7u/H0SaeCU88XORrRU3UbLof3EwcmU=";
+    hash = "sha256-B/qQCaUvrqrm2GEW51AH9SebGFx7x8laq5RV8hBzcPs=";
   };
 
-  postPatch = ''
-    substituteInPlace ./vendor/dune --replace "mrmime.prettym" "prettym"
-  '';
-
   propagatedBuildInputs = [
-    bigarray-compat
+    eio-ssl
+    faraday
+    h2-eio
+    httpun-eio
+    httpun-ws
+    ipaddr
     logs
     magic-mime
-    mrmime
-    psq
-    rresult
+    pecu
+    prettym
+    unstrctrd
     uri
-    gluten-lwt-unix
+    uutf
   ];
 
-  nativeCheckInputs = [
-    alcotest-lwt
-    dune-site
-  ];
-  # Check fails with OpenSSL 3
+  # Some test cases fail
   doCheck = false;
+  checkInputs = [
+    alcotest
+    dune-site
+    eio_main
+  ];
 
   meta = {
     description = "HTTP library with HTTP/2 support written entirely in OCaml";