diff --git a/pkgs/development/python-modules/aider-chat/default.nix b/pkgs/development/python-modules/aider-chat/default.nix
index 08771cbb23e4..9995b8526247 100644
--- a/pkgs/development/python-modules/aider-chat/default.nix
+++ b/pkgs/development/python-modules/aider-chat/default.nix
@@ -18,11 +18,9 @@ let
       nltk-data.stopwords
     ];
   };
-  python3 = python312.override {
-    self = python3;
-    packageOverrides = _: super: { tree-sitter = super.tree-sitter_0_21; };
-  };
-  version = "0.75.2";
+
+  python3 = python312;
+  version = "0.80.0";
   aider-chat = python3.pkgs.buildPythonPackage {
     pname = "aider-chat";
     inherit version;
@@ -32,7 +30,7 @@ let
       owner = "Aider-AI";
       repo = "aider";
       tag = "v${version}";
-      hash = "sha256-+XpvAnxsv6TbsJwTAgNdJtZxxoPXQ9cxRVUaFZCnS8w=";
+      hash = "sha256-W3GO5+0rprQHmn1upL3pcXuv2e9Wir6TW0tUnvZj48E=";
     };
 
     pythonRelaxDeps = true;
@@ -117,8 +115,9 @@ let
       tokenizers
       tqdm
       tree-sitter
-      tree-sitter-languages
+      tree-sitter-language-pack
       typing-extensions
+      typing-inspection
       urllib3
       watchfiles
       wcwidth
diff --git a/pkgs/development/python-modules/grep-ast/default.nix b/pkgs/development/python-modules/grep-ast/default.nix
index a65f82e2f784..7e71fb18a785 100644
--- a/pkgs/development/python-modules/grep-ast/default.nix
+++ b/pkgs/development/python-modules/grep-ast/default.nix
@@ -4,30 +4,30 @@
   lib,
 
   pathspec,
-  pytestCheckHook,
   setuptools,
-  tree-sitter-languages,
+  tree-sitter-language-pack,
 }:
 
 buildPythonPackage rec {
   pname = "grep-ast";
-  version = "0.6.1";
+  version = "0.8.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit version;
     pname = "grep_ast";
-    hash = "sha256-uQRYCpkUl6/UE1xRohfQAbJwhjI7x1KWc6HdQAPuJNA=";
+    hash = "sha256-j68oX0QEKvR9xqRfHh+AKYZgSFY9dYpxmwU5ytJkGH8=";
   };
 
   build-system = [ setuptools ];
 
   dependencies = [
     pathspec
-    tree-sitter-languages
+    tree-sitter-language-pack
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  # Tests disabled due to pending update from tree-sitter-languages to tree-sitter-language-pack
+  # nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "grep_ast" ];
 
diff --git a/pkgs/development/python-modules/tree-sitter-c-sharp/default.nix b/pkgs/development/python-modules/tree-sitter-c-sharp/default.nix
new file mode 100644
index 000000000000..5b24e7d0f4be
--- /dev/null
+++ b/pkgs/development/python-modules/tree-sitter-c-sharp/default.nix
@@ -0,0 +1,59 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildPythonPackage,
+  pythonOlder,
+  cargo,
+  rustPlatform,
+  rustc,
+  setuptools,
+  wheel,
+  tree-sitter,
+}:
+
+let
+  version = "0.23.1";
+
+  src = fetchFromGitHub {
+    owner = "tree-sitter";
+    repo = "tree-sitter-c-sharp";
+    rev = "v${version}";
+    hash = "sha256-weH0nyLpvVK/OpgvOjTuJdH2Hm4a1wVshHmhUdFq3XA=";
+  };
+in
+buildPythonPackage {
+  pname = "tree-sitter-c-sharp";
+  inherit version src;
+  pyproject = true;
+  disabled = pythonOlder "3.9";
+
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit src;
+    hash = "sha256-IogdMRj1eHRLtdNFdGNInpEQAAbRpM248GqkY+Mgu10=";
+  };
+
+  build-system = [
+    cargo
+    rustPlatform.cargoSetupHook
+    rustc
+    setuptools
+    wheel
+  ];
+
+  optional-dependencies = {
+    core = [
+      tree-sitter
+    ];
+  };
+
+  pythonImportsCheck = [
+    "tree_sitter_c_sharp"
+  ];
+
+  meta = {
+    description = "C# Grammar for tree-sitter";
+    homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ yzx9 ];
+  };
+}
diff --git a/pkgs/development/python-modules/tree-sitter-embedded-template/default.nix b/pkgs/development/python-modules/tree-sitter-embedded-template/default.nix
new file mode 100644
index 000000000000..2843636c7a07
--- /dev/null
+++ b/pkgs/development/python-modules/tree-sitter-embedded-template/default.nix
@@ -0,0 +1,59 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildPythonPackage,
+  pythonOlder,
+  cargo,
+  rustPlatform,
+  rustc,
+  setuptools,
+  wheel,
+  tree-sitter,
+}:
+
+let
+  version = "0.23.2";
+
+  src = fetchFromGitHub {
+    owner = "tree-sitter";
+    repo = "tree-sitter-embedded-template";
+    rev = "v${version}";
+    hash = "sha256-C2Lo3tT2363O++ycXiR6x0y+jy2zlmhcKp7t1LhvCe8=";
+  };
+in
+buildPythonPackage {
+  pname = "tree-sitter-embedded-template";
+  inherit version src;
+  pyproject = true;
+  disabled = pythonOlder "3.9";
+
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit src;
+    hash = "sha256-DscTKXKukh3RsqtKjplyzrxY977zUgpFpeXtFOLJEXA=";
+  };
+
+  build-system = [
+    cargo
+    rustPlatform.cargoSetupHook
+    rustc
+    setuptools
+    wheel
+  ];
+
+  optional-dependencies = {
+    core = [
+      tree-sitter
+    ];
+  };
+
+  pythonImportsCheck = [
+    "tree_sitter_embedded_template"
+  ];
+
+  meta = {
+    description = "Tree-sitter grammar for embedded template languages like ERB, EJS";
+    homepage = "https://github.com/tree-sitter/tree-sitter-embedded-template";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ yzx9 ];
+  };
+}
diff --git a/pkgs/development/python-modules/tree-sitter-language-pack/default.nix b/pkgs/development/python-modules/tree-sitter-language-pack/default.nix
new file mode 100644
index 000000000000..a9fdc22471bf
--- /dev/null
+++ b/pkgs/development/python-modules/tree-sitter-language-pack/default.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+  buildPythonPackage,
+  pythonOlder,
+  fetchPypi,
+  cython,
+  setuptools,
+  typing-extensions,
+  tree-sitter,
+  tree-sitter-c-sharp,
+  tree-sitter-embedded-template,
+  tree-sitter-yaml,
+}:
+
+let
+  version = "0.6.1";
+in
+buildPythonPackage {
+  pname = "tree-sitter-language-pack";
+  inherit version;
+  pyproject = true;
+  disabled = pythonOlder "3.9";
+
+  src = fetchPypi {
+    pname = "tree_sitter_language_pack";
+    inherit version;
+    hash = "sha256-pGNfW2ubZCVi2QHk6qJfyClJ1mDIi5R1Pm1GfZY0Ark=";
+  };
+
+  build-system = [
+    cython
+    setuptools
+    typing-extensions
+  ];
+
+  dependencies = [
+    tree-sitter
+    tree-sitter-c-sharp
+    tree-sitter-embedded-template
+    tree-sitter-yaml
+  ];
+
+  pythonImportsCheck = [
+    "tree_sitter_language_pack"
+    "tree_sitter_language_pack.bindings"
+  ];
+
+  meta = {
+    description = "Comprehensive collection of tree-sitter languages";
+    homepage = "https://github.com/Goldziher/tree-sitter-language-pack/";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ yzx9 ];
+  };
+}
diff --git a/pkgs/development/python-modules/tree-sitter-yaml/default.nix b/pkgs/development/python-modules/tree-sitter-yaml/default.nix
new file mode 100644
index 000000000000..054c0571aeb8
--- /dev/null
+++ b/pkgs/development/python-modules/tree-sitter-yaml/default.nix
@@ -0,0 +1,59 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildPythonPackage,
+  pythonOlder,
+  cargo,
+  rustPlatform,
+  rustc,
+  setuptools,
+  wheel,
+  tree-sitter,
+}:
+
+let
+  version = "0.7.0";
+
+  src = fetchFromGitHub {
+    owner = "tree-sitter-grammars";
+    repo = "tree-sitter-yaml";
+    rev = "v${version}";
+    hash = "sha256-23/zcjnQUQt32N2EdQMzWM9srkXfQxlBvOo7FWH6rnw=";
+  };
+in
+buildPythonPackage {
+  pname = "tree-sitter-yaml";
+  inherit version src;
+  pyproject = true;
+  disabled = pythonOlder "3.9";
+
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit src;
+    hash = "sha256-Rxjimtp5Lg0x8wgWvyyCepMJipPdc0TplxznrF9COtM=";
+  };
+
+  build-system = [
+    cargo
+    rustPlatform.cargoSetupHook
+    rustc
+    setuptools
+    wheel
+  ];
+
+  optional-dependencies = {
+    core = [
+      tree-sitter
+    ];
+  };
+
+  pythonImportsCheck = [
+    "tree_sitter_yaml"
+  ];
+
+  meta = {
+    description = "YAML grammar for tree-sitter";
+    homepage = "https://github.com/tree-sitter-grammars/tree-sitter-yaml";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ yzx9 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 157e7314e4f7..47b4bc797262 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17380,6 +17380,12 @@ self: super: with self; {
 
   tree-sitter = callPackage ../development/python-modules/tree-sitter { };
 
+  tree-sitter-c-sharp = callPackage ../development/python-modules/tree-sitter-c-sharp { };
+
+  tree-sitter-embedded-template =
+    callPackage ../development/python-modules/tree-sitter-embedded-template
+      { };
+
   tree-sitter-html = callPackage ../development/python-modules/tree-sitter-html { };
 
   tree-sitter-javascript = callPackage ../development/python-modules/tree-sitter-javascript { };
@@ -17388,12 +17394,16 @@ self: super: with self; {
 
   tree-sitter-languages = callPackage ../development/python-modules/tree-sitter-languages { };
 
+  tree-sitter-language-pack = callPackage ../development/python-modules/tree-sitter-language-pack { };
+
   tree-sitter-make = callPackage ../development/python-modules/tree-sitter-make { };
 
   tree-sitter-python = callPackage ../development/python-modules/tree-sitter-python { };
 
   tree-sitter-rust = callPackage ../development/python-modules/tree-sitter-rust { };
 
+  tree-sitter-yaml = callPackage ../development/python-modules/tree-sitter-yaml { };
+
   tree-sitter_0_21 = callPackage ../development/python-modules/tree-sitter/0_21.nix { };
 
   treelib = callPackage ../development/python-modules/treelib { };