diff options
author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2020-12-08 21:50:14 +0100 |
---|---|---|
committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2020-12-18 21:03:56 +0100 |
commit | b6f7f1f673046ad2851728cb8f3a2f0888a1dcf0 (patch) | |
tree | dc783d933b1a6d807d5c49afcf1fa0f9395cf515 /pkgs/top-level/ocaml-packages.nix | |
parent | c2e90c4433dacac61fd8f61ce6171c54acab2fc2 (diff) | |
download | nixpkgs-b6f7f1f673046ad2851728cb8f3a2f0888a1dcf0.tar nixpkgs-b6f7f1f673046ad2851728cb8f3a2f0888a1dcf0.tar.gz nixpkgs-b6f7f1f673046ad2851728cb8f3a2f0888a1dcf0.tar.bz2 nixpkgs-b6f7f1f673046ad2851728cb8f3a2f0888a1dcf0.tar.lz nixpkgs-b6f7f1f673046ad2851728cb8f3a2f0888a1dcf0.tar.xz nixpkgs-b6f7f1f673046ad2851728cb8f3a2f0888a1dcf0.tar.zst nixpkgs-b6f7f1f673046ad2851728cb8f3a2f0888a1dcf0.zip |
ocamlPackages.janeStreet: 0.13 → 0.14
ocamlPackages.biocaml: 0.10.1 → 0.11.1 ocamlPackages.bistro: fix for Core 0.14 ocamlPackages.js_of_ocaml: 3.7.0 → 3.7.1 ocamlPackages.ocaml-r: 0.2.0 → 0.4.0 ocamlPackages.phylogenetics: 2020-01-25 → 2020-11-23 Co-authored-by: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Diffstat (limited to 'pkgs/top-level/ocaml-packages.nix')
-rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index e5ed3cbf977..80c5c0a5a8a 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1049,16 +1049,19 @@ let janePackage = if lib.versionOlder "4.08" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/janePackage_0_13.nix {} + then callPackage ../development/ocaml-modules/janestreet/janePackage_0_14.nix {} else 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.08" ocaml.version - then import ../development/ocaml-modules/janestreet/0.13.nix { - inherit ctypes dune-configurator janePackage num octavius ppxlib re zarith; - inherit (pkgs) openssl; + then import ../development/ocaml-modules/janestreet/0.14.nix { + inherit alcotest angstrom angstrom-async base64 cryptokit ctypes + dune-configurator faraday inotify janePackage js_of_ocaml + js_of_ocaml-ppx lambdasoup magic-mime num octavius ounit + ppxlib re tyxml uri-sexp zarith; + inherit (pkgs) openssl zstd; } else if lib.versionOlder "4.07" ocaml.version then import ../development/ocaml-modules/janestreet/0.12.nix { |