diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/default-grammars.json b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/default-grammars.json
index 1cfa52fed5b58..ef486bd5ea6f8 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/default-grammars.json
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/default-grammars.json
@@ -1,33 +1,54 @@
 [
   "tree-sitter-bash",
+  "tree-sitter-beancount",
+  "tree-sitter-bibtex",
   "tree-sitter-c",
   "tree-sitter-c-sharp",
-  "tree-sitter-cpp",
+  "tree-sitter-clojure",
+  "tree-sitter-cmake",
+  "tree-sitter-comment",
   "tree-sitter-css",
+  "tree-sitter-dart",
+  "tree-sitter-dockerfile",
   "tree-sitter-elixir",
-  "tree-sitter-elm",
+  "tree-sitter-erlang",
+  "tree-sitter-fennel",
+  "tree-sitter-fortran",
+  "tree-sitter-gdscript",
+  "tree-sitter-glsl",
   "tree-sitter-go",
   "tree-sitter-haskell",
-  "tree-sitter-hcl",
+  "tree-sitter-heex",
   "tree-sitter-html",
   "tree-sitter-janet-simple",
   "tree-sitter-java",
   "tree-sitter-javascript",
   "tree-sitter-jsdoc",
   "tree-sitter-json",
+  "tree-sitter-jsonnet",
   "tree-sitter-julia",
-  "tree-sitter-nix",
+  "tree-sitter-kotlin",
+  "tree-sitter-llvm",
+  "tree-sitter-lua",
+  "tree-sitter-markdown",
   "tree-sitter-ocaml",
-  "tree-sitter-perl",
+  "tree-sitter-ocaml-interface",
   "tree-sitter-pgn",
   "tree-sitter-php",
   "tree-sitter-prisma",
   "tree-sitter-python",
+  "tree-sitter-r",
+  "tree-sitter-rst",
   "tree-sitter-ruby",
   "tree-sitter-rust",
   "tree-sitter-scala",
+  "tree-sitter-scheme",
+  "tree-sitter-smithy",
+  "tree-sitter-solidity",
+  "tree-sitter-svelte",
+  "tree-sitter-toml",
+  "tree-sitter-twig",
   "tree-sitter-typescript",
   "tree-sitter-verilog",
-  "tree-sitter-yaml",
   "tree-sitter-zig"
 ]
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/update-defaults.py b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/update-defaults.py
index 128ce66dda8bc..2071398bf99f3 100755
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/update-defaults.py
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/update-defaults.py
@@ -41,6 +41,12 @@ def check_grammar_exists(nixpkgs: str, grammar: str) -> bool:
     )
 
 
+def check_grammar_broken(nixpkgs: str, grammar: str) -> bool:
+    return eval_expr(
+        nixpkgs, f'tree-sitter-grammars.{fmt_grammar(grammar)}.meta.broken'
+    )
+
+
 def build_attr(nixpkgs, attr: str) -> str:
     return (
         subprocess.run(
@@ -55,7 +61,7 @@ def build_attr(nixpkgs, attr: str) -> str:
 
 if __name__ == "__main__":
     cwd = dirname(abspath(__file__))
-    nixpkgs = abspath(join(cwd, "../../../../../.."))
+    nixpkgs = abspath(join(cwd, "../../../../../../.."))
 
     src_dir = build_attr(nixpkgs, "emacs.pkgs.tree-sitter-langs.src")
 
@@ -65,7 +71,12 @@ def build_attr(nixpkgs, attr: str) -> str:
     for g in grammars:
         exists = check_grammar_exists(nixpkgs, g)
         if exists:
-            existing.append(fmt_grammar(g))
+            broken = check_grammar_broken(nixpkgs, g)
+            if not broken:
+                existing.append(fmt_grammar(g))
+            else:
+                sys.stderr.write("Grammar is broken: " + fmt_grammar(g) + "\n")
+                sys.stderr.flush()
         else:
             sys.stderr.write("Missing grammar: " + fmt_grammar(g) + "\n")
             sys.stderr.flush()
diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix
index c7ec3be0d4b29..2ea89216ed3b5 100644
--- a/pkgs/development/tools/parsing/tree-sitter/default.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/default.nix
@@ -77,6 +77,7 @@ let
           src = grammar.src or (fetchGrammar grammar);
           location = grammar.location or null;
           generate = grammar.generate or false;
+          broken = grammar.broken or false;
         };
       grammars' = import ./grammars { inherit lib; } // extraGrammars;
       grammars =
@@ -120,6 +121,7 @@ let
           tree-sitter-markdown-inline = grammars'.tree-sitter-markdown // {
             language = "tree-sitter-markdown_inline";
             location = "tree-sitter-markdown-inline";
+            broken = true;
           };
         }
         // {
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammar.nix b/pkgs/development/tools/parsing/tree-sitter/grammar.nix
index 9989975b018c6..7c1511682365a 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammar.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/grammar.nix
@@ -2,6 +2,7 @@
   stdenv,
   nodejs,
   tree-sitter,
+  writableTmpDirAsHomeHook,
   lib,
 }:
 
@@ -14,6 +15,7 @@
   src,
   location ? null,
   generate ? false,
+  broken ? false,
   ...
 }@args:
 
@@ -47,6 +49,21 @@ stdenv.mkDerivation (
         tree-sitter generate
       '';
 
+    doCheck = !broken;
+
+    nativeCheckInputs = [
+      # tree-sitter needs a writable home folder for the checkPhase
+      writableTmpDirAsHomeHook
+    ];
+
+    checkPhase = ''
+      runHook preCheck
+
+      ${lib.getExe tree-sitter} test
+
+      runHook postCheck
+    '';
+
     # When both scanner.{c,cc} exist, we should not link both since they may be the same but in
     # different languages. Just randomly prefer C++ if that happens.
     buildPhase = ''
@@ -71,6 +88,9 @@ stdenv.mkDerivation (
       fi
       runHook postInstall
     '';
+    meta = {
+      inherit broken;
+    };
   }
   // removeAttrs args [
     "language"
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json
index 00d30c080ed45..d83b88ed5ec4f 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/uyha/tree-sitter-cmake",
-  "rev": "e409ae33f00e04cde30f2bcffb979caf1a33562a",
-  "date": "2024-10-14T03:37:52+03:00",
-  "path": "/nix/store/hgwv6jwacl1md38yccvvvhigyk6h21s2-tree-sitter-cmake",
-  "sha256": "1v2kkxf9w0y9mwwgimgyvn1s9cmmp6jg71ckr001w1w8szyqqf7q",
-  "hash": "sha256-+DiM/deIBx4AyJOF86S5tbKkg93+1fg4r8kDnlyfU+w=",
+  "rev": "fe48221d4d9842d916d66b5e71ab3c6307ec28b3",
+  "date": "2025-03-12T21:26:55Z",
+  "path": "/nix/store/rrbi1s3fyi02shvnqr2idrn9j36kby3c-tree-sitter-cmake",
+  "sha256": "0g7i4zp3900hy887ljyjqcxln96fygrxpj9czm89sl54x19q8klm",
+  "hash": "sha256-lU6EU+ikUJ1Q/SzJ2/PzziRLO8PSS3oQ8hCANO4n8Tw=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-commonlisp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-commonlisp.json
index b17e5ca895277..db810bcb36b63 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-commonlisp.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-commonlisp.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/thehamsta/tree-sitter-commonlisp",
-  "rev": "25856774aaab983c573bb2f9cc1ebbc97941f7b9",
-  "date": "2024-04-06T22:22:41+02:00",
-  "path": "/nix/store/mlji0h6k2x17jni9q3y571dmk5k4xi85-tree-sitter-commonlisp",
-  "sha256": "12fh2sinasnfp6rfq5d9qq24nfg55bclc5rp8mnw3a2ccyc5icis",
-  "hash": "sha256-OrJYmGdMqMFtRTcXRtkq5TlLBMapFeyyuc5qZaMW0Ik=",
+  "rev": "9db594efb43574c5fe4a1f880568b1f0d0ee6057",
+  "date": "2025-03-16T16:36:54+01:00",
+  "path": "/nix/store/96phqhn770ds8i0j0l88phldl7d03g72-tree-sitter-commonlisp",
+  "sha256": "0xg3ay8l62h7s35abkxi4gjfvndzdvvrpgh1z980q1ib5935sxf0",
+  "hash": "sha256-wHVdRiorBgxQ+gG+m/duv9nt5COxz6XK0AcKQ5FX43U=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json
index 7230d1854286f..b3dcaa4b6a26f 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json
@@ -8,5 +8,6 @@
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "broken": true
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json
index 19ed0721d3525..738006fb1e62e 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json
@@ -1,10 +1,10 @@
 {
-  "url": "https://github.com/thehamsta/tree-sitter-cuda",
-  "rev": "9cdfe2d453e5f60fd818935a5895f223e2e6feed",
-  "date": "2025-01-25T13:03:37+01:00",
-  "path": "/nix/store/xz5zddyszj1sgr3lp17f021n2x13dmj7-tree-sitter-cuda",
-  "sha256": "0krk5f0g87cp1mkdn2x6sadldqnvhxxy8zsvc8z2bxc50vb4lw9m",
-  "hash": "sha256-NXFK1gaF9SU+Ylt/5HuH2+JGm9KmC9tmDZcd9IArM08=",
+  "url": "https://github.com/tree-sitter-grammars/tree-sitter-cuda",
+  "rev": "014628ae8d2df391b88ddb9fa0260fd97f770829",
+  "date": "2025-03-16T17:20:16+01:00",
+  "path": "/nix/store/w0cl4ga4bis992vyfmj8l0pq385z0cka-tree-sitter-cuda",
+  "sha256": "1qyh00rapch29czvnqs3364bx0bi4gyapfxb0v8m4r2m8kybnlff",
+  "hash": "sha256-zlG7/ERVZFLRBqu7q/wjcYG+iBlDY7s/SwKyqzIA0OM=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json
index 6a993f0f47356..e7493e708e446 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json
@@ -1,12 +1,13 @@
 {
   "url": "https://github.com/usernobody14/tree-sitter-dart",
-  "rev": "e81af6ab94a728ed99c30083be72d88e6d56cf9e",
-  "date": "2024-11-16T21:53:35-07:00",
-  "path": "/nix/store/jb7wiv90s78p45pj9mqvmbgk06xhjlj5-tree-sitter-dart",
-  "sha256": "0zl46vkm4p1jmivmnpyyzc58fwhx5frfgi0rfxna43h0qxdv62wy",
-  "hash": "sha256-nguzW8cADqJsdxnE57IrHXKHCvveX1t3rDJcUuc2hH4=",
+  "rev": "80e23c07b64494f7e21090bb3450223ef0b192f4",
+  "date": "2025-02-28T15:18:07-07:00",
+  "path": "/nix/store/7pfv5380h2fwv0rg0ckdjg8h71vzq71f-tree-sitter-dart",
+  "sha256": "00wzdgmi6kph4lk988brpy03j43a8vvfcjx9plnnnk07a14l3hbc",
+  "hash": "sha256-bMFBSVAHTGstvalL5vZGahA5gL95IZQmJfBOE+trnwM=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "broken": true
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-eex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-eex.json
index 34dc023949d29..df5353adcf050 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-eex.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-eex.json
@@ -8,5 +8,6 @@
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "broken": true
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elisp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elisp.json
index 970cf5370bf0a..7d6a2c2fdc02d 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elisp.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elisp.json
@@ -8,5 +8,6 @@
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "broken": true
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json
index 628e919cf8357..60791055f7ded 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json
@@ -8,5 +8,6 @@
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "broken": true
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json
index 1f0333795f1b2..07755fa4d6547 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json
@@ -8,5 +8,6 @@
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "broken": true
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json
index 78ec184a9b8c6..ddcade2b0e0b2 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json
@@ -8,5 +8,6 @@
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "broken": true
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fortran.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fortran.json
index cfc6a0ff44bd9..51a7a272710a4 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fortran.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fortran.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/stadelmanma/tree-sitter-fortran",
-  "rev": "022b032d31299c5d8336cdfd0ece97de20a609c0",
-  "date": "2025-01-23T13:28:14-05:00",
-  "path": "/nix/store/vncpfx5db12ish9rzf26phj25373nqs4-tree-sitter-fortran",
-  "sha256": "1mncdji60qa9r8jbiywmcid714ylc3gniq25l8mxj1p4zq95nd29",
-  "hash": "sha256-STRbEv7kBtkrokXgaN9g1JNwWmSV+7gkyklhYKJszNY=",
+  "rev": "64e11001d7ef3e8ac18e55a3a2d811fe36430923",
+  "date": "2025-03-17T15:53:16-04:00",
+  "path": "/nix/store/lb6lr9gqrkfxq4q53z4xnihv927lbwfj-tree-sitter-fortran",
+  "sha256": "0fxlg3ckah5iv9gyc74d76xkr9qdk7xrs8c650gcicsvnmy9qpza",
+  "hash": "sha256-6l+cfLVbs8geKIYhnfuZDac8uzmNHOZf2rFANdl4tDs=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gleam.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gleam.json
index 945973f934bde..bef23dfcb371a 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gleam.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gleam.json
@@ -1,12 +1,13 @@
 {
   "url": "https://github.com/gleam-lang/tree-sitter-gleam",
-  "rev": "af6043419f5aa0f8b6c2a26db0187aefa46c7f5f",
-  "date": "2025-02-07T14:27:03Z",
-  "path": "/nix/store/k54xiiqza536lzgvdw8yizsp6czdalln-tree-sitter-gleam",
-  "sha256": "0b7k2ah7a29simvvzm3f01vna5lzvv1mi7idvzpc056wjbgnvrg8",
-  "hash": "sha256-6OVt35LcFMDu3y2eWMPenxZldwBu1L93jToJdaAS8yw=",
+  "rev": "99ec4101504452c488b7c835fb65cfef75b090b7",
+  "date": "2025-03-20T12:15:08Z",
+  "path": "/nix/store/fyy76dad39xxxlg1mh8f7w8ny2yck8pa-tree-sitter-gleam",
+  "sha256": "11vvlpwhxr9wa0flq9k9xl4cr97jnvi8r2zaafy86qb71n7rqiql",
+  "hash": "sha256-FEecjw1nYYO8U+qLjOK28qTMCO1pJkwdUDzlDvmle4c=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "broken": true
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glimmer.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glimmer.json
index 87da016a651e2..2635e2c910bf3 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glimmer.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glimmer.json
@@ -8,5 +8,6 @@
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "broken": true
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json
index 0d6d9a127406a..826ffc3f36b45 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/thehamsta/tree-sitter-glsl",
-  "rev": "66aec57f7119c7e8e40665b723cd7af5594f15ee",
-  "date": "2024-09-12T12:52:04+02:00",
-  "path": "/nix/store/xzxngsr3nhs1586c47iwdx9k20yaansc-tree-sitter-glsl",
-  "sha256": "0gp3bn31xz5rq52amx059r9sllk3749f1ajmbs1fkjb833f2kvqh",
-  "hash": "sha256-EO8p3BhoyemCXlWq4BI5Y1KqU04F9KpEwbn8HoZd4z4=",
+  "rev": "e47b8b62b59d0e3529f1c31b03e025d6bd475044",
+  "date": "2025-03-16T18:14:20+01:00",
+  "path": "/nix/store/87vf9kgi9yzzksj0s7h707ky79kckf5f-tree-sitter-glsl",
+  "sha256": "0d0ymklms4a91b310f0vwl80yy50sji4qq9sdgly5qh42kyjnijb",
+  "hash": "sha256-S0Yr/RQE4uLpazphTKLUoHgPEOUbOBDGCkkRXemsHjQ=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-graphql.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-graphql.json
index eb16f2cd9c29c..9b6f85a3841c7 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-graphql.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-graphql.json
@@ -8,5 +8,6 @@
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "broken": true
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json
index 3bcd64dcbe5af..fc1047efbdd8a 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json
@@ -8,5 +8,6 @@
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "broken": true
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hcl.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hcl.json
index 738b02ffdb69d..2cea8beb7fa92 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hcl.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hcl.json
@@ -8,5 +8,6 @@
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "broken": true
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json
index 572143e5e2aef..c170a6689b4c6 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json
@@ -8,5 +8,6 @@
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "broken": true
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json
index 9e6eb0167e0b9..05c6028fadbd2 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json
@@ -8,5 +8,6 @@
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "broken": true
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json
index b01889fcedbb6..fae57e9bd9f58 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json
@@ -1,12 +1,13 @@
 {
   "url": "https://github.com/MunifTanjim/tree-sitter-lua",
-  "rev": "99fc677e6971c425e8d407f59c77ab897e585c92",
-  "date": "2024-09-09T11:10:03-04:00",
-  "path": "/nix/store/iiih0sfdls1h8q7ca12y0rhc7g5jl76w-tree-sitter-lua",
-  "sha256": "0wrbxmb6j8xyckf5jw14jf97cb9fn7yhalap6xxgsag84ypfsqj3",
-  "hash": "sha256-Q2LtrifoKf16N1dRBf2xLi12kpMkcFncZL4jaVbtK3M=",
+  "rev": "534c461d2b75b0887ec968ef9635f4460b0878b7",
+  "date": "2025-03-21T16:15:02+01:00",
+  "path": "/nix/store/vcmm6sdh9lfw4bvwx78yx2llzwq40jyb-tree-sitter-lua",
+  "sha256": "041anx0qirvd4il87whpic8nfdc1nk3kimxdb99m25bfdzm9rn0r",
+  "hash": "sha256-Gdic6m9uFVFTWq3XOMe0gTVnEYsX8oNoJG3niEG3KhA=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "broken": true
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-make.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-make.json
index 8d116744dffad..9f52de0687a82 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-make.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-make.json
@@ -8,5 +8,6 @@
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "broken": true
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json
index 250b848c1bdf4..029427eb4db75 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/MDeiml/tree-sitter-markdown",
-  "rev": "1c8dea73bc0c996d92dd9ebc30dd388716b1c5db",
-  "date": "2024-09-11T16:28:36+03:00",
-  "path": "/nix/store/g4696miy9vzcw0qwd00rar36qn08jn2l-tree-sitter-markdown",
-  "sha256": "13xfyclim1yql6swbk4y12sxgvn799ldbzjl35n5rrkz7wgnwm9s",
-  "hash": "sha256-OlVuHz9/5lxsGVT+1WhKx+7XtQiezMW1odiHGinzro8=",
+  "rev": "413285231ce8fa8b11e7074bbe265b48aa7277f9",
+  "date": "2025-03-21T16:39:14+01:00",
+  "path": "/nix/store/1ly62gw296mjrc6gl8rhpckp1in291sj-tree-sitter-markdown",
+  "sha256": "0r8jlmyr1bnyqqipmpmxxw4qw81c9n0l29xdfkz2n2zmjqps5v9r",
+  "hash": "sha256-Oe2iL5b1Cyv+dK0nQYFNLCCOCe+93nojxt6ukH2lEmU=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json
index fc10495be349a..89e85312d03c1 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json
@@ -1,12 +1,13 @@
 {
   "url": "https://github.com/cstrahan/tree-sitter-nix",
-  "rev": "b3a88cf3e597d48c33657deca4fda7a75c0069c1",
-  "date": "2025-01-31T17:04:23Z",
-  "path": "/nix/store/lvw6n2174vjd5g7jmylpk84040gpsyj6-tree-sitter-nix",
-  "sha256": "16gkm286jvkv7kygs6ap9h06dvp96akahjdvqrdjzzp1vlsqlf5s",
-  "hash": "sha256-ujiKNd3h/i9bxrtJqKYy6e5mAExXGf38PHtuaZCo85k=",
+  "rev": "cfc53fd287d23ab7281440a8526c73542984669b",
+  "date": "2025-03-10T21:49:48Z",
+  "path": "/nix/store/aqzm346ck43x74b409jiikbbxqchgyr1-tree-sitter-nix",
+  "sha256": "0bmalpgvfcz1zd72wq43r5qvhj3dqqp7zn9kfb6bs0valrxagaks",
+  "hash": "sha256-eqqneqZqA73McjPZfy7GbUi4ccmDYC5O++Ezt9+lqi4=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "broken": true
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json
index 74af239932643..6fed021cd1573 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json
@@ -8,5 +8,6 @@
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "broken": true
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json
index a13f59babed24..8362eca620b84 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/nushell/tree-sitter-nu",
-  "rev": "2a153c88d5d44d96653057c7cc14292f4e641bef",
-  "date": "2025-02-14T22:21:43-06:00",
-  "path": "/nix/store/di072yk2yrla0fw45sxa0niy5dd7a8gw-tree-sitter-nu",
-  "sha256": "1jyd7xvnxv5c9i7ankxslmgarvmnhaam6ylhzk2v5lcfjk21gzij",
-  "hash": "sha256-Mv4XxJSO0bLF/JB6U5WCtu6sXqW6T6tOTKzsbnc/zcs=",
+  "rev": "c10340b5bb3789f69182acf8f34c3d4fc24d2fe1",
+  "date": "2025-03-11T06:27:02-05:00",
+  "path": "/nix/store/52322kbw4m00ibyha0k3vglzvar3ad42-tree-sitter-nu",
+  "sha256": "0ym0506lf35hrxfv25fn3qygabcqlyg5s4y6lcpn44sdxyn8a9hk",
+  "hash": "sha256-EyaFrO9NE2Ivo8YTXZ6nmC31PB7WFbFdz7AMRw0ooHo=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json
index 14f22e9e243da..7204e92edaa89 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json
@@ -8,5 +8,6 @@
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "broken": true
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json
index fabb7c2e806c9..add3687e515bb 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-php",
-  "rev": "43aad2b9a98aa8e603ea0cf5bb630728a5591ad8",
-  "date": "2024-11-19T21:55:55-06:00",
-  "path": "/nix/store/nl2r9rkvhnhdd3f9zn59nv7k4d1j6m68-tree-sitter-php",
-  "sha256": "0qkjp5n3ys0jckg67zcdf4mkb01ilnkqx61wga13ys2infgd8agq",
-  "hash": "sha256-+CnUnrNRaD+CejyYjqelMYA1K3GN/WPeZBJoP2y5cmI=",
+  "rev": "f7cf7348737d8cff1b13407a0bfedce02ee7b046",
+  "date": "2025-02-27T03:54:39-06:00",
+  "path": "/nix/store/6hwqa10mfcs32cqq5ab48c444yihm106-tree-sitter-php",
+  "sha256": "05qhz14vvqgwpxgdfr1skwgrv041zwc3wxjyx6y679965nn0lrji",
+  "hash": "sha256-UWYKrC0mpWO86V52Phj/gYCdH586ZNdev/zhvUn4EBc=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-query.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-query.json
index 4c2825dafb4ee..3528d155a6bfc 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-query.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-query.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/nvim-treesitter/tree-sitter-query",
-  "rev": "0555ac0da902abff06076e40501102cee3ba68bd",
-  "date": "2025-02-02T17:30:49+01:00",
-  "path": "/nix/store/ab5v1pf3vckwhnix7r0c1l5g8x30v4zl-tree-sitter-query",
-  "sha256": "0dqy7i2jdd9dqf1ppqzcmkzd9yndb11r78l0pv1zyl7dm7h5g76q",
-  "hash": "sha256-2JxX4KntUP/DvoCik0NYzfrU/qzs43uDwy21JkU8Hjc=",
+  "rev": "930202c2a80965a7a9ca018b5b2a08b25dfa7f12",
+  "date": "2025-03-18T14:33:12+01:00",
+  "path": "/nix/store/hwa3vgivjzqwrwv4va2kym9kg1a4jcvk-tree-sitter-query",
+  "sha256": "0274iz2z55m29yk56lmb7sans2k6hpd0nzgrznfx3jwr8dm2jw5r",
+  "hash": "sha256-uXApakOZy9Gd/fl9C9qFZgptlT6rUlOmT6KW8sWP5Ag=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json
index 4754dba33b8da..887dd75bece02 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json
@@ -8,5 +8,6 @@
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "broken": true
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-river.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-river.json
index 9b98afddeef0d..9e2ab1a4b9dfc 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-river.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-river.json
@@ -8,5 +8,6 @@
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "broken": true
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scss.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scss.json
index 6212e7a668223..4b5e9197f0084 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scss.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scss.json
@@ -8,5 +8,6 @@
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "broken": true
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-solidity.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-solidity.json
index bc24e7aa108bd..acbfe086c2aa9 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-solidity.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-solidity.json
@@ -8,5 +8,6 @@
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "broken": true
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sparql.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sparql.json
index 3108dc0d129e2..d1544fbaa6862 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sparql.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sparql.json
@@ -8,5 +8,6 @@
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "broken": true
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json
index 3c950cdb7ffd3..abec122560296 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json
@@ -8,5 +8,6 @@
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "broken": true
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json
index fae3c615dce4a..4cc1f13a6b370 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/vrischmann/tree-sitter-templ",
-  "rev": "def9849184de71a797c4e2b2837df85abeccf92c",
-  "date": "2025-02-06T21:56:41+01:00",
-  "path": "/nix/store/qjzb3snk7m49qhfhdd1z7lhjlhwgg4mk-tree-sitter-templ",
-  "sha256": "1035mfjikzy9c6w4wf59z91vyh0m36gdcw8xj4qa5i0k9ma8pq1d",
-  "hash": "sha256-LeCLVE0TxKIwkR1x1p4ZFUC/Q/qpOE64Ycn/GaWrZYA=",
+  "rev": "7f7f06b3931ca00e8ddfbeab3fc08ad00d297fad",
+  "date": "2025-03-01T22:48:40+01:00",
+  "path": "/nix/store/2xvdblh5hkm03rv65cg9xssdpbc0xwa1-tree-sitter-templ",
+  "sha256": "1z4yiyjjqwlda3r0661djzs2kzf7d477pxbd9arki3chhifwfv7s",
+  "hash": "sha256-+mzHXYSQjTizSm31ew5px/0p9JctGAPyUI1yLKWPnvw=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tera.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tera.json
index 74a2a35cbe52d..c1ae63997ec47 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tera.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tera.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/uncenter/tree-sitter-tera",
-  "rev": "284840b9809741c7fe474204c62f687b04da8104",
-  "date": "2025-02-07T10:08:29-05:00",
-  "path": "/nix/store/lzcz6qpp4cz3ki1ray05fgii7m48zf84-tree-sitter-tera",
-  "sha256": "1mrrl47gk8zzi6l9k65h53xpwharni1k6k2bm90is96sxiq883n3",
-  "hash": "sha256-ww6EcOzaJB1BqktMM0O0WUF++yiwmJmoif+j+Q6hOdc=",
+  "rev": "482b475b32e6bae67f9d57abc60545399fd9b0a3",
+  "date": "2025-03-12T22:54:13-04:00",
+  "path": "/nix/store/z8n8hd370gw4z98bvshwfx29rcif0iq4-tree-sitter-tera",
+  "sha256": "10jw1l3j6fkcfvah47qww2vd0j4d7rnlly9vav4499bbic2axmlx",
+  "hash": "sha256-ndauBItrpUTIVjt5Sm0+jUjQtuAcHwLVdmw6IwcNXII=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tiger.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tiger.json
index 70a6bdf840dc7..458aecc88e3ca 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tiger.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tiger.json
@@ -1,12 +1,13 @@
 {
   "url": "https://github.com/ambroisie/tree-sitter-tiger",
-  "rev": "a7f11d946b44244f71df41d2a78af0665d618dae",
-  "date": "2023-08-29T21:54:01+01:00",
-  "path": "/nix/store/ynxdy89llzc9kqqw0h2fmv81dna7wrxq-tree-sitter-tiger",
-  "sha256": "100cpj00w021hk0cgn5qbgqa6yn8ji58hl77qf3054h2jxzxnsnc",
-  "hash": "sha256-zGrbf5cCkgKGw+dQiEqUyHqj8Fu42MfAhEEADoC8DIA=",
+  "rev": "4a77b2d7a004587646bddc4e854779044b6db459",
+  "date": "2025-03-13T19:58:23Z",
+  "path": "/nix/store/ps5vkphx7wqlzzj8j02sqi7hcgmbwh1c-tree-sitter-tiger",
+  "sha256": "0d4rwxi6zc8psy2adw8lhmvvk0f1miv6w517aiqq11njfbg4kdwc",
+  "hash": "sha256-jLdJ3nLShoBxVCcUbnaswYG5d4UU8aaE1xexb2LnmTQ=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "broken": true
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tsq.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tsq.json
index cf6c2941a2411..2e0f3c6d0a63d 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tsq.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tsq.json
@@ -8,5 +8,6 @@
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "broken": true
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typst.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typst.json
index 1a10518cbfd3f..d1b05430810bf 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typst.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typst.json
@@ -8,5 +8,6 @@
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "broken": true
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json
index eec5937247b69..fa00c48e7a0ad 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json
@@ -8,5 +8,6 @@
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "broken": true
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vue.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vue.json
index 6d71408535802..886de204e1691 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vue.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vue.json
@@ -8,5 +8,6 @@
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "broken": true
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json
index 71879d700f855..109bc88d54bcb 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json
@@ -8,5 +8,6 @@
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "broken": true
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yaml.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yaml.json
index e7e4b42987d50..33105939fb716 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yaml.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yaml.json
@@ -8,5 +8,6 @@
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "broken": true
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix
index ac8b80ccaef7f..5453ab604fafb 100644
--- a/pkgs/development/tools/parsing/tree-sitter/update.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/update.nix
@@ -8,6 +8,7 @@
   coreutils,
   curl,
   xe,
+  tree-sitter,
 }:
 
 # Grammar list:
@@ -56,6 +57,8 @@ let
     "ruby-tree-sitter.old"
     # this is the (unmaintained) rust language bindings, tree-sitter-rust is the grammar
     "rust-tree-sitter"
+    # this is the kotlin language bindings, tree-sitter-kotlin is the grammar
+    "kotlin-tree-sitter"
     # this is the nodejs language bindings, tree-sitter-javascript is the grammar
     "node-tree-sitter"
     # this is the python language bindings, tree-sitter-python is the grammar
@@ -233,7 +236,7 @@ let
       repo = "tree-sitter-commonlisp";
     };
     "tree-sitter-cuda" = {
-      orga = "thehamsta";
+      orga = "tree-sitter-grammars";
       repo = "tree-sitter-cuda";
     };
     "tree-sitter-glsl" = {
@@ -519,6 +522,7 @@ let
           curl = "${curl}/bin/curl";
           nix-prefetch-git = "${nix-prefetch-git}/bin/nix-prefetch-git";
           printf = "${coreutils}/bin/printf";
+          tree-sitter = "${lib.getExe tree-sitter}";
         };
         inherit
           knownTreeSitterOrgGrammarRepos
diff --git a/pkgs/development/tools/parsing/tree-sitter/update_impl.py b/pkgs/development/tools/parsing/tree-sitter/update_impl.py
index a53e1ee62c366..15a50568f5161 100644
--- a/pkgs/development/tools/parsing/tree-sitter/update_impl.py
+++ b/pkgs/development/tools/parsing/tree-sitter/update_impl.py
@@ -3,6 +3,7 @@
 import subprocess as sub
 import os
 import sys
+import tempfile
 from typing import Iterator, Any, Literal, TypedDict, Optional
 from tempfile import NamedTemporaryFile
 
@@ -14,13 +15,31 @@
 mode: str = sys.argv[1]
 jsonArg: dict = json.loads(sys.argv[2])
 
-Args = Iterator[str]
+Args = Iterator[str] | [str]
 
 
 def log(msg: str) -> None:
     print(msg, file=sys.stderr)
 
 
+def check_grammar(data) -> bool:
+    path = data["path"]
+
+    with tempfile.TemporaryDirectory() as tmpdirname:
+        # Copy grammar to a temporary directory
+        run_cmd(["cp", "--no-preserve=mode,ownership", "-r", f"{path}/.", tmpdirname])
+
+        # Run the tree-sitter test command
+        test_result = sub.run(
+            [bins["tree-sitter"], "test"],
+            stdout=sub.PIPE,
+            cwd=tmpdirname
+        )
+
+        # Return True if the command succeeded, False otherwise
+        return test_result.returncode == 0
+
+
 def atomically_write(file_path: str, content: bytes) -> None:
     """atomically write the content into `file_path`"""
     with NamedTemporaryFile(
@@ -30,6 +49,8 @@ def atomically_write(file_path: str, content: bytes) -> None:
     ) as tmp:
         try:
             tmp.write(content)
+            # Add a final line to pass the editorconfig-checker
+            tmp.write("\n".encode())
             os.rename(
                 src=tmp.name,
                 dst=file_path
@@ -125,12 +146,20 @@ def fetchRepo() -> None:
                     version_rev=release
                 )
             )
+
+            # Load the data since we need the grammar path to execute the tests
+            data = json.loads(res)
+
+            if not check_grammar(data):
+                # Test the grammar with Tree-sitter and set the isBroken flag accordingly
+                data['broken'] = True
+
             atomically_write(
                 file_path=os.path.join(
                     outputDir,
                     f"{nixRepoAttrName}.json"
                 ),
-                content=res
+                content=json.dumps(data, indent=2).encode()
             )
         case _:
             sys.exit("input json must have `orga` and `repo` keys")