From 2dc8245afef5e3ef3b6ff1fc2046671573c9f508 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 26 Mar 2026 17:59:15 +0100
Subject: [PATCH 1/2] ocamlPackages.testo: init at 0.4.0

---
 .../ocaml-modules/testo/default.nix           | 29 +++++++++++++++++++
 pkgs/development/ocaml-modules/testo/diff.nix | 17 +++++++++++
 pkgs/development/ocaml-modules/testo/util.nix | 24 +++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  6 ++++
 4 files changed, 76 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/testo/default.nix
 create mode 100644 pkgs/development/ocaml-modules/testo/diff.nix
 create mode 100644 pkgs/development/ocaml-modules/testo/util.nix

diff --git a/pkgs/development/ocaml-modules/testo/default.nix b/pkgs/development/ocaml-modules/testo/default.nix
new file mode 100644
index 000000000000..0db198af0e5a
--- /dev/null
+++ b/pkgs/development/ocaml-modules/testo/default.nix
@@ -0,0 +1,29 @@
+{
+  lib,
+  fetchurl,
+  buildDunePackage,
+  testo-util,
+  cmdliner,
+}:
+
+buildDunePackage (finalAttrs: {
+  pname = "testo";
+  version = "0.4.0";
+
+  src = fetchurl {
+    url = "https://github.com/mjambon/testo/releases/download/${finalAttrs.version}/testo-${finalAttrs.version}.tbz";
+    hash = "sha256-cPm+FSS1fCj3PCyEk37p93lHjpH6NZ3GNkKJjdExaXs=";
+  };
+
+  propagatedBuildInputs = [
+    cmdliner
+    testo-util
+  ];
+
+  meta = {
+    homepage = "https://github.com/mjambon/testo";
+    license = lib.licenses.isc;
+    description = "Test framework for OCaml";
+    maintainers = [ lib.maintainers.vbgl ];
+  };
+})
diff --git a/pkgs/development/ocaml-modules/testo/diff.nix b/pkgs/development/ocaml-modules/testo/diff.nix
new file mode 100644
index 000000000000..bb376c02a1b2
--- /dev/null
+++ b/pkgs/development/ocaml-modules/testo/diff.nix
@@ -0,0 +1,17 @@
+{
+  fetchurl,
+  buildDunePackage,
+  testo,
+  ppx_deriving,
+}:
+
+buildDunePackage {
+  pname = "testo-diff";
+  inherit (testo) version src;
+
+  propagatedBuildInputs = [ ppx_deriving ];
+
+  meta = testo.meta // {
+    description = "Pure-OCaml diff implementation";
+  };
+}
diff --git a/pkgs/development/ocaml-modules/testo/util.nix b/pkgs/development/ocaml-modules/testo/util.nix
new file mode 100644
index 000000000000..e824b2f3cb0e
--- /dev/null
+++ b/pkgs/development/ocaml-modules/testo/util.nix
@@ -0,0 +1,24 @@
+{
+  lib,
+  fetchurl,
+  buildDunePackage,
+  testo,
+  testo-diff,
+  fpath,
+  re,
+}:
+
+buildDunePackage {
+  pname = "testo-util";
+  inherit (testo) version src;
+
+  propagatedBuildInputs = [
+    fpath
+    re
+    testo-diff
+  ];
+
+  meta = testo.meta // {
+    description = "Modules shared by testo, testo-lwt, etc";
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 9c772d078b05..95a89ab20a77 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -2104,6 +2104,12 @@ let
 
         terml = callPackage ../development/ocaml-modules/terml { };
 
+        testo = callPackage ../development/ocaml-modules/testo { };
+
+        testo-diff = callPackage ../development/ocaml-modules/testo/diff.nix { };
+
+        testo-util = callPackage ../development/ocaml-modules/testo/util.nix { };
+
         tezos-base58 = callPackage ../development/ocaml-modules/tezos-base58 { };
 
         tezt = callPackage ../development/ocaml-modules/tezt { };

From df96a914b43b683d6633baff01d86096309e3ec8 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 26 Mar 2026 17:59:19 +0100
Subject: [PATCH 2/2] ocamlPackages.atdml: init at 4.0.0

---
 .../ocaml-modules/atdgen/runtime.nix          |  2 --
 .../ocaml-modules/atdml/default.nix           | 21 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 3 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/ocaml-modules/atdml/default.nix

diff --git a/pkgs/development/ocaml-modules/atdgen/runtime.nix b/pkgs/development/ocaml-modules/atdgen/runtime.nix
index 4531dce25bb9..9da7797462b7 100644
--- a/pkgs/development/ocaml-modules/atdgen/runtime.nix
+++ b/pkgs/development/ocaml-modules/atdgen/runtime.nix
@@ -9,8 +9,6 @@ buildDunePackage {
   pname = "atdgen-runtime";
   inherit (atdgen-codec-runtime) version src;
 
-  minimalOCamlVersion = "4.08";
-
   propagatedBuildInputs = [
     biniou
     yojson
diff --git a/pkgs/development/ocaml-modules/atdml/default.nix b/pkgs/development/ocaml-modules/atdml/default.nix
new file mode 100644
index 000000000000..1b45f276222b
--- /dev/null
+++ b/pkgs/development/ocaml-modules/atdml/default.nix
@@ -0,0 +1,21 @@
+{
+  lib,
+  buildDunePackage,
+  atd,
+  cmdliner,
+}:
+
+buildDunePackage {
+  pname = "atdml";
+  inherit (atd) version src;
+
+  buildInputs = [ cmdliner ];
+
+  propagatedBuildInputs = [ atd ];
+
+  meta = atd.meta // {
+    description = "Simplified OCaml JSON serializers using the Yojson AST";
+    maintainers = [ lib.maintainers.vbgl ];
+    mainProgram = "atdml";
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 95a89ab20a77..e979158c72a1 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -76,6 +76,8 @@ let
 
         atdgen-runtime = callPackage ../development/ocaml-modules/atdgen/runtime.nix { };
 
+        atdml = callPackage ../development/ocaml-modules/atdml { };
+
         augeas = callPackage ../development/ocaml-modules/augeas {
           inherit (pkgs) augeas;
         };