From 5e9048847dd6c95ae747bbdc2951074262239592 Mon Sep 17 00:00:00 2001
From: chordtoll <git@chordtoll.com>
Date: Fri, 16 Jan 2026 14:34:37 -0800
Subject: [PATCH 1/2] ocamlPackages.stdcompat: 19 -> 21.1

---
 pkgs/development/ocaml-modules/stdcompat/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/ocaml-modules/stdcompat/default.nix b/pkgs/development/ocaml-modules/stdcompat/default.nix
index d75b4839a8b0..25abe8fa9679 100644
--- a/pkgs/development/ocaml-modules/stdcompat/default.nix
+++ b/pkgs/development/ocaml-modules/stdcompat/default.nix
@@ -7,22 +7,22 @@
 
 buildDunePackage rec {
   pname = "stdcompat";
-  version = "19";
+  version = "21.1";
 
-  minimalOCamlVersion = "4.06";
+  minimalOCamlVersion = "4.11";
 
   src = fetchurl {
-    url = "https://github.com/thierry-martinez/stdcompat/releases/download/v${version}/stdcompat-${version}.tar.gz";
-    sha256 = "sha256-DKQGd4nnIN6SPls6hcA/2Jvc7ivYNpeMU6rYsVc1ClU=";
+    url = "https://github.com/ocamllibs/stdcompat/archive/refs/tags/${version}.tar.gz";
+    sha256 = "sha256-RSJ9AgUEmt23QZCk60ETIXmkJhG7knQe+s8wNxxIHm4=";
   };
 
   # Otherwise ./configure script will run and create files conflicting with dune.
   dontConfigure = true;
 
   meta = {
-    homepage = "https://github.com/thierry-martinez/stdcompat";
+    homepage = "https://github.com/ocamllibs/stdcompat";
     license = lib.licenses.bsd2;
     maintainers = [ lib.maintainers.vbgl ];
-    broken = lib.versionAtLeast ocaml.version "5.2";
+    broken = lib.versionAtLeast ocaml.version "5.4";
   };
 }

From a3dc5bec8217e0e4b6463c0479840618591b58ec Mon Sep 17 00:00:00 2001
From: chordtoll <git@chordtoll.com>
Date: Fri, 16 Jan 2026 14:48:36 -0800
Subject: [PATCH 2/2] ocamlPackages.pyml: patch to remove unused header

---
 pkgs/development/ocaml-modules/pyml/default.nix       |  4 ++++
 .../ocaml-modules/pyml/remove-stdcompat.patch         | 11 +++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/pyml/remove-stdcompat.patch

diff --git a/pkgs/development/ocaml-modules/pyml/default.nix b/pkgs/development/ocaml-modules/pyml/default.nix
index 8f5553ffa59e..9c74b4f9b47a 100644
--- a/pkgs/development/ocaml-modules/pyml/default.nix
+++ b/pkgs/development/ocaml-modules/pyml/default.nix
@@ -18,6 +18,10 @@ buildDunePackage rec {
     hash = "sha256-WPtmj9EEs7P72OXWJg1syIrbLuh7u4V4W4nyozXmSa0=";
   };
 
+  patches = [
+    ./remove-stdcompat.patch
+  ];
+
   buildInputs = [
     utop
   ];
diff --git a/pkgs/development/ocaml-modules/pyml/remove-stdcompat.patch b/pkgs/development/ocaml-modules/pyml/remove-stdcompat.patch
new file mode 100644
index 000000000000..5d8bdb739f59
--- /dev/null
+++ b/pkgs/development/ocaml-modules/pyml/remove-stdcompat.patch
@@ -0,0 +1,11 @@
+diff --git a/pyml_stubs.c b/pyml_stubs.c
+index 40e3481..e7826f1 100644
+--- a/pyml_stubs.c
++++ b/pyml_stubs.c
+@@ -11,7 +11,6 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <errno.h>
+-#include <stdcompat.h>
+ #include <assert.h>
+ #include "pyml_stubs.h"