diff --git a/pkgs/development/ocaml-modules/ocamlformat/generic.nix b/pkgs/development/ocaml-modules/ocamlformat/generic.nix index 9c1bfa77cf26..164f54e452a3 100644 --- a/pkgs/development/ocaml-modules/ocamlformat/generic.nix +++ b/pkgs/development/ocaml-modules/ocamlformat/generic.nix @@ -21,7 +21,6 @@ stdio, uuseg, uutf, - janeStreet_0_15, ... }: @@ -67,13 +66,9 @@ rec { cmdliner_v = if lib.versionAtLeast version "0.21.0" then cmdliner_1_1 else cmdliner_1_0; - base_v = if lib.versionAtLeast version "0.25.1" then base else janeStreet_0_15.base; - - stdio_v = if lib.versionAtLeast version "0.25.1" then stdio else janeStreet_0_15.stdio; - library_deps = [ - base_v + base cmdliner_v dune-build-info fix @@ -81,7 +76,7 @@ rec { menhirLib menhirSdk ocp-indent - stdio_v + stdio uuseg uutf ] diff --git a/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix b/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix index dc2671a265f0..3dc8e2ab4e33 100644 --- a/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix +++ b/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix @@ -17,6 +17,7 @@ in lib.throwIf ( lib.versionAtLeast ocaml.version "5.0" && !lib.versionAtLeast version "0.23" + || lib.versionAtLeast ocaml.version "5.1" && !lib.versionAtLeast version "0.25" || lib.versionAtLeast ocaml.version "5.2" && !lib.versionAtLeast version "0.26.2" || lib.versionAtLeast ocaml.version "5.3" && !lib.versionAtLeast version "0.27" )