From 377b6ec37b2cd005c492daea43746df03148c1d5 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 10 Jun 2025 07:29:21 +0200
Subject: [PATCH] =?UTF-8?q?ocamlPackages.sedlex:=203.4=20=E2=86=92=203.6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ocamlPackages.ppx_css: mark as broken
---
 pkgs/by-name/fs/fstar/package.nix                  | 8 +++++++-
 pkgs/development/ocaml-modules/janestreet/0.15.nix | 1 +
 pkgs/development/ocaml-modules/janestreet/0.16.nix | 1 +
 pkgs/development/ocaml-modules/janestreet/0.17.nix | 1 +
 pkgs/development/ocaml-modules/sedlex/default.nix  | 4 ++--
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fs/fstar/package.nix b/pkgs/by-name/fs/fstar/package.nix
index c5851589257c..a103c15768a3 100644
--- a/pkgs/by-name/fs/fstar/package.nix
+++ b/pkgs/by-name/fs/fstar/package.nix
@@ -1,6 +1,7 @@
 {
   callPackage,
   fetchFromGitHub,
+  fetchpatch,
   installShellFiles,
   lib,
   makeWrapper,
@@ -28,7 +29,12 @@ ocamlPackages.buildDunePackage rec {
     hash = "sha256-PhjfThXF6fJlFHtNEURG4igCnM6VegWODypmRvnZPdA=";
   };
 
-  duneVersion = "3";
+  # Compatibility with sedlex ≥ 3.5
+  patches = fetchpatch {
+    url = "https://github.com/FStarLang/FStar/commit/11aff952b955d2c9582515ee2d64ca6993ce1b73.patch";
+    hash = "sha256-HlppygegUAYYPDVSzFJvMHXdDSoug636bFa19v3TGkc=";
+    excludes = [ "fstar.opam" ];
+  };
 
   nativeBuildInputs = [
     ocamlPackages.menhir
diff --git a/pkgs/development/ocaml-modules/janestreet/0.15.nix b/pkgs/development/ocaml-modules/janestreet/0.15.nix
index 871277c72b51..89ca0e0c42ef 100644
--- a/pkgs/development/ocaml-modules/janestreet/0.15.nix
+++ b/pkgs/development/ocaml-modules/janestreet/0.15.nix
@@ -801,6 +801,7 @@ with self;
       js_of_ocaml-ppx
       sedlex
     ];
+    meta.broken = true; # Not compatible with sedlex > 3.4
   };
 
   ppx_csv_conv = janePackage {
diff --git a/pkgs/development/ocaml-modules/janestreet/0.16.nix b/pkgs/development/ocaml-modules/janestreet/0.16.nix
index 60358dc4f574..75ddf6c2ba4b 100644
--- a/pkgs/development/ocaml-modules/janestreet/0.16.nix
+++ b/pkgs/development/ocaml-modules/janestreet/0.16.nix
@@ -1057,6 +1057,7 @@ with self;
       sedlex
       virtual_dom
     ];
+    meta.broken = true; # Not compatible with sedlex > 3.4
   };
 
   ppx_csv_conv = janePackage {
diff --git a/pkgs/development/ocaml-modules/janestreet/0.17.nix b/pkgs/development/ocaml-modules/janestreet/0.17.nix
index b16957cb8732..4fff1c9ca651 100644
--- a/pkgs/development/ocaml-modules/janestreet/0.17.nix
+++ b/pkgs/development/ocaml-modules/janestreet/0.17.nix
@@ -1149,6 +1149,7 @@ with self;
       sedlex
       virtual_dom
     ];
+    meta.broken = true; # Not compatible with sedlex > 3.4
   };
 
   ppx_csv_conv = janePackage {
diff --git a/pkgs/development/ocaml-modules/sedlex/default.nix b/pkgs/development/ocaml-modules/sedlex/default.nix
index bd5eb9119d32..91114de6e8ae 100644
--- a/pkgs/development/ocaml-modules/sedlex/default.nix
+++ b/pkgs/development/ocaml-modules/sedlex/default.nix
@@ -13,8 +13,8 @@ let
   param =
     if lib.versionAtLeast ppxlib.version "0.26.0" then
       {
-        version = "3.4";
-        sha256 = "sha256-mJMv2zl1UfFJjYdwv68hi7TWP+/oZB9tKHXt13r1SlA=";
+        version = "3.6";
+        sha256 = "sha256-NiNqur7sce6dxictVB+saOC1c4N/EO/3Ici/icsGkIA=";
       }
     else
       {