diff options
4 files changed, 18 insertions, 16 deletions
diff --git a/pkgs/development/ocaml-modules/dune-action-plugin/default.nix b/pkgs/development/ocaml-modules/dune-action-plugin/default.nix index 65c55da6e3b3..c39239525d18 100644 --- a/pkgs/development/ocaml-modules/dune-action-plugin/default.nix +++ b/pkgs/development/ocaml-modules/dune-action-plugin/default.nix @@ -1,17 +1,17 @@ -{ lib, buildDunePackage, dune_2, dune-glob, dune-private-libs }: +{ lib, buildDunePackage, dune_3, dune-glob, dune-private-libs }: buildDunePackage rec { pname = "dune-action-plugin"; - inherit (dune_2) src version patches; + inherit (dune_3) src version; - useDune2 = true; + duneVersion = "3"; dontAddPrefix = true; propagatedBuildInputs = [ dune-glob dune-private-libs ]; meta = with lib; { - inherit (dune_2.meta) homepage; + inherit (dune_3.meta) homepage; description = "API for writing dynamic Dune actions"; maintainers = [ maintainers.marsam ]; license = licenses.mit; diff --git a/pkgs/development/ocaml-modules/dune-glob/default.nix b/pkgs/development/ocaml-modules/dune-glob/default.nix index c7c6f9be4ee0..04b5e7623793 100644 --- a/pkgs/development/ocaml-modules/dune-glob/default.nix +++ b/pkgs/development/ocaml-modules/dune-glob/default.nix @@ -1,17 +1,17 @@ -{ lib, buildDunePackage, dune_2, dune-private-libs }: +{ lib, buildDunePackage, dune_3, dune-private-libs }: buildDunePackage rec { pname = "dune-glob"; - inherit (dune_2) src version patches; + inherit (dune_3) src version; - useDune2 = true; + duneVersion = "3"; dontAddPrefix = true; propagatedBuildInputs = [ dune-private-libs ]; meta = with lib; { - inherit (dune_2.meta) homepage; + inherit (dune_3.meta) homepage; description = "Glob string matching language supported by dune"; maintainers = [ maintainers.marsam ]; license = licenses.mit; diff --git a/pkgs/development/ocaml-modules/dune-private-libs/default.nix b/pkgs/development/ocaml-modules/dune-private-libs/default.nix index 8a635efa3a59..9b45064d1984 100644 --- a/pkgs/development/ocaml-modules/dune-private-libs/default.nix +++ b/pkgs/development/ocaml-modules/dune-private-libs/default.nix @@ -1,16 +1,18 @@ -{ lib, buildDunePackage, dune_2 }: +{ lib, buildDunePackage, dune_3, stdune }: buildDunePackage rec { pname = "dune-private-libs"; - useDune2 = true; + duneVersion = "3"; - inherit (dune_2) src version patches; + inherit (dune_3) src version; - minimumOCamlVersion = "4.08"; + minimalOCamlVersion = "4.08"; dontAddPrefix = true; + propagatedBuildInputs = [ stdune ]; + meta = with lib; { description = "Private libraries of Dune"; maintainers = [ maintainers.marsam ]; diff --git a/pkgs/development/ocaml-modules/dune-site/default.nix b/pkgs/development/ocaml-modules/dune-site/default.nix index 9462393d2697..8f51e182970f 100644 --- a/pkgs/development/ocaml-modules/dune-site/default.nix +++ b/pkgs/development/ocaml-modules/dune-site/default.nix @@ -1,10 +1,10 @@ -{ lib, buildDunePackage, dune_2, dune-private-libs }: +{ lib, buildDunePackage, dune_3, dune-private-libs }: buildDunePackage rec { pname = "dune-site"; - inherit (dune_2) src version patches; + inherit (dune_3) src version; - useDune2 = true; + duneVersion = "3"; dontAddPrefix = true; @@ -12,7 +12,7 @@ buildDunePackage rec { meta = with lib; { description = "A library for embedding location information inside executable and libraries"; - inherit (dune_2.meta) homepage; + inherit (dune_3.meta) homepage; maintainers = with lib.maintainers; [ ]; license = licenses.mit; }; |