From 0ee762409017b34e0e7bd2bee17360c691759db4 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 11 Mar 2026 22:45:21 +0100
Subject: [PATCH] =?UTF-8?q?ocamlPackages.lwt:=205.9.2=20=E2=86=92=206.1.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ocamlPackages.conduit-lwt-unix: disable tests with lwt ≥ 6
ocamlPackages.js_of_ocaml-lwt: log support is optional
ocamlPackages.lwt_log: mark as broken with lwt ≥ 6
ocamlPackages.tezt: mark as broken with lwt ≥ 6
---
 pkgs/development/ocaml-modules/conduit/lwt-unix.nix |  3 ++-
 pkgs/development/ocaml-modules/lwt/default.nix      |  5 ++---
 pkgs/development/ocaml-modules/lwt_eio/default.nix  |  6 ++++++
 pkgs/development/ocaml-modules/lwt_log/default.nix  | 13 ++++++-------
 pkgs/development/ocaml-modules/tezt/default.nix     |  1 +
 pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix    |  6 ++++--
 6 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix
index deba1080bb19..1f7dfd7ce616 100644
--- a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix
+++ b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix
@@ -1,4 +1,5 @@
 {
+  lib,
   buildDunePackage,
   conduit-lwt,
   ppx_sexp_conv,
@@ -30,7 +31,7 @@ buildDunePackage {
     lwt_ssl
   ];
 
-  doCheck = true;
+  doCheck = !lib.versionAtLeast lwt.version "6.0.0";
   checkInputs = [
     lwt_log
     ssl
diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix
index b30ce1352313..754cbb3c5bff 100644
--- a/pkgs/development/ocaml-modules/lwt/default.nix
+++ b/pkgs/development/ocaml-modules/lwt/default.nix
@@ -7,15 +7,13 @@
   dune-configurator,
   ocplib-endian,
   ppxlib,
-  version ? if lib.versionAtLeast ppxlib.version "0.36" then "5.9.2" else "5.9.1",
+  version ? if lib.versionAtLeast ppxlib.version "0.36" then "6.1.1" else "5.9.1",
 }:
 
 buildDunePackage {
   pname = "lwt";
   inherit version;
 
-  minimalOCamlVersion = "4.08";
-
   src = fetchFromGitHub {
     owner = "ocsigen";
     repo = "lwt";
@@ -24,6 +22,7 @@ buildDunePackage {
       {
         "5.9.1" = "sha256-oPYLFugMTI3a+hmnwgUcoMgn5l88NP1Roq0agLhH/vI=";
         "5.9.2" = "sha256-pzowRN1wwaF2iMfMPE7RCtA2XjlaXC3xD0yznriVfu8=";
+        "6.1.1" = "sha256-EMlA+mh66bfVNqDcmuaW7GoEEu6xQhCRjZx7t7pHuGo=";
       }
       ."${version}";
   };
diff --git a/pkgs/development/ocaml-modules/lwt_eio/default.nix b/pkgs/development/ocaml-modules/lwt_eio/default.nix
index 2fa9aed6cca1..c84d716c507f 100644
--- a/pkgs/development/ocaml-modules/lwt_eio/default.nix
+++ b/pkgs/development/ocaml-modules/lwt_eio/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildDunePackage,
   fetchurl,
+  fetchpatch,
   eio,
   lwt,
 }:
@@ -16,6 +17,11 @@ buildDunePackage rec {
     hash = "sha256-dlJnhHh4VNO60NZJZqc1HS8wPR95WhdeBJTK37pPbCE=";
   };
 
+  patches = lib.optional (lib.versionAtLeast lwt.version "6.0.0") (fetchpatch {
+    url = "https://github.com/ocaml-multicore/lwt_eio/commit/5f8bf1e7af33590683ee45151894d7b9a20607f0.patch";
+    hash = "sha256-5A3Bh+xOXo79Rw145hYqYv42li30M0TKLW+qu/dC0KQ=";
+  });
+
   propagatedBuildInputs = [
     eio
     lwt
diff --git a/pkgs/development/ocaml-modules/lwt_log/default.nix b/pkgs/development/ocaml-modules/lwt_log/default.nix
index 4bcd3524e849..1e1a5ba2377a 100644
--- a/pkgs/development/ocaml-modules/lwt_log/default.nix
+++ b/pkgs/development/ocaml-modules/lwt_log/default.nix
@@ -5,17 +5,15 @@
   lwt,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "lwt_log";
   version = "1.1.2";
 
-  minimalOCamlVersion = "4.03";
-
   src = fetchFromGitHub {
     owner = "aantron";
-    repo = pname;
-    rev = version;
-    sha256 = "sha256-ODTD3KceEnrEzD01CeuNg4BNKOtKZEpYaDIB+RIte1U=";
+    repo = "lwt_log";
+    tag = finalAttrs.version;
+    hash = "sha256-ODTD3KceEnrEzD01CeuNg4BNKOtKZEpYaDIB+RIte1U=";
   };
 
   propagatedBuildInputs = [ lwt ];
@@ -25,5 +23,6 @@ buildDunePackage rec {
     homepage = "https://github.com/aantron/lwt_log";
     license = lib.licenses.lgpl21;
     maintainers = [ lib.maintainers.vbgl ];
+    broken = lib.versionAtLeast lwt.version "6.0.0";
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/tezt/default.nix b/pkgs/development/ocaml-modules/tezt/default.nix
index 665373b769c0..c77951e6f250 100644
--- a/pkgs/development/ocaml-modules/tezt/default.nix
+++ b/pkgs/development/ocaml-modules/tezt/default.nix
@@ -31,5 +31,6 @@ buildDunePackage rec {
   meta = {
     description = "Test framework for unit tests, integration tests, and regression tests";
     license = lib.licenses.mit;
+    broken = lib.versionAtLeast lwt.version "6.0.0";
   };
 }
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix
index c05039ce967e..f5a8a60a6861 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix
@@ -1,9 +1,11 @@
 {
+  lib,
   buildDunePackage,
   js_of_ocaml-ppx,
   js_of_ocaml,
   lwt,
   lwt_log,
+  loggerSupport ? !lib.versionAtLeast lwt.version "6.0.0",
 }:
 
 buildDunePackage {
@@ -16,6 +18,6 @@ buildDunePackage {
   propagatedBuildInputs = [
     js_of_ocaml
     lwt
-    lwt_log
-  ];
+  ]
+  ++ lib.optional loggerSupport lwt_log;
 }