diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2019-09-03 19:35:45 +0000 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2019-09-10 14:05:26 +0000 |
| commit | 748046d594052506f6e80d0f6478f828df49dfc4 (patch) | |
| tree | 9944e5a2d19e384d79db20d409e8bbf7a1ddc818 /pkgs/top-level/ocaml-packages.nix | |
| parent | 764724a631f59522b01132d9a251d27a9c72c839 (diff) | |
| download | nixlib-748046d594052506f6e80d0f6478f828df49dfc4.tar nixlib-748046d594052506f6e80d0f6478f828df49dfc4.tar.gz nixlib-748046d594052506f6e80d0f6478f828df49dfc4.tar.bz2 nixlib-748046d594052506f6e80d0f6478f828df49dfc4.tar.lz nixlib-748046d594052506f6e80d0f6478f828df49dfc4.tar.xz nixlib-748046d594052506f6e80d0f6478f828df49dfc4.tar.zst nixlib-748046d594052506f6e80d0f6478f828df49dfc4.zip | |
ocamlPackages.janeStreet: init at 0.12 (for OCaml ≥ 4.07)
Also add a few legacy packages at version 0.11 for OCaml ≥ 4.07: configurator, ppx_core, ppx_driver, ppx_type_conv ocamlPackages.bap: disable for OCaml ≥ 4.07 ocamlPackages.bistro: 0.4.0 -> 0.5.0
Diffstat (limited to 'pkgs/top-level/ocaml-packages.nix')
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 11279f507d83..4ece950f09e2 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -825,7 +825,14 @@ let janePackage = callPackage ../development/ocaml-modules/janestreet/janePackage.nix {}; - janeStreet = import ../development/ocaml-modules/janestreet { + 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 (pkgs) openssl; + } + else import ../development/ocaml-modules/janestreet { inherit janePackage ocamlbuild angstrom ctypes cryptokit; inherit magic-mime num ocaml-migrate-parsetree octavius ounit; inherit ppx_deriving re ppxlib; |