From 2e962a7d50385f9d1f4824845b84be2790d5413a Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 23 Jan 2026 14:02:14 +0100
Subject: [PATCH 1/5] ocamlPackages.synchronizer: disable for OCaml 5.1

---
 pkgs/development/ocaml-modules/synchronizer/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/synchronizer/default.nix b/pkgs/development/ocaml-modules/synchronizer/default.nix
index 519c55ba9bdf..a3cb79b7467f 100644
--- a/pkgs/development/ocaml-modules/synchronizer/default.nix
+++ b/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";

From 4b4a22826c0f3b02814d92aa804bb6c18f80457b Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 23 Jan 2026 14:02:17 +0100
Subject: [PATCH 2/5] sgx-sdk: pin OCaml to version 5.3

---
 pkgs/os-specific/linux/sgx/sdk/default.nix | 3 +--
 pkgs/top-level/all-packages.nix            | 4 +++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/sgx/sdk/default.nix b/pkgs/os-specific/linux/sgx/sdk/default.nix
index 9da7360db581..108f411a52ef 100644
--- a/pkgs/os-specific/linux/sgx/sdk/default.nix
+++ b/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
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 587d9273d9af..21669bca1f64 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9556,7 +9556,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;

From 2ab068d437527ffb56a29c73a944736128242931 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 23 Jan 2026 14:02:20 +0100
Subject: [PATCH 3/5] flow: pin OCaml to version 5.3

---
 pkgs/by-name/fl/flow/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/fl/flow/package.nix b/pkgs/by-name/fl/flow/package.nix
index 281a2fb80862..04b73eae9f5c 100644
--- a/pkgs/by-name/fl/flow/package.nix
+++ b/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"; };
     }

From dc629aeb5e51efdf8885abd3a1ee34e496f3ab24 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 23 Jan 2026 14:02:23 +0100
Subject: [PATCH 4/5] heptagon: pin OCaml to version 5.3

---
 pkgs/top-level/all-packages.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 21669bca1f64..04b2f6e7b011 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4625,6 +4625,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 {

From a9e0a689550b85cb62bb2400e019fc25fccd52dc Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 23 Jan 2026 14:02:26 +0100
Subject: [PATCH 5/5] ocaml: default to version 5.4

---
 pkgs/top-level/ocaml-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 7d636a8f1652..744a4cd63430 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -2355,7 +2355,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.