diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-03 18:01:07 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-03 18:01:07 +0000 |
| commit | d39be47e172355d00f65ab60a73f41001e42ef92 (patch) | |
| tree | 1a606ca3a5576a13c67d348c838fdb806064cbbd /pkgs/development/ocaml-modules | |
| parent | 6cead635ad8672767515917c0e789533fe1ce4af (diff) | |
| parent | f3fc8b9fa888afe3fa9d80ffb4ecab7d96fbeb04 (diff) | |
| download | nixlib-d39be47e172355d00f65ab60a73f41001e42ef92.tar nixlib-d39be47e172355d00f65ab60a73f41001e42ef92.tar.gz nixlib-d39be47e172355d00f65ab60a73f41001e42ef92.tar.bz2 nixlib-d39be47e172355d00f65ab60a73f41001e42ef92.tar.lz nixlib-d39be47e172355d00f65ab60a73f41001e42ef92.tar.xz nixlib-d39be47e172355d00f65ab60a73f41001e42ef92.tar.zst nixlib-d39be47e172355d00f65ab60a73f41001e42ef92.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/ocaml-modules')
| -rw-r--r-- | pkgs/development/ocaml-modules/alcotest/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/alcotest/lwt.nix | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/development/ocaml-modules/alcotest/default.nix b/pkgs/development/ocaml-modules/alcotest/default.nix index 94626f3c1798..abef3ef7ef46 100644 --- a/pkgs/development/ocaml-modules/alcotest/default.nix +++ b/pkgs/development/ocaml-modules/alcotest/default.nix @@ -4,13 +4,13 @@ buildDunePackage rec { pname = "alcotest"; - version = "1.2.3"; + version = "1.3.0"; useDune2 = true; src = fetchurl { url = "https://github.com/mirage/alcotest/releases/download/${version}/alcotest-mirage-${version}.tbz"; - sha256 = "1bmjcivbmd4vib15v4chycgd1gl8js9dk94vzxkdg06zxqd4hp08"; + sha256 = "sha256-efnevbyolTdNb91zr4pHDcvgaLQQSD01wEu2zMM+iaw="; }; propagatedBuildInputs = [ astring cmdliner fmt uuidm re stdlib-shims uutf ]; diff --git a/pkgs/development/ocaml-modules/alcotest/lwt.nix b/pkgs/development/ocaml-modules/alcotest/lwt.nix index 82efbe91a069..5a57dc0fcc2e 100644 --- a/pkgs/development/ocaml-modules/alcotest/lwt.nix +++ b/pkgs/development/ocaml-modules/alcotest/lwt.nix @@ -1,13 +1,16 @@ -{ lib, buildDunePackage, alcotest, logs, ocaml_lwt }: +{ lib, buildDunePackage, alcotest, logs, ocaml_lwt, fmt +, re, cmdliner +}: buildDunePackage { pname = "alcotest-lwt"; inherit (alcotest) version src useDune2; - propagatedBuildInputs = [ alcotest logs ocaml_lwt ]; + propagatedBuildInputs = [ alcotest logs ocaml_lwt fmt ]; doCheck = true; + checkInputs = [ re cmdliner ]; meta = alcotest.meta // { description = "Lwt-based helpers for Alcotest"; |