diff options
author | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
---|---|---|
committer | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
commit | 80d90d9b204f7c17912740f9f414fe5d59f293ba (patch) | |
tree | 5f2065a06e724270610760d59d01c6888b375a46 /infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/httpaf/default.nix | |
parent | 3a31a84c7d3e589035ad08499206aac44a81f424 (diff) | |
parent | 83cbad92d73216bb0d9187c56cce0b91f9121d5a (diff) |
Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/httpaf/default.nix')
-rw-r--r-- | infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/httpaf/default.nix | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/httpaf/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/httpaf/default.nix index 42e7c1eac1b6..fbc21108bd02 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/httpaf/default.nix +++ b/infra/libkookie/nixpkgs/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"; |