From 1a45115282d81cb40d0be03e9124dac8965fb183 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 20 Apr 2025 07:37:05 -0700 Subject: [PATCH 1/2] textlsp: unpin tree-sitter --- pkgs/by-name/te/textlsp/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/te/textlsp/package.nix b/pkgs/by-name/te/textlsp/package.nix index 24abaca86ef8..2b6ad6f59bf8 100644 --- a/pkgs/by-name/te/textlsp/package.nix +++ b/pkgs/by-name/te/textlsp/package.nix @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { pygls lsprotocol language-tool-python - tree-sitter_0_21 + tree-sitter gitpython appdirs openai From b371008f1fa42b635145984c4a79c096794a895a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 20 Apr 2025 07:38:11 -0700 Subject: [PATCH 2/2] python313Packages.tree-sitter_0_21: drop --- .../python-modules/tree-sitter/0_21.nix | 48 ------------------- pkgs/top-level/python-packages.nix | 2 - 2 files changed, 50 deletions(-) delete mode 100644 pkgs/development/python-modules/tree-sitter/0_21.nix diff --git a/pkgs/development/python-modules/tree-sitter/0_21.nix b/pkgs/development/python-modules/tree-sitter/0_21.nix deleted file mode 100644 index 1d3326ea967a..000000000000 --- a/pkgs/development/python-modules/tree-sitter/0_21.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - pytestCheckHook, - pythonOlder, - pythonAtLeast, - setuptools, - distutils, -}: - -buildPythonPackage rec { - pname = "tree-sitter"; - version = "0.21.3"; - pyproject = true; - - disabled = pythonOlder "3.7"; - - src = fetchFromGitHub { - owner = "tree-sitter"; - repo = "py-tree-sitter"; - rev = "refs/tags/v${version}"; - hash = "sha256-HT1sRzDFpeelWCq1ZMeRmoUg0a3SBR7bZKxBqn4fb2g="; - fetchSubmodules = true; - }; - - build-system = [ setuptools ]; - - nativeCheckInputs = [ pytestCheckHook ]; - - pythonImportsCheck = [ "tree_sitter" ]; - - # Needed explicitly for Python >= 3.12 as tree-sitter provides - # calls to distutils functions to compile language files - dependencies = lib.optionals (pythonAtLeast "3.12") [ distutils ]; - - preCheck = '' - rm -r tree_sitter - ''; - - meta = with lib; { - description = "Python bindings to the Tree-sitter parsing library"; - homepage = "https://github.com/tree-sitter/py-tree-sitter"; - changelog = "https://github.com/tree-sitter/py-tree-sitter/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6a6a77d1ea23..828c3e433a85 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17538,8 +17538,6 @@ self: super: with self; { 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 { }; treelog = callPackage ../development/python-modules/treelog { };