From 94d8b98b7e12c6eb24a905b1ffe346a60c1e3573 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 20 Oct 2022 19:56:13 +0200 Subject: [PATCH] =?UTF-8?q?ocamlPackages.faraday:=200.8.1=20=E2=86=92=200.?= =?UTF-8?q?8.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/faraday/async.nix | 9 ++------- pkgs/development/ocaml-modules/faraday/default.nix | 10 ++++------ pkgs/development/ocaml-modules/faraday/lwt-unix.nix | 2 +- pkgs/development/ocaml-modules/faraday/lwt.nix | 2 +- 4 files changed, 8 insertions(+), 15 deletions(-) diff --git a/pkgs/development/ocaml-modules/faraday/async.nix b/pkgs/development/ocaml-modules/faraday/async.nix index 9e4a9b24cea9..90f56c159632 100644 --- a/pkgs/development/ocaml-modules/faraday/async.nix +++ b/pkgs/development/ocaml-modules/faraday/async.nix @@ -1,17 +1,12 @@ -{ buildDunePackage, lib, fetchpatch, faraday, core, async }: +{ buildDunePackage, lib, faraday, core_unix, async }: buildDunePackage rec { pname = "faraday-async"; inherit (faraday) version src; - patches = lib.optional (lib.versionAtLeast async.version "0.15") (fetchpatch { - url = "https://github.com/inhabitedtype/faraday/commit/31c3fc7f91ecca0f1deea10b40fd5e33bcd35f75.patch"; - sha256 = "05z5gk7hxq7qvwg6f73hdhfcnx19p1dq6wqh8prx667y8zsaq2zj"; - }); - minimalOCamlVersion = "4.08"; - propagatedBuildInputs = [ faraday core async ]; + propagatedBuildInputs = [ faraday core_unix async ]; meta = faraday.meta // { description = "Async support for Faraday"; diff --git a/pkgs/development/ocaml-modules/faraday/default.nix b/pkgs/development/ocaml-modules/faraday/default.nix index 8b4237ed4ed7..0dcfd5ec02de 100644 --- a/pkgs/development/ocaml-modules/faraday/default.nix +++ b/pkgs/development/ocaml-modules/faraday/default.nix @@ -2,22 +2,20 @@ buildDunePackage rec { pname = "faraday"; - version = "0.8.1"; + version = "0.8.2"; - useDune2 = true; - - minimumOCamlVersion = "4.02"; + minimalOCamlVersion = "4.08"; src = fetchFromGitHub { owner = "inhabitedtype"; repo = pname; rev = version; - sha256 = "sha256-eeR+nst/r2iFxCDmRS+LGr3yl/o27DcsS30YAu1GJmc="; + sha256 = "sha256-wR4kDocR1t3OLRuudXH8IccYde552O6Gvo5BHNxRbAI="; }; checkInputs = [ alcotest ]; propagatedBuildInputs = [ bigstringaf ]; - doCheck = lib.versionAtLeast ocaml.version "4.08"; + doCheck = true; meta = { description = "Serialization library built for speed and memory efficiency"; diff --git a/pkgs/development/ocaml-modules/faraday/lwt-unix.nix b/pkgs/development/ocaml-modules/faraday/lwt-unix.nix index 23914de26575..a184011e9137 100644 --- a/pkgs/development/ocaml-modules/faraday/lwt-unix.nix +++ b/pkgs/development/ocaml-modules/faraday/lwt-unix.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "faraday-lwt-unix"; - inherit (faraday) version src useDune2 minimumOCamlVersion; + inherit (faraday) version src; propagatedBuildInputs = [ lwt faraday-lwt ]; diff --git a/pkgs/development/ocaml-modules/faraday/lwt.nix b/pkgs/development/ocaml-modules/faraday/lwt.nix index 7fe7319575c5..2db306254f3f 100644 --- a/pkgs/development/ocaml-modules/faraday/lwt.nix +++ b/pkgs/development/ocaml-modules/faraday/lwt.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "faraday-lwt"; - inherit (faraday) version src useDune2 minimumOCamlVersion; + inherit (faraday) version src; propagatedBuildInputs = [ faraday lwt ];