diff options
| -rw-r--r-- | pkgs/development/compilers/ocaml/5.2.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/janestreet/0.16.nix | 12 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 2 |
3 files changed, 11 insertions, 10 deletions
diff --git a/pkgs/development/compilers/ocaml/5.2.nix b/pkgs/development/compilers/ocaml/5.2.nix index 8df6f1d5d48ea..5a0c2783207a8 100644 --- a/pkgs/development/compilers/ocaml/5.2.nix +++ b/pkgs/development/compilers/ocaml/5.2.nix @@ -1,9 +1,6 @@ import ./generic.nix { major_version = "5"; minor_version = "2"; - patch_version = "0-beta2"; - src = fetchTarball { - url = "https://caml.inria.fr/pub/distrib/ocaml-5.2/ocaml-5.2.0~beta2.tar.xz"; - sha256 = "sha256:1cyw0w79j7kyr3x0ivsqm1si704b29ic33yj621dq7f125jabk00"; - }; + patch_version = "0"; + sha256 = "sha256-L0v0efUUefm/jH8WlKbqcza793T0rW2mtZ0a1JOd2Kc="; } diff --git a/pkgs/development/ocaml-modules/janestreet/0.16.nix b/pkgs/development/ocaml-modules/janestreet/0.16.nix index 526ea44808cd7..59cd7539d1f19 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.16.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.16.nix @@ -569,13 +569,17 @@ with self; propagatedBuildInputs = [ base ppx_jane ]; }; - ocaml-compiler-libs = janePackage { + ocaml-compiler-libs = janePackage ({ pname = "ocaml-compiler-libs"; - version = "0.12.4"; - hash = "00if2f7j9d8igdkj4rck3p74y17j6b233l91mq02drzrxj199qjv"; minimalOCamlVersion = "4.04.1"; meta.description = "OCaml compiler libraries repackaged"; - }; + } // (if lib.versionAtLeast ocaml.version "5.2" then { + version = "0.17.0"; + hash = "sha256-QaC6BWrpFblra6X1+TrlK+J3vZxLvLJZ2b0427DiQzM="; + } else { + version = "0.12.4"; + hash = "00if2f7j9d8igdkj4rck3p74y17j6b233l91mq02drzrxj199qjv"; + })); ocaml-embed-file = janePackage { pname = "ocaml-embed-file"; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 8a7ad8a70aeb3..0e67b4d96bdc4 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -2010,7 +2010,7 @@ in let inherit (pkgs) callPackage; in rec ocamlPackages_5_2 = mkOcamlPackages (callPackage ../development/compilers/ocaml/5.2.nix { }); - ocamlPackages_latest = ocamlPackages_5_1; + ocamlPackages_latest = ocamlPackages_5_2; ocamlPackages = ocamlPackages_5_1; |