diff options
Diffstat (limited to 'pkgs/top-level/ocaml-packages.nix')
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index ce0a6fe5bfb87..95c16e55a8de6 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -829,13 +829,15 @@ let # Jane Street - janePackage = callPackage ../development/ocaml-modules/janestreet/janePackage.nix {}; + janePackage = + if lib.versionOlder "4.07" ocaml.version + then callPackage ../development/ocaml-modules/janestreet/janePackage_0_12.nix {} + else callPackage ../development/ocaml-modules/janestreet/janePackage.nix {}; janeStreet = if lib.versionOlder "4.07" ocaml.version then import ../development/ocaml-modules/janestreet/0.12.nix { - janePackage = callPackage ../development/ocaml-modules/janestreet/janePackage_0_12.nix {}; - inherit ctypes num octavius ppxlib re; + inherit ctypes janePackage num octavius ppxlib re; inherit (pkgs) openssl; } else import ../development/ocaml-modules/janestreet { @@ -1137,5 +1139,5 @@ in let inherit (pkgs) callPackage; in rec ocamlPackages_latest = ocamlPackages_4_09; - ocamlPackages = ocamlPackages_4_06; + ocamlPackages = ocamlPackages_4_07; } |