From 752d772b858f8385cc538880823631a1950be911 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 4 Nov 2025 18:45:33 +0100
Subject: [PATCH] =?UTF-8?q?ocamlPackages.qcheck:=200.25=20=E2=86=92=200.27?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocaml-modules/containers/default.nix      | 20 ++++++++++++-------
 .../ocaml-modules/qcheck/alcotest.nix         |  2 +-
 .../development/ocaml-modules/qcheck/core.nix | 16 ++++++++-------
 .../ocaml-modules/qcheck/ounit.nix            |  2 +-
 4 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/ocaml-modules/containers/default.nix b/pkgs/development/ocaml-modules/containers/default.nix
index c5888c737a5a..279c35c1da00 100644
--- a/pkgs/development/ocaml-modules/containers/default.nix
+++ b/pkgs/development/ocaml-modules/containers/default.nix
@@ -1,8 +1,8 @@
 {
   lib,
   fetchFromGitHub,
+  fetchpatch,
   buildDunePackage,
-  ocaml,
   dune-configurator,
   either,
   seq,
@@ -13,19 +13,25 @@
   yojson,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   version = "3.16";
   pname = "containers";
 
-  minimalOCamlVersion = "4.08";
-
   src = fetchFromGitHub {
     owner = "c-cube";
     repo = "ocaml-containers";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-WaHAZRLjaEJUba/I2r3Yof/iUqA3PFUuVbzm88izG1k=";
   };
 
+  patches = [
+    # Compatibility with qcheck ≥ 0.26
+    (fetchpatch {
+      url = "https://github.com/c-cube/ocaml-containers/commit/3b49ad2a4e8cfe366d0588e1940d626f0e1b8a2d.patch";
+      hash = "sha256-LFe+LtpBBrf82SX57b4iQSvfd9tSXmnfhffjvjcfLpg=";
+    })
+  ];
+
   buildInputs = [ dune-configurator ];
   propagatedBuildInputs = [
     either
@@ -40,7 +46,7 @@ buildDunePackage rec {
     yojson
   ];
 
-  doCheck = lib.versionAtLeast ocaml.version "4.08";
+  doCheck = true;
 
   meta = {
     homepage = "https://github.com/c-cube/ocaml-containers";
@@ -57,4 +63,4 @@ buildDunePackage rec {
     '';
     license = lib.licenses.bsd2;
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/qcheck/alcotest.nix b/pkgs/development/ocaml-modules/qcheck/alcotest.nix
index e5a6d52cc45c..747844174afa 100644
--- a/pkgs/development/ocaml-modules/qcheck/alcotest.nix
+++ b/pkgs/development/ocaml-modules/qcheck/alcotest.nix
@@ -7,7 +7,7 @@
 buildDunePackage {
   pname = "qcheck-alcotest";
 
-  inherit (qcheck-core) version src patches;
+  inherit (qcheck-core) version src;
 
   propagatedBuildInputs = [
     qcheck-core
diff --git a/pkgs/development/ocaml-modules/qcheck/core.nix b/pkgs/development/ocaml-modules/qcheck/core.nix
index bfa2cffdc4c2..f80eff860259 100644
--- a/pkgs/development/ocaml-modules/qcheck/core.nix
+++ b/pkgs/development/ocaml-modules/qcheck/core.nix
@@ -2,21 +2,23 @@
   lib,
   buildDunePackage,
   fetchFromGitHub,
+  alcotest,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "qcheck-core";
-  version = "0.25";
-
-  minimalOCamlVersion = "4.08";
+  version = "0.27";
 
   src = fetchFromGitHub {
     owner = "c-cube";
     repo = "qcheck";
-    tag = "v${version}";
-    hash = "sha256-Z89jJ21zm89wb9m5HthnbHdnE9iXLyaH9k8S+FAWkKQ=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-UfBfFVSvDeVPUakj2GQCRy5G5IZBxrgdceYtj+VAYbg=";
   };
 
+  doCheck = true;
+  checkInputs = [ alcotest ];
+
   meta = {
     description = "Core qcheck library";
     homepage = "https://c-cube.github.io/qcheck/";
@@ -24,4 +26,4 @@ buildDunePackage rec {
     maintainers = [ lib.maintainers.vbgl ];
   };
 
-}
+})
diff --git a/pkgs/development/ocaml-modules/qcheck/ounit.nix b/pkgs/development/ocaml-modules/qcheck/ounit.nix
index 31c24ab1f7fe..9bc98e3ec24b 100644
--- a/pkgs/development/ocaml-modules/qcheck/ounit.nix
+++ b/pkgs/development/ocaml-modules/qcheck/ounit.nix
@@ -7,7 +7,7 @@
 buildDunePackage {
   pname = "qcheck-ounit";
 
-  inherit (qcheck-core) version src patches;
+  inherit (qcheck-core) version src;
 
   propagatedBuildInputs = [
     qcheck-core