diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2023-04-10 14:14:18 +0200 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2023-04-11 06:36:01 +0200 |
| commit | 40153f233e9fc8e70e9fb9f18f85ccd3a82bf103 (patch) | |
| tree | 4387b955e380aed22d2defe52f1823fefa53e372 | |
| parent | 716adb19e27745c04e5e44a90d44860aa240913d (diff) | |
ocamlPackages.angstrom: use Dune 3
4 files changed, 11 insertions, 10 deletions
diff --git a/pkgs/development/ocaml-modules/angstrom-async/default.nix b/pkgs/development/ocaml-modules/angstrom-async/default.nix index 8c9f97f81abcd..ff390c1598bfe 100644 --- a/pkgs/development/ocaml-modules/angstrom-async/default.nix +++ b/pkgs/development/ocaml-modules/angstrom-async/default.nix @@ -3,9 +3,10 @@ buildDunePackage rec { pname = "angstrom-async"; - inherit (angstrom) version useDune2 src; + inherit (angstrom) version src; - minimumOCamlVersion = "4.04.1"; + duneVersion = "3"; + minimalOCamlVersion = "4.04.1"; propagatedBuildInputs = [ angstrom async ]; diff --git a/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix b/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix index 1bb8833cf0792..063f4c1f80c7c 100644 --- a/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix +++ b/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix @@ -1,13 +1,13 @@ -{ lib, fetchFromGitHub, buildDunePackage, angstrom, ocaml_lwt }: +{ lib, fetchFromGitHub, buildDunePackage, angstrom, lwt }: buildDunePackage rec { pname = "angstrom-lwt-unix"; - inherit (angstrom) version useDune2 src; + inherit (angstrom) version src; - minimumOCamlVersion = "4.03"; + duneVersion = "3"; - propagatedBuildInputs = [ angstrom ocaml_lwt ]; + propagatedBuildInputs = [ angstrom lwt ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/angstrom-unix/default.nix b/pkgs/development/ocaml-modules/angstrom-unix/default.nix index af72c7f8d2d9f..752b6a48ced48 100644 --- a/pkgs/development/ocaml-modules/angstrom-unix/default.nix +++ b/pkgs/development/ocaml-modules/angstrom-unix/default.nix @@ -3,9 +3,9 @@ buildDunePackage rec { pname = "angstrom-unix"; - inherit (angstrom) version useDune2 src; + inherit (angstrom) version src; - minimumOCamlVersion = "4.03"; + duneVersion = "3"; propagatedBuildInputs = [ angstrom ]; diff --git a/pkgs/development/ocaml-modules/angstrom/default.nix b/pkgs/development/ocaml-modules/angstrom/default.nix index 502bd2ad44d7e..c4f5f98e4791b 100644 --- a/pkgs/development/ocaml-modules/angstrom/default.nix +++ b/pkgs/development/ocaml-modules/angstrom/default.nix @@ -3,9 +3,9 @@ buildDunePackage rec { pname = "angstrom"; version = "0.15.0"; - useDune2 = true; + duneVersion = "3"; - minimumOCamlVersion = "4.04"; + minimalOCamlVersion = "4.04"; src = fetchFromGitHub { owner = "inhabitedtype"; |