ocaml: default to version 5.4 (#483063)

pkgs/by-name/fl/flow/package.nix

@@ -8,7 +8,7 @@
 }:
 
 let
-  ocamlPackages = ocaml-ng.ocamlPackages.overrideScope (
+  ocamlPackages = ocaml-ng.ocamlPackages_5_3.overrideScope (
     self: super: {
       ppxlib = super.ppxlib.override { version = "0.34.0"; };
     }

pkgs/development/ocaml-modules/synchronizer/default.nix

@@ -10,7 +10,7 @@ buildDunePackage (finalAttrs: {
   pname = "synchronizer";
   version = "0.2";
 
-  minimalOCamlVersion = "5.1";
+  minimalOCamlVersion = "5.2";
 
   src = fetchFromGitHub {
     owner = "OCamlPro";

pkgs/os-specific/linux/sgx/sdk/default.nix

@@ -12,7 +12,6 @@
   git,
   libtool,
   linkFarmFromDrvs,
-  ocaml,
   ocamlPackages,
   openssl,
   perl,
@@ -83,7 +82,7 @@ stdenv.mkDerivation rec {
     cmake
     file
     git
-    ocaml
+    ocamlPackages.ocaml
     ocamlPackages.ocamlbuild
     perl
     python3

pkgs/top-level/all-packages.nix

@@ -4541,6 +4541,10 @@ with pkgs;
   haxePackages = recurseIntoAttrs (callPackage ./haxe-packages.nix { });
   inherit (haxePackages) hxcpp;
 
+  heptagon = callPackage ../by-name/he/heptagon/package.nix {
+    ocamlPackages = ocaml-ng.ocamlPackages_5_3;
+  };
+
   dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix { });
 
   gopro-tool = callPackage ../by-name/go/gopro-tool/package.nix {
@@ -9460,7 +9464,9 @@ with pkgs;
 
   rfkill_udev = callPackage ../os-specific/linux/rfkill/udev.nix { };
 
-  sgx-sdk = callPackage ../os-specific/linux/sgx/sdk { };
+  sgx-sdk = callPackage ../os-specific/linux/sgx/sdk {
+    ocamlPackages = ocaml-ng.ocamlPackages_5_3;
+  };
 
   sgx-psw = callPackage ../os-specific/linux/sgx/psw {
     protobuf = protobuf_21;

pkgs/top-level/ocaml-packages.nix

@@ -2357,7 +2357,7 @@ rec {
 
   ocamlPackages_latest = ocamlPackages_5_4;
 
-  ocamlPackages = ocamlPackages_5_3;
+  ocamlPackages = ocamlPackages_5_4;
 
   # 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.