From bed82a9b5029883473d2c6e6b97f23b1c907790b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 10 Apr 2023 14:14:41 +0200 Subject: [PATCH] ocamlPackages.junit: use Dune 3 --- pkgs/development/ocaml-modules/junit/alcotest.nix | 3 ++- pkgs/development/ocaml-modules/junit/default.nix | 2 +- pkgs/development/ocaml-modules/junit/ounit.nix | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/junit/alcotest.nix b/pkgs/development/ocaml-modules/junit/alcotest.nix index 85abaf7f872..6bcdbab3349 100644 --- a/pkgs/development/ocaml-modules/junit/alcotest.nix +++ b/pkgs/development/ocaml-modules/junit/alcotest.nix @@ -3,7 +3,8 @@ buildDunePackage ({ pname = "junit_alcotest"; - inherit (junit) src version meta useDune2; + inherit (junit) src version meta; + duneVersion = "3"; propagatedBuildInputs = [ junit diff --git a/pkgs/development/ocaml-modules/junit/default.nix b/pkgs/development/ocaml-modules/junit/default.nix index 4c1df880ec8..cd33ae2f7f5 100644 --- a/pkgs/development/ocaml-modules/junit/default.nix +++ b/pkgs/development/ocaml-modules/junit/default.nix @@ -14,7 +14,7 @@ buildDunePackage (rec { tyxml ]; - useDune2 = true; + duneVersion = "3"; doCheck = true; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/junit/ounit.nix b/pkgs/development/ocaml-modules/junit/ounit.nix index 5f261b07236..c7d53ecc4f5 100644 --- a/pkgs/development/ocaml-modules/junit/ounit.nix +++ b/pkgs/development/ocaml-modules/junit/ounit.nix @@ -3,7 +3,8 @@ buildDunePackage ({ pname = "junit_ounit"; - inherit (junit) src version meta useDune2; + inherit (junit) src version meta; + duneVersion = "3"; propagatedBuildInputs = [ junit