From a29c4b0bf543f64a87688732c66c24f49412ed8c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 22 Mar 2023 14:10:44 +0100 Subject: [PATCH] ocamlPackages.bls12-381: use Dune 3 --- .../development/ocaml-modules/bls12-381-signature/default.nix | 2 ++ pkgs/development/ocaml-modules/bls12-381/default.nix | 1 + pkgs/development/ocaml-modules/bls12-381/gen.nix | 2 +- pkgs/development/ocaml-modules/bls12-381/legacy.nix | 4 +++- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/bls12-381-signature/default.nix b/pkgs/development/ocaml-modules/bls12-381-signature/default.nix index db0a383f925e..e7ca964750e0 100644 --- a/pkgs/development/ocaml-modules/bls12-381-signature/default.nix +++ b/pkgs/development/ocaml-modules/bls12-381-signature/default.nix @@ -16,6 +16,8 @@ buildDunePackage rec { sha256 = "sha256-KaUpAT+BWxmUP5obi4loR9vVUeQmz3p3zG3CBolUuL4="; }; + duneVersion = "3"; + minimalOCamlVersion = "4.08"; propagatedBuildInputs = [ bls12-381 ]; diff --git a/pkgs/development/ocaml-modules/bls12-381/default.nix b/pkgs/development/ocaml-modules/bls12-381/default.nix index 6c1ff541c5f9..8330ce3e2bc3 100644 --- a/pkgs/development/ocaml-modules/bls12-381/default.nix +++ b/pkgs/development/ocaml-modules/bls12-381/default.nix @@ -14,6 +14,7 @@ buildDunePackage rec { }; minimalOCamlVersion = "4.08"; + duneVersion = "3"; propagatedBuildInputs = [ ff-sig diff --git a/pkgs/development/ocaml-modules/bls12-381/gen.nix b/pkgs/development/ocaml-modules/bls12-381/gen.nix index 7949fe20438a..2eaf616a77b1 100644 --- a/pkgs/development/ocaml-modules/bls12-381/gen.nix +++ b/pkgs/development/ocaml-modules/bls12-381/gen.nix @@ -11,7 +11,7 @@ buildDunePackage rec { sha256 = "qocIfQdv9rniOUykRulu2zWsqkzT0OrsGczgVKALRuk="; }; - useDune2 = true; + duneVersion = "3"; minimalOCamlVersion = "4.08"; diff --git a/pkgs/development/ocaml-modules/bls12-381/legacy.nix b/pkgs/development/ocaml-modules/bls12-381/legacy.nix index c72157c677e7..596001da06ae 100644 --- a/pkgs/development/ocaml-modules/bls12-381/legacy.nix +++ b/pkgs/development/ocaml-modules/bls12-381/legacy.nix @@ -13,7 +13,9 @@ buildDunePackage rec { pname = "bls12-381-legacy"; - inherit (bls12-381-gen) version src useDune2 doCheck; + inherit (bls12-381-gen) version src doCheck; + + duneVersion = "3"; minimalOCamlVersion = "4.08";