From 6ee239aaa87fa055b06028db1b7d82b42060b242 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 9 Apr 2025 22:35:42 +0200 Subject: [PATCH] ocaml: default to version 5.3 --- pkgs/top-level/all-packages.nix | 4 ++++ pkgs/top-level/ocaml-packages.nix | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a7a28a8dbffb..8d1e2d0d815b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -393,6 +393,8 @@ with pkgs; catch2 = catch2_3; }; + eff = callPackage ../by-name/ef/eff/package.nix { ocamlPackages = ocaml-ng.ocamlPackages_5_2; }; + enochecker-test = with python3Packages; callPackage ../development/tools/enochecker-test { }; inherit (gridlock) nyarr; @@ -8353,9 +8355,11 @@ with pkgs; }; framac = callPackage ../by-name/fr/framac/package.nix { + ocamlPackages = ocaml-ng.ocamlPackages_5_2; why3 = why3.override { version = "1.7.2"; coqPackages = coqPackages_8_18; + ocamlPackages = ocaml-ng.ocamlPackages_5_2; }; }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index f25dcb505633..55c34edbdfac 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -2342,7 +2342,7 @@ rec { ocamlPackages_latest = ocamlPackages_5_3; - ocamlPackages = ocamlPackages_5_2; + ocamlPackages = ocamlPackages_5_3; # We still have packages that rely on unsafe-string, which is deprecated in OCaml 4.06.0. # Below are aliases for porting them to the latest versions of the OCaml 4 series.