From 5b2f5cae1361959fdb4479136c5fe19fa82c7264 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 11 Sep 2026 09:19:06 +0200
Subject: [PATCH] =?UTF-8?q?ocamlPackages.cstruct:=206.2.0=20=E2=86=92=206.?=
 =?UTF-8?q?3.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/ocaml-modules/cstruct/default.nix | 9 +++------
 pkgs/development/ocaml-modules/cstruct/ppx.nix     | 8 ++++----
 pkgs/development/ocaml-modules/cstruct/sexp.nix    | 9 +++++----
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/ocaml-modules/cstruct/default.nix b/pkgs/development/ocaml-modules/cstruct/default.nix
index 38bfe8236153..b67fd24ae7ca 100644
--- a/pkgs/development/ocaml-modules/cstruct/default.nix
+++ b/pkgs/development/ocaml-modules/cstruct/default.nix
@@ -9,19 +9,16 @@
 
 buildDunePackage (finalAttrs: {
   pname = "cstruct";
-  version = "6.2.0";
-
-  minimalOCamlVersion = "4.08";
-  duneVersion = "3";
+  version = "6.3.0";
 
   src = fetchurl {
     url = "https://github.com/mirage/ocaml-cstruct/releases/download/v${finalAttrs.version}/cstruct-${finalAttrs.version}.tbz";
-    hash = "sha256-mngHM5JYDoNJFI+jq0sbLpidydMNB0AbBMlrfGDwPmI=";
+    hash = "sha256-lWsknd+1X9I1hMF2evKPZIcDPTZIiCF6FCddiY69d1Q=";
   };
 
   buildInputs = [ fmt ];
 
-  doCheck = true;
+  doCheck = false; # Tests depend on cstruct-sexp
   checkInputs = [
     alcotest
     crowbar
diff --git a/pkgs/development/ocaml-modules/cstruct/ppx.nix b/pkgs/development/ocaml-modules/cstruct/ppx.nix
index 074b41df9555..516624226c7e 100644
--- a/pkgs/development/ocaml-modules/cstruct/ppx.nix
+++ b/pkgs/development/ocaml-modules/cstruct/ppx.nix
@@ -6,7 +6,8 @@
   sexplib,
   ppxlib,
   ocaml-migrate-parsetree-2,
-  ounit,
+  crowbar,
+  fmt,
   cppo,
   ppx_sexp_conv,
   cstruct-unix,
@@ -21,8 +22,6 @@ else
     pname = "ppx_cstruct";
     inherit (cstruct) version src meta;
 
-    minimalOCamlVersion = "4.08";
-
     propagatedBuildInputs = [
       cstruct
       ppxlib
@@ -32,7 +31,8 @@ else
     doCheck = !lib.versionAtLeast ocaml.version "5.1";
     nativeCheckInputs = [ cppo ];
     checkInputs = [
-      ounit
+      crowbar
+      fmt
       ppx_sexp_conv
       cstruct-sexp
       cstruct-unix
diff --git a/pkgs/development/ocaml-modules/cstruct/sexp.nix b/pkgs/development/ocaml-modules/cstruct/sexp.nix
index 05e507da83bf..757aa15cfa35 100644
--- a/pkgs/development/ocaml-modules/cstruct/sexp.nix
+++ b/pkgs/development/ocaml-modules/cstruct/sexp.nix
@@ -3,6 +3,7 @@
   buildDunePackage,
   ocaml,
   alcotest,
+  crowbar,
   cstruct,
   sexplib,
 }:
@@ -15,11 +16,11 @@ else
     pname = "cstruct-sexp";
     inherit (cstruct) version src meta;
 
-    minimalOCamlVersion = "4.08";
-    duneVersion = "3";
-
     doCheck = true;
-    checkInputs = [ alcotest ];
+    checkInputs = [
+      alcotest
+      crowbar
+    ];
 
     propagatedBuildInputs = [
       cstruct