diff --git a/pkgs/development/ocaml-modules/chrome-trace/default.nix b/pkgs/development/ocaml-modules/chrome-trace/default.nix index 8af8908bf69c..d7bfe130ee48 100644 --- a/pkgs/development/ocaml-modules/chrome-trace/default.nix +++ b/pkgs/development/ocaml-modules/chrome-trace/default.nix @@ -1,21 +1,18 @@ { lib, buildDunePackage, - dune_3, + dune, }: buildDunePackage { pname = "chrome-trace"; - inherit (dune_3) src version; - - minimalOCamlVersion = "4.08"; - duneVersion = "3"; + inherit (dune) src version; dontAddPrefix = true; meta = { description = "Chrome trace event generation library"; - inherit (dune_3.meta) homepage; + inherit (dune.meta) homepage; license = lib.licenses.mit; }; } diff --git a/pkgs/development/ocaml-modules/dune-action-plugin/default.nix b/pkgs/development/ocaml-modules/dune-action-plugin/default.nix index b85049782569..b1443df4357e 100644 --- a/pkgs/development/ocaml-modules/dune-action-plugin/default.nix +++ b/pkgs/development/ocaml-modules/dune-action-plugin/default.nix @@ -1,7 +1,7 @@ { lib, buildDunePackage, - dune_3, + dune, dune-glob, dune-private-libs, dune-rpc, @@ -9,9 +9,7 @@ buildDunePackage { pname = "dune-action-plugin"; - inherit (dune_3) src version; - - duneVersion = "3"; + inherit (dune) src version; dontAddPrefix = true; @@ -22,7 +20,7 @@ buildDunePackage { ]; meta = { - inherit (dune_3.meta) homepage; + inherit (dune.meta) homepage; description = "API for writing dynamic Dune actions"; maintainers = [ ]; license = lib.licenses.mit; diff --git a/pkgs/development/ocaml-modules/dune-configurator/default.nix b/pkgs/development/ocaml-modules/dune-configurator/default.nix index b94bc4f41ad6..d17a866141b9 100644 --- a/pkgs/development/ocaml-modules/dune-configurator/default.nix +++ b/pkgs/development/ocaml-modules/dune-configurator/default.nix @@ -1,16 +1,14 @@ { lib, buildDunePackage, - dune_3, + dune, csexp, }: buildDunePackage { pname = "dune-configurator"; - inherit (dune_3) src version patches; - - minimalOCamlVersion = "4.05"; + inherit (dune) src version; dontAddPrefix = true; diff --git a/pkgs/development/ocaml-modules/dune-glob/default.nix b/pkgs/development/ocaml-modules/dune-glob/default.nix index bf0f6c92b1bb..0aa452c90a1a 100644 --- a/pkgs/development/ocaml-modules/dune-glob/default.nix +++ b/pkgs/development/ocaml-modules/dune-glob/default.nix @@ -1,16 +1,14 @@ { lib, buildDunePackage, - dune_3, + dune, dune-private-libs, re, }: buildDunePackage { pname = "dune-glob"; - inherit (dune_3) src version; - - duneVersion = "3"; + inherit (dune) src version; dontAddPrefix = true; @@ -20,7 +18,7 @@ buildDunePackage { ]; meta = { - inherit (dune_3.meta) homepage; + inherit (dune.meta) homepage; description = "Glob string matching language supported by dune"; maintainers = [ ]; license = lib.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 57b47f379bcc..7ddaa0b85dc1 100644 --- a/pkgs/development/ocaml-modules/dune-private-libs/default.nix +++ b/pkgs/development/ocaml-modules/dune-private-libs/default.nix @@ -1,18 +1,14 @@ { lib, buildDunePackage, - dune_3, + dune, stdune, }: buildDunePackage { pname = "dune-private-libs"; - duneVersion = "3"; - - inherit (dune_3) src version; - - minimalOCamlVersion = "4.08"; + inherit (dune) src version; dontAddPrefix = true; diff --git a/pkgs/development/ocaml-modules/dune-rpc/default.nix b/pkgs/development/ocaml-modules/dune-rpc/default.nix index 082769eed883..46d20ced5a42 100644 --- a/pkgs/development/ocaml-modules/dune-rpc/default.nix +++ b/pkgs/development/ocaml-modules/dune-rpc/default.nix @@ -1,7 +1,7 @@ { lib, buildDunePackage, - dune_3, + dune, csexp, stdune, ocamlc-loc, @@ -13,9 +13,7 @@ buildDunePackage { pname = "dune-rpc"; - inherit (dune_3) src version; - - duneVersion = "3"; + inherit (dune) src version; dontAddPrefix = true; @@ -31,7 +29,7 @@ buildDunePackage { meta = { description = "Library to connect and control a running dune instance"; - inherit (dune_3.meta) homepage; + inherit (dune.meta) homepage; maintainers = [ ]; license = lib.licenses.mit; }; diff --git a/pkgs/development/ocaml-modules/dune-site/default.nix b/pkgs/development/ocaml-modules/dune-site/default.nix index cb45f571a79e..9ea28352c3ec 100644 --- a/pkgs/development/ocaml-modules/dune-site/default.nix +++ b/pkgs/development/ocaml-modules/dune-site/default.nix @@ -1,15 +1,13 @@ { lib, buildDunePackage, - dune_3, + dune, dune-private-libs, }: buildDunePackage { pname = "dune-site"; - inherit (dune_3) src version; - - duneVersion = "3"; + inherit (dune) src version; dontAddPrefix = true; @@ -17,7 +15,7 @@ buildDunePackage { meta = { description = "Library for embedding location information inside executable and libraries"; - inherit (dune_3.meta) homepage; + inherit (dune.meta) homepage; maintainers = [ ]; license = lib.licenses.mit; }; diff --git a/pkgs/development/ocaml-modules/dyn/default.nix b/pkgs/development/ocaml-modules/dyn/default.nix index 7cbd890cf6b5..08369d579139 100644 --- a/pkgs/development/ocaml-modules/dyn/default.nix +++ b/pkgs/development/ocaml-modules/dyn/default.nix @@ -1,14 +1,13 @@ { buildDunePackage, - dune_3, + dune, ordering, pp, }: buildDunePackage { pname = "dyn"; - inherit (dune_3) version src; - duneVersion = "3"; + inherit (dune) version src; dontAddPrefix = true; @@ -17,7 +16,7 @@ buildDunePackage { pp ]; - meta = dune_3.meta // { + meta = dune.meta // { description = "Dynamic type"; }; } diff --git a/pkgs/development/ocaml-modules/fs-io/default.nix b/pkgs/development/ocaml-modules/fs-io/default.nix index acb431a664ef..be03065352ee 100644 --- a/pkgs/development/ocaml-modules/fs-io/default.nix +++ b/pkgs/development/ocaml-modules/fs-io/default.nix @@ -1,12 +1,12 @@ -{ buildDunePackage, dune_3 }: +{ buildDunePackage, dune }: buildDunePackage { pname = "fs-io"; - inherit (dune_3) version src; + inherit (dune) version src; dontAddPrefix = true; - meta = dune_3.meta // { + meta = dune.meta // { description = "Dune's file system IO library"; }; } diff --git a/pkgs/development/ocaml-modules/top-closure/default.nix b/pkgs/development/ocaml-modules/top-closure/default.nix index 098f89b7b96c..2fa5ad5a54dc 100644 --- a/pkgs/development/ocaml-modules/top-closure/default.nix +++ b/pkgs/development/ocaml-modules/top-closure/default.nix @@ -1,12 +1,12 @@ -{ buildDunePackage, dune_3 }: +{ buildDunePackage, dune }: buildDunePackage { pname = "top-closure"; - inherit (dune_3) version src; + inherit (dune) version src; dontAddPrefix = true; - meta = dune_3.meta // { + meta = dune.meta // { description = "Dune's topological closure library"; }; }