From 565589da39ea7df46dac2b6ce5f57f876f7a56c4 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 16 Sep 2022 20:51:17 +0200
Subject: [PATCH] =?UTF-8?q?ocamlPackages.paf:=200.0.8=20=E2=86=92=200.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ocamlPackages.{hpack,h2}: 0.8.0 → 0.9.0
---
 pkgs/development/ocaml-modules/h2/default.nix    | 5 ++---
 pkgs/development/ocaml-modules/hpack/default.nix | 7 +++----
 pkgs/development/ocaml-modules/paf/cohttp.nix    | 4 +---
 pkgs/development/ocaml-modules/paf/default.nix   | 9 ++++-----
 pkgs/development/ocaml-modules/paf/le.nix        | 2 --
 5 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/ocaml-modules/h2/default.nix b/pkgs/development/ocaml-modules/h2/default.nix
index 4973de7c183..95272890e15 100644
--- a/pkgs/development/ocaml-modules/h2/default.nix
+++ b/pkgs/development/ocaml-modules/h2/default.nix
@@ -28,10 +28,9 @@ buildDunePackage rec {
   inherit (hpack)
     version
     src
-    useDune2
     ;
 
-  minimumOCamlVersion = "4.06";
+  minimalOCamlVersion = "4.06";
 
   propagatedBuildInputs = [
     angstrom
@@ -42,7 +41,7 @@ buildDunePackage rec {
     httpaf
   ];
 
-  # Tests fail with 4.06
+  # Tests fail with ≤ 4.07
   doCheck = lib.versionAtLeast ocaml.version "4.08";
   preCheck = ''
     ln -s "${http2-frame-test-case}" lib_test/http2-frame-test-case
diff --git a/pkgs/development/ocaml-modules/hpack/default.nix b/pkgs/development/ocaml-modules/hpack/default.nix
index ec967312b87..5ebb14f30b8 100644
--- a/pkgs/development/ocaml-modules/hpack/default.nix
+++ b/pkgs/development/ocaml-modules/hpack/default.nix
@@ -7,15 +7,14 @@
 
 buildDunePackage rec {
   pname = "hpack";
-  version = "0.8.0";
+  version = "0.9.0";
 
   src = fetchurl {
     url = "https://github.com/anmonteiro/ocaml-h2/releases/download/${version}/h2-${version}.tbz";
-    sha256 = "0qcn3yvyz0h419fjg9nb20csfmwmh3ihz0zb0jfzdycf5w4mlry6";
+    sha256 = "sha256-7gjRhJs2mufQbImAXiKFT9mZ1kHGSHHwjCVZM5f0C14=";
   };
 
-  useDune2 = true;
-  minimumOCamlVersion = "4.04";
+  minimalOCamlVersion = "4.04";
 
   propagatedBuildInputs = [
     angstrom
diff --git a/pkgs/development/ocaml-modules/paf/cohttp.nix b/pkgs/development/ocaml-modules/paf/cohttp.nix
index b1a6321032c..fe0505fe7ea 100644
--- a/pkgs/development/ocaml-modules/paf/cohttp.nix
+++ b/pkgs/development/ocaml-modules/paf/cohttp.nix
@@ -22,8 +22,6 @@ buildDunePackage {
   inherit (paf)
     version
     src
-    useDune2
-    minimumOCamlVersion
   ;
 
   propagatedBuildInputs = [
@@ -34,7 +32,7 @@ buildDunePackage {
     ipaddr
   ];
 
-  doCheck = false;  # tests fail
+  doCheck = true;
   checkInputs = [
     alcotest-lwt
     fmt
diff --git a/pkgs/development/ocaml-modules/paf/default.nix b/pkgs/development/ocaml-modules/paf/default.nix
index 05d0edcebd4..cf7a25b81d0 100644
--- a/pkgs/development/ocaml-modules/paf/default.nix
+++ b/pkgs/development/ocaml-modules/paf/default.nix
@@ -25,15 +25,14 @@
 
 buildDunePackage rec {
   pname = "paf";
-  version = "0.0.8";
+  version = "0.1.0";
 
   src = fetchurl {
     url = "https://github.com/dinosaure/paf-le-chien/releases/download/${version}/paf-${version}.tbz";
-    sha256 = "CyIIV11G7oUPPHuhov52LP4Ih4pY6bcUApD23/9q39k=";
+    sha256 = "sha256-JIJjECEbajauowbXot19vtiDhTpGAQiSCBY0AHZOyZM=";
   };
 
-  useDune2 = true;
-  minimumOCamlVersion = "4.08";
+  minimalOCamlVersion = "4.08";
 
   propagatedBuildInputs = [
     mirage-stack
@@ -49,7 +48,7 @@ buildDunePackage rec {
     tcpip
   ];
 
-  doCheck = false;
+  doCheck = true;
   checkInputs = [
     lwt
     logs
diff --git a/pkgs/development/ocaml-modules/paf/le.nix b/pkgs/development/ocaml-modules/paf/le.nix
index 06a8d9b51eb..5c07eba3aab 100644
--- a/pkgs/development/ocaml-modules/paf/le.nix
+++ b/pkgs/development/ocaml-modules/paf/le.nix
@@ -17,8 +17,6 @@ buildDunePackage {
   inherit (paf)
     version
     src
-    useDune2
-    minimumOCamlVersion
   ;
 
   propagatedBuildInputs = [