From c40846190439f5977d93c99e2667a1ec52fa435c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 13 Nov 2020 08:12:34 +0100 Subject: [PATCH] =?UTF-8?q?ocamlPackages.httpaf:=200.4.1=20=E2=86=92=200.6?= =?UTF-8?q?.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/httpaf/default.nix | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/httpaf/default.nix b/pkgs/development/ocaml-modules/httpaf/default.nix index 42e7c1eac1b..fbc21108bd0 100644 --- a/pkgs/development/ocaml-modules/httpaf/default.nix +++ b/pkgs/development/ocaml-modules/httpaf/default.nix @@ -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";