diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2019-10-04 05:46:59 +0000 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2019-10-11 07:58:42 +0200 |
| commit | c82c6d3a1201ff99065330709f2ce760a6e7434c (patch) | |
| tree | 1bf89fc2a4663e38260ef663db7b98869dfc3b96 /pkgs/top-level/ocaml-packages.nix | |
| parent | deefc177d3857f0e2c7b28a2b31ff036f713575f (diff) | |
| download | nixpkgs-c82c6d3a1201ff99065330709f2ce760a6e7434c.tar nixpkgs-c82c6d3a1201ff99065330709f2ce760a6e7434c.tar.gz nixpkgs-c82c6d3a1201ff99065330709f2ce760a6e7434c.tar.bz2 nixpkgs-c82c6d3a1201ff99065330709f2ce760a6e7434c.tar.lz nixpkgs-c82c6d3a1201ff99065330709f2ce760a6e7434c.tar.xz nixpkgs-c82c6d3a1201ff99065330709f2ce760a6e7434c.tar.zst nixpkgs-c82c6d3a1201ff99065330709f2ce760a6e7434c.zip | |
ocaml: default to version 4.07
patdiff: 0.11.0 → 0.12.0
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 ce0a6fe5bfb..95c16e55a8d 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; } |