diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2020-04-13 10:41:51 +0200 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2020-04-20 08:38:31 +0200 |
| commit | 3e7a2b9147fe78a229d5bd20849ce078e6b9ef71 (patch) | |
| tree | 7f6294686ee50fed5a53d8442c272fb96a2c0887 /pkgs/top-level | |
| parent | 71c405ea2e086aabbac131962ef82bb68c440a94 (diff) | |
| download | nixlib-3e7a2b9147fe78a229d5bd20849ce078e6b9ef71.tar nixlib-3e7a2b9147fe78a229d5bd20849ce078e6b9ef71.tar.gz nixlib-3e7a2b9147fe78a229d5bd20849ce078e6b9ef71.tar.bz2 nixlib-3e7a2b9147fe78a229d5bd20849ce078e6b9ef71.tar.lz nixlib-3e7a2b9147fe78a229d5bd20849ce078e6b9ef71.tar.xz nixlib-3e7a2b9147fe78a229d5bd20849ce078e6b9ef71.tar.zst nixlib-3e7a2b9147fe78a229d5bd20849ce078e6b9ef71.zip | |
ocamlPackages.janeStreet: 0.12 → 0.13
ocamlPackages.bistro: fix for core-0.13 ocamlPackages.phylogenetics: 2020-01-05 → 2020-01-25
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 160adc015f87..b5d8abade090 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -980,12 +980,20 @@ let # Jane Street janePackage = - if lib.versionOlder "4.07" ocaml.version + if lib.versionOlder "4.08" ocaml.version + then callPackage ../development/ocaml-modules/janestreet/janePackage_0_13.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.07" ocaml.version + if lib.versionOlder "4.08" ocaml.version + then import ../development/ocaml-modules/janestreet/0.13.nix { + inherit ctypes janePackage num octavius re; + inherit (pkgs) openssl; + ppxlib = ppxlib.override { version = "0.12.0"; }; + } + else if lib.versionOlder "4.07" ocaml.version then import ../development/ocaml-modules/janestreet/0.12.nix { inherit ctypes janePackage num octavius ppxlib re; inherit (pkgs) openssl; |