From 1753f2845ec93b1060447cb31f596dbee06aff3d Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 4 Aug 2024 16:50:48 +0900 Subject: [PATCH] python312Packages.lsp-tree-sitter: don't propagate versioned tree-sitter Python packages must not propagate such versioned packages due to PYTHONPATH conflicts. --- .../python-modules/lsp-tree-sitter/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/lsp-tree-sitter/default.nix b/pkgs/development/python-modules/lsp-tree-sitter/default.nix index 4fc92a031862..a0530544a938 100644 --- a/pkgs/development/python-modules/lsp-tree-sitter/default.nix +++ b/pkgs/development/python-modules/lsp-tree-sitter/default.nix @@ -8,7 +8,7 @@ jinja2, jsonschema, pygls, - tree-sitter0_21, + tree-sitter, pytestCheckHook, }: @@ -34,12 +34,7 @@ buildPythonPackage rec { jinja2 jsonschema pygls - # The build won't fail if we had used tree-sitter (version > 0.21), but - # this package is only a dependency of autotools-language-server which also - # depends on tree-sitter-languages which must use tree-sitter0_21 and not - # tree-sitter. Hence we avoid different tree-sitter versions dependency - # mismatch by defaulting here to this lower version. - tree-sitter0_21 + tree-sitter ]; nativeCheckInputs = [ pytestCheckHook ];