From 2215dbfa350fad76765c348d4710aab05de719c2 Mon Sep 17 00:00:00 2001
From: Benedikt Peetz <benedikt.peetz@b-peetz.de>
Date: Sun, 18 Jan 2026 18:50:19 +0100
Subject: modules/nvim: Update to the newest tree-sitter version

This includes quite a big collection of breaking changes, and as I can't
have the same plugin twice in the `buildEnv` scope, some plugins (e.g.
neorg and femacro) needed to be deactivated.
---
 pkgs/by-name/tr/tree-sitter-yts/package.nix | 42 +++--------------------------
 1 file changed, 3 insertions(+), 39 deletions(-)

(limited to 'pkgs/by-name')

diff --git a/pkgs/by-name/tr/tree-sitter-yts/package.nix b/pkgs/by-name/tr/tree-sitter-yts/package.nix
index 62ecf063..eef65714 100644
--- a/pkgs/by-name/tr/tree-sitter-yts/package.nix
+++ b/pkgs/by-name/tr/tree-sitter-yts/package.nix
@@ -14,46 +14,10 @@
   nodejs,
   tree-sitter,
 }:
-stdenv.mkDerivation {
-  pname = "yts-grammar";
-  version = "1.0.0";
+tree-sitter.buildGrammar {
+  language = "yts";
+  version = "0.0.1+rev=0bb9a60";
 
   inherit (yt) src;
   sourceRoot = "yt/tree-sitter-yts";
-
-  nativeBuildInputs = [nodejs tree-sitter];
-
-  CFLAGS = ["-Isrc" "-O2"];
-  CXXFLAGS = ["-Isrc" "-O2"];
-
-  stripDebugList = ["parser"];
-
-  configurePhase = ''
-    tree-sitter generate
-  '';
-
-  # 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 = ''
-    runHook preBuild
-    if [[ -e src/scanner.cc ]]; then
-      $CXX -fPIC -c src/scanner.cc -o scanner.o $CXXFLAGS
-    elif [[ -e src/scanner.c ]]; then
-      $CC -fPIC -c src/scanner.c -o scanner.o $CFLAGS
-    fi
-    $CC -fPIC -c src/parser.c -o parser.o $CFLAGS
-    rm -rf parser
-    $CXX -shared -o parser *.o
-    runHook postBuild
-  '';
-
-  installPhase = ''
-    runHook preInstall
-    mkdir $out
-    mv parser $out/
-    if [[ -d queries ]]; then
-      cp -r queries $out
-    fi
-    runHook postInstall
-  '';
 }
-- 
cgit 1.4.1