diff --git a/pkgs/development/tools/ocaml/ocaml-top/default.nix b/pkgs/development/tools/ocaml/ocaml-top/default.nix index 18ea26ca22a8..517ef2ce9e6c 100644 --- a/pkgs/development/tools/ocaml/ocaml-top/default.nix +++ b/pkgs/development/tools/ocaml/ocaml-top/default.nix @@ -4,6 +4,8 @@ with ocamlPackages; buildDunePackage rec { pname = "ocaml-top"; version = "1.2.0"; + duneVersion = "3"; + src = fetchFromGitHub { owner = "OCamlPro"; repo = "ocaml-top"; diff --git a/pkgs/development/tools/ocaml/ocp-indent/default.nix b/pkgs/development/tools/ocaml/ocp-indent/default.nix index aae650fbdc25..649e1bcd3559 100644 --- a/pkgs/development/tools/ocaml/ocp-indent/default.nix +++ b/pkgs/development/tools/ocaml/ocp-indent/default.nix @@ -1,10 +1,10 @@ -{ lib, fetchFromGitHub, buildDunePackage, cmdliner }: +{ lib, fetchFromGitHub, buildDunePackage, cmdliner, findlib }: buildDunePackage rec { version = "1.8.2"; pname = "ocp-indent"; - useDune2 = true; + duneVersion = "3"; src = fetchFromGitHub { owner = "OCamlPro"; @@ -13,9 +13,10 @@ buildDunePackage rec { sha256 = "sha256-IyvURw/6R0eKrnahV1fqLV0iIeypykrmxDbliECgbLc="; }; - minimumOCamlVersion = "4.02"; + minimalOCamlVersion = "4.03"; buildInputs = [ cmdliner ]; + propagatedBuildInputs = [ findlib ]; meta = with lib; { homepage = "https://www.typerex.org/ocp-indent.html"; diff --git a/pkgs/development/tools/ocaml/ocp-index/default.nix b/pkgs/development/tools/ocaml/ocp-index/default.nix index 6c315960f985..5b37febbb998 100644 --- a/pkgs/development/tools/ocaml/ocp-index/default.nix +++ b/pkgs/development/tools/ocaml/ocp-index/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "ocp-index"; version = "1.3.4"; + duneVersion = "3"; + minimalOCamlVersion = "4.08"; src = fetchFromGitHub {