Unverified Commit b9f2737b authored by OTABI Tomoya's avatar OTABI Tomoya Committed by GitHub
Browse files

Merge pull request #332747 from natsukium/dont-propagate-versioned-tree-sitter 

python312Packages.tree-sitter_0_21: remove from propagated dependencies
parents 58df6c28 1e61017d

pkgs/by-name/au/autotools-language-server/package.nix

+4 −1
Original line number Diff line number Diff line
@@ -5,7 +5,10 @@ 
}:



let

  python3 = python311;

  python3 = python311.override {

    self = python3;

    packageOverrides = _: super: { tree-sitter = super.tree-sitter_0_21; };

  };

in

python3.pkgs.buildPythonApplication rec {

  pname = "autotools-language-server";

pkgs/development/python-modules/lsp-tree-sitter/default.nix

+14 −20
Original line number Diff line number Diff line 
{ lib

, buildPythonPackage

, fetchFromGitHub

, setuptools-generate

, setuptools-scm

, colorama

, jinja2

, jsonschema

, pygls

, tree-sitter0_21

, pytestCheckHook

{

  lib,

  buildPythonPackage,

  fetchFromGitHub,

  setuptools-generate,

  setuptools-scm,

  colorama,

  jinja2,

  jsonschema,

  pygls,

  tree-sitter,

  pytestCheckHook,

}:



buildPythonPackage rec {
@@ -33,16 +34,9 @@ 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

  ];

  nativeCheckInputs = [

    pytestCheckHook

    tree-sitter

  ];

  nativeCheckInputs = [ pytestCheckHook ];



  pythonImportsCheck = [ "lsp_tree_sitter" ];

pkgs/development/python-modules/textual/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -51,7 +51,8 @@ buildPythonPackage rec { 
    pytestCheckHook

    syrupy

    time-machine

  ] ++ lib.flatten (builtins.attrValues optional-dependencies);

    tree-sitter

  ];



  disabledTestPaths = [

    # Snapshot tests require syrupy<4

pkgs/development/python-modules/tree-sitter-languages/default.nix

+13 −17
Original line number Diff line number Diff line 
{ lib

, buildPythonPackage

, fetchFromGitHub

, setuptools

, wheel

, cython

, tree-sitter0_21

, pytestCheckHook

, python

{

  lib,

  buildPythonPackage,

  fetchFromGitHub,

  setuptools,

  cython,

  tree-sitter,

  pytestCheckHook,

  python,

}:



buildPythonPackage rec {
@@ -34,20 +34,14 @@ buildPythonPackage rec { 


  build-system = [

    setuptools

    wheel

    cython

  ];

  dependencies = [

    # https://github.com/grantjenks/py-tree-sitter-languages/issues/67

    tree-sitter0_21

  ];

  dependencies = [ tree-sitter ];

  # Generate languages.so file (build won't fail without this, but tests will).

  preBuild = ''

    ${python.pythonOnBuildForHost.interpreter} build.py

  '';

  nativeCheckInputs = [

    pytestCheckHook

  ];

  nativeCheckInputs = [ pytestCheckHook ];

  # Without cd $out, tests fail to import the compiled cython extensions.

  # Without copying the ./tests/ directory to $out, pytest won't detect the

  # tests and run them. See also:
@@ -64,5 +58,7 @@ buildPythonPackage rec { 
    homepage = "https://github.com/grantjenks/py-tree-sitter-languages";

    license = licenses.asl20;

    maintainers = with maintainers; [ doronbehar ];

    # https://github.com/grantjenks/py-tree-sitter-languages/issues/67

    broken = versionAtLeast tree-sitter.version "0.22";

  };

}

pkgs/development/python-modules/tree-sitter0_21/default.nix→pkgs/development/python-modules/tree-sitter/0_21.nix

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
}:



buildPythonPackage rec {

  pname = "tree-sitter0_21";

  pname = "tree-sitter";

  version = "0.21.3";

  pyproject = true;