diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-10-20 22:09:03 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-10-20 22:09:03 +0000 |
| commit | 50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e (patch) | |
| tree | f2556b911180125ccbb7ed0e78a54e92da89adce /nixpkgs/pkgs/development/python-modules/textual | |
| parent | 4c16d4548a98563c9d9ad76f4e5b2202864ccd54 (diff) | |
| parent | cfc75eec4603c06503ae750f88cf397e00796ea8 (diff) | |
| download | nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.gz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.bz2 nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.lz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.xz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.zst nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.zip | |
Merge commit 'cfc75eec4603c06503ae750f88cf397e00796ea8'
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/textual')
| -rw-r--r-- | nixpkgs/pkgs/development/python-modules/textual/default.nix | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/textual/default.nix b/nixpkgs/pkgs/development/python-modules/textual/default.nix index e4be329b0a9b..6b7598a386be 100644 --- a/nixpkgs/pkgs/development/python-modules/textual/default.nix +++ b/nixpkgs/pkgs/development/python-modules/textual/default.nix @@ -1,15 +1,9 @@ { lib -, aiohttp , buildPythonPackage -, click , fetchFromGitHub , importlib-metadata , jinja2 -, linkify-it-py , markdown-it-py -, mdit-py-plugins -, mkdocs-exclude -, msgpack , poetry-core , pytest-aiohttp , pytestCheckHook @@ -17,13 +11,14 @@ , rich , syrupy , time-machine +, tree-sitter , typing-extensions }: buildPythonPackage rec { pname = "textual"; - version = "0.37.1"; - format = "pyproject"; + version = "0.40.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -31,7 +26,7 @@ buildPythonPackage rec { owner = "Textualize"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-4ehq36j2n2wRMgos5x4LQ0QeELpWAOgpgTxEWjqFLJs="; + hash = "sha256-+3bxc0ryHtbEJkB+EqjJhW+yWJWxMkxlSav4v6D3/gw="; }; nativeBuildInputs = [ @@ -39,18 +34,19 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - aiohttp - click importlib-metadata - linkify-it-py markdown-it-py - mdit-py-plugins - mkdocs-exclude - msgpack rich - ] ++ lib.optionals (pythonOlder "3.11") [ typing-extensions - ]; + ] ++ markdown-it-py.optional-dependencies.plugins + ++ markdown-it-py.optional-dependencies.linkify; + + passthru.optional-dependencies = { + syntax = [ + tree-sitter + # tree-sitter-languages + ]; + }; nativeCheckInputs = [ jinja2 @@ -58,7 +54,7 @@ buildPythonPackage rec { pytestCheckHook syrupy time-machine - ]; + ] ++ passthru.optional-dependencies.syntax; disabledTestPaths = [ # snapshot tests require syrupy<4 @@ -69,6 +65,9 @@ buildPythonPackage rec { # Assertion issues "test_textual_env_var" "test_softbreak_split_links_rendered_correctly" + + # requires tree-sitter-languages which is not packaged in nixpkgs + "test_register_language" ]; pythonImportsCheck = [ |