Merge master into staging-next

2020-11-20 08:12:06 +01:00
parent f6105d21e3 26803925aa
commit 553b7a8bf0
47 changed files with 165 additions and 110 deletions
@@ -1,19 +1,31 @@
-{ lib, fetchFromGitHub, buildDunePackage, ocaml, angstrom, faraday, alcotest }:
+{ lib, fetchFromGitHub, fetchpatch, buildDunePackage
+, angstrom, faraday, alcotest
+}:

 buildDunePackage rec {
  pname = "httpaf";
-  version = "0.4.1";
+  version = "0.6.6";
+
+  useDune2 = true;

  src = fetchFromGitHub {
    owner = "inhabitedtype";
    repo = pname;
    rev = version;
-    sha256 = "0i2r004ihj00hd97475y8nhjqjln58xx087zcjl0dfp0n7q80517";
+    sha256 = "065ikryv8zw9cbk6ddcjcind88ckk0inz9m3sqj9nwyfw4v4scm6";
  };

-  checkInputs = lib.optional doCheck alcotest;
+  patches = [
+    # Fix tests with angstrom ≥ 0.14
+    (fetchpatch {
+      url = "https://github.com/inhabitedtype/httpaf/commit/fc0de5f2f1bd8df953ae4d4c9a61032392436c84.patch";
+      sha256 = "1a8ca76ifbgyaq1bqfyq18mmxinjjparzkrr7ljbj0y1z1rl748z";
+    })
+  ];
+
+  checkInputs = [ alcotest ];
  propagatedBuildInputs = [ angstrom faraday ];
-  doCheck = lib.versions.majorMinor ocaml.version != "4.07";
+  doCheck = true;

  meta = {
    description = "A high-performance, memory-efficient, and scalable web server for OCaml";