summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Laporte <Vincent.Laporte@gmail.com>2020-11-11 06:42:30 +0100
committerVincent Laporte <vbgl@users.noreply.github.com>2020-11-18 08:24:28 +0100
commit597e7748d1fa603062a66cb74ff8d5f5eaf2f481 (patch)
treefa524d7e63247e2273a783595ada16258f3c9c3b
parentc1e60d958402a7750193c803e5e52fc0d7017b05 (diff)
ocamlPackages.dispatch: 0.4.1 → 0.5.0
ocamlPackages.webmachine: 0.6.2 → 0.7.0
-rw-r--r--pkgs/development/ocaml-modules/dispatch/default.nix12
-rw-r--r--pkgs/development/ocaml-modules/webmachine/default.nix6
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 03f2afbd3141..65baa3dc4982 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 14b1d2d2321f..c7ad92efe768 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;