From f238bd7513d85cb3de643b0f266b6edd02589e3f Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 29 Sep 2026 23:28:15 +0000
Subject: [PATCH] python3Packages.xgrammar: 0.1.33 -> 0.2.8

Diff: https://github.com/mlc-ai/xgrammar/compare/v0.1.33...v0.2.8

Changelog: https://github.com/mlc-ai/xgrammar/releases/tag/v0.2.8
---
 ...fix-find-nanobind-from-python-module.patch | 41 -------------
 .../python-modules/xgrammar/default.nix       | 61 +++++++------------
 2 files changed, 23 insertions(+), 79 deletions(-)
 delete mode 100644 pkgs/development/python-modules/xgrammar/0001-fix-find-nanobind-from-python-module.patch

diff --git a/pkgs/development/python-modules/xgrammar/0001-fix-find-nanobind-from-python-module.patch b/pkgs/development/python-modules/xgrammar/0001-fix-find-nanobind-from-python-module.patch
deleted file mode 100644
index bedcb2211665..000000000000
--- a/pkgs/development/python-modules/xgrammar/0001-fix-find-nanobind-from-python-module.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From c01e056ee845ae973ec36cc50125492ef8c02c12 Mon Sep 17 00:00:00 2001
-From: Conroy Cheers <conroy@corncheese.org>
-Date: Thu, 12 Jun 2025 17:45:27 +1000
-Subject: [PATCH] [Fix] find nanobind from Python module
-
----
- cpp/nanobind/CMakeLists.txt | 4 ++++
- pyproject.toml              | 2 +-
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/cpp/nanobind/CMakeLists.txt b/cpp/nanobind/CMakeLists.txt
-index 8ea5622..02500ac 100644
---- a/cpp/nanobind/CMakeLists.txt
-+++ b/cpp/nanobind/CMakeLists.txt
-@@ -3,6 +3,10 @@ find_package(
-   COMPONENTS Interpreter Development.Module
-   REQUIRED
- )
-+
-+execute_process(
-+  COMMAND "${Python_EXECUTABLE}" -m nanobind --cmake_dir
-+  OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE nanobind_DIR)
- find_package(nanobind CONFIG REQUIRED)
- 
- # Compile this source file seperately. Nanobind suggests to optimize bindings code for size, but
-diff --git a/pyproject.toml b/pyproject.toml
-index 11fae7d..d2078b1 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -44,7 +44,7 @@ provider = "scikit_build_core.metadata.regex"
- input = "python/xgrammar/version.py"
- 
- [build-system]
--requires = ["scikit-build-core>=0.10.0", "nanobind==2.5.0"]
-+requires = ["scikit-build-core>=0.10.0", "nanobind>=2.5.0"]
- build-backend = "scikit_build_core.build"
- 
- [tool.scikit-build]
--- 
-2.49.0
-
diff --git a/pkgs/development/python-modules/xgrammar/default.nix b/pkgs/development/python-modules/xgrammar/default.nix
index 754a2780db5d..2eaea4b1a062 100644
--- a/pkgs/development/python-modules/xgrammar/default.nix
+++ b/pkgs/development/python-modules/xgrammar/default.nix
@@ -7,10 +7,11 @@
   # build-system
   cmake,
   ninja,
-  nanobind,
   scikit-build-core,
+  setuptools-scm,
 
   # dependencies
+  apache-tvm-ffi,
   mlx-lm,
   numpy,
   pydantic,
@@ -25,32 +26,31 @@
   writableTmpDirAsHomeHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "xgrammar";
-  version = "0.1.33";
+  version = "0.2.8";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "mlc-ai";
     repo = "xgrammar";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-mliAmFBY3eLnUP+2HCRGX36KPUjaxn0Eb+2aKyDwdaM=";
+    hash = "sha256-Ff/CLdSjq8ammfci+Eu9hY4433e7csf8EeGu2X9B2rI=";
   };
 
-  patches = [
-    ./0001-fix-find-nanobind-from-python-module.patch
-  ];
-
   build-system = [
     cmake
     ninja
-    nanobind
+    apache-tvm-ffi
     scikit-build-core
+    setuptools-scm
   ];
   dontUseCmakeConfigure = true;
 
   dependencies = [
+    apache-tvm-ffi
     numpy
     pydantic
     torch
@@ -73,36 +73,21 @@ buildPythonPackage rec {
     writableTmpDirAsHomeHook
   ];
 
-  env = lib.optionalAttrs stdenv.hostPlatform.isLinux {
-    NIX_CFLAGS_COMPILE = toString [
+  env.NIX_CFLAGS_COMPILE = toString (
+    lib.optionals stdenv.hostPlatform.isLinux [
       # xgrammar hardcodes -flto=auto while using static linking, which can cause linker errors without this additional flag.
       "-ffat-lto-objects"
-    ];
-  };
+    ]
+    ++ lib.optionals stdenv.cc.isGNU [
+      # xgrammar builds with -Werror, and GCC 16 emits a false-positive array-bounds warning
+      # in cpp/json_schema_converter.cc
+      "-Wno-error=array-bounds"
+    ]
+  );
 
   disabledTests = [
-    # You are trying to access a gated repo.
-    "test_grammar_compiler"
-    "test_grammar_matcher"
-    "test_grammar_matcher_ebnf"
-    "test_grammar_matcher_json"
-    "test_grammar_matcher_json_schema"
-    "test_grammar_matcher_tag_dispatch"
-    "test_regex_converter"
-    "test_serialize_compiled_grammar_with_hf_tokenizer"
-    "test_tokenizer_info"
-
-    # Torch not compiled with CUDA enabled
-    "test_token_bitmask_operations"
-
-    # AssertionError
-    "test_json_schema_converter"
-  ];
-
-  disabledTestPaths = [
-    # Requires internet access
-    "tests/python/test_structural_tag_converter.py"
-    "tests/python/test_structural_tag_for_model.py"
+    # ModuleNotFoundError: No module named 'cohere_melody'
+    "melody"
   ];
 
   pythonImportsCheck = [ "xgrammar" ];
@@ -110,7 +95,7 @@ buildPythonPackage rec {
   meta = {
     description = "Efficient, Flexible and Portable Structured Generation";
     homepage = "https://xgrammar.mlc.ai";
-    changelog = "https://github.com/mlc-ai/xgrammar/releases/tag/${src.tag}";
+    changelog = "https://github.com/mlc-ai/xgrammar/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.asl20;
   };
-}
+})