From 13778a233053fd0fddcd7034554515db0c0c9e07 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 30 Mar 2025 11:26:03 +0200
Subject: [PATCH] python312Packages.tree-sitter-language-pack: cleanup

---
 .../tree-sitter-language-pack/default.nix     | 22 ++++++++++++-------
 pkgs/top-level/python-packages.nix            |  4 ++--
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/tree-sitter-language-pack/default.nix b/pkgs/development/python-modules/tree-sitter-language-pack/default.nix
index a9fdc22471bf..c63bd83f8df0 100644
--- a/pkgs/development/python-modules/tree-sitter-language-pack/default.nix
+++ b/pkgs/development/python-modules/tree-sitter-language-pack/default.nix
@@ -1,26 +1,28 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchPypi,
+
+  # build-system
   cython,
   setuptools,
   typing-extensions,
+
+  # dependencies
   tree-sitter,
   tree-sitter-c-sharp,
   tree-sitter-embedded-template,
   tree-sitter-yaml,
 }:
 
-let
-  version = "0.6.1";
-in
-buildPythonPackage {
+buildPythonPackage rec {
   pname = "tree-sitter-language-pack";
-  inherit version;
+  version = "0.6.1";
   pyproject = true;
-  disabled = pythonOlder "3.9";
 
+  # Using the GitHub sources necessitates fetching the treesitter grammar parsers by using a vendored script:
+  # https://github.com/Goldziher/tree-sitter-language-pack/blob/main/scripts/clone_vendors.py
+  # The pypi archive has the benefit of already vendoring those dependencies which makes packaging easier on our side
   src = fetchPypi {
     pname = "tree_sitter_language_pack";
     inherit version;
@@ -45,9 +47,13 @@ buildPythonPackage {
     "tree_sitter_language_pack.bindings"
   ];
 
+  # No tests in the pypi archive
+  doCheck = false;
+
   meta = {
     description = "Comprehensive collection of tree-sitter languages";
-    homepage = "https://github.com/Goldziher/tree-sitter-language-pack/";
+    homepage = "https://github.com/Goldziher/tree-sitter-language-pack";
+    changelog = "https://github.com/Goldziher/tree-sitter-language-pack/releases/tag/v${version}";
     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 c30bcb888305..00b608f4b408 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17402,10 +17402,10 @@ self: super: with self; {
 
   tree-sitter-json = callPackage ../development/python-modules/tree-sitter-json { };
 
-  tree-sitter-languages = callPackage ../development/python-modules/tree-sitter-languages { };
-
   tree-sitter-language-pack = callPackage ../development/python-modules/tree-sitter-language-pack { };
 
+  tree-sitter-languages = callPackage ../development/python-modules/tree-sitter-languages { };
+
   tree-sitter-make = callPackage ../development/python-modules/tree-sitter-make { };
 
   tree-sitter-python = callPackage ../development/python-modules/tree-sitter-python { };