From 597e7748d1fa603062a66cb74ff8d5f5eaf2f481 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 11 Nov 2020 06:42:30 +0100 Subject: [PATCH] =?UTF-8?q?ocamlPackages.dispatch:=200.4.1=20=E2=86=92=200?= =?UTF-8?q?.5.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ocamlPackages.webmachine: 0.6.2 → 0.7.0 --- pkgs/development/ocaml-modules/dispatch/default.nix | 12 +++++++----- .../development/ocaml-modules/webmachine/default.nix | 6 +++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/ocaml-modules/dispatch/default.nix b/pkgs/development/ocaml-modules/dispatch/default.nix index 03f2afbd314..65baa3dc498 100644 --- a/pkgs/development/ocaml-modules/dispatch/default.nix +++ b/pkgs/development/ocaml-modules/dispatch/default.nix @@ -1,21 +1,23 @@ -{ lib, buildDunePackage, fetchFromGitHub, alcotest, result }: +{ lib, buildDunePackage, fetchFromGitHub, ocaml, alcotest, result }: buildDunePackage rec { pname = "dispatch"; - version = "0.4.1"; + version = "0.5.0"; + + useDune2 = true; src = fetchFromGitHub { owner = "inhabitedtype"; repo = "ocaml-dispatch"; rev = version; - sha256 = "05kb9zcihk50r2haqz8vrlr7kmaka6vrs4j1z500lmnl877as6qr"; + sha256 = "12r39ylbxc297cbwjadhd1ghxnwwcdzfjk68r97wim8hcgzxyxv4"; }; propagatedBuildInputs = [ result ]; - checkInputs = lib.optional doCheck alcotest; + checkInputs = [ alcotest ]; - doCheck = true; + doCheck = lib.versionAtLeast ocaml.version "4.05"; meta = { inherit (src.meta) homepage; diff --git a/pkgs/development/ocaml-modules/webmachine/default.nix b/pkgs/development/ocaml-modules/webmachine/default.nix index 14b1d2d2321..c7ad92efe76 100644 --- a/pkgs/development/ocaml-modules/webmachine/default.nix +++ b/pkgs/development/ocaml-modules/webmachine/default.nix @@ -5,7 +5,7 @@ buildDunePackage rec { pname = "webmachine"; - version = "0.6.2"; + version = "0.7.0"; useDune2 = true; minimumOCamlVersion = "4.04"; @@ -14,12 +14,12 @@ buildDunePackage rec { owner = "inhabitedtype"; repo = "ocaml-webmachine"; rev = version; - sha256 = "1zi1vsm589y2njwzsqkmdbxvs9s4xlgbd62xqw2scp60mccp09nk"; + sha256 = "03ynb1l2jjqba88m9r8m5hwlm8izpfp617r4vcab5kmdim1l2ffx"; }; propagatedBuildInputs = [ cohttp dispatch ptime ]; - checkInputs = lib.optional doCheck ounit; + checkInputs = [ ounit ]; doCheck = true;