From 87a6cc0d5081ca5579ea73a5773bf74891224bc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 16 Jul 2025 09:17:29 +0200 Subject: [PATCH 1/3] Revert "python3Packages.tree-sitter: 0.24.0 -> 0.24.0-unstable-2025-06-02" This reverts commit 2e433f173c7bfe7ff02b01ad355c7eedb8621eda. --- .../python-modules/tree-sitter/default.nix | 30 +++++++------------ 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/tree-sitter/default.nix b/pkgs/development/python-modules/tree-sitter/default.nix index 19f839ffcb611..1ca0885a73ac5 100644 --- a/pkgs/development/python-modules/tree-sitter/default.nix +++ b/pkgs/development/python-modules/tree-sitter/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "tree-sitter"; - version = "0.24.0-unstable-2025-06-02"; + version = "0.24.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -23,8 +23,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tree-sitter"; repo = "py-tree-sitter"; - rev = "9c78f3b8d10f81b97fbb2181c9333323d6375480"; - hash = "sha256-jPqTraGrYFXBlci4Zaleyp/NTQhvuI39tYWRckjnV2E="; + tag = "v${version}"; + hash = "sha256-ZDt/8suteaAjGdk71l8eej7jDkkVpVDBIZS63SA8tsU="; fetchSubmodules = true; }; @@ -56,21 +56,11 @@ buildPythonPackage rec { "test_dot_graphs" ]; - meta = - let - # for an -unstable version, we grab the release notes for the last tagged - # version it is based upon - lastTag = lib.pipe version [ - lib.splitVersion - (lib.take 3) - (lib.concatStringsSep ".") - ]; - in - { - 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${lastTag}"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ fab ]; - }; + meta = { + 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/${src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; } From 1707ad61b78deb2fe4dd99c0858a17adfe0bd107 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 16 Jul 2025 09:17:58 +0200 Subject: [PATCH 2/3] Revert "python3Packages.tree-sitter-rust: 0.23.2 -> 0.24.0" This reverts commit 56cca54190e87044fa8d3e863b8bb217ecd53e7e. --- pkgs/development/python-modules/tree-sitter-rust/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tree-sitter-rust/default.nix b/pkgs/development/python-modules/tree-sitter-rust/default.nix index f720341200b18..8820bd0680b41 100644 --- a/pkgs/development/python-modules/tree-sitter-rust/default.nix +++ b/pkgs/development/python-modules/tree-sitter-rust/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "tree-sitter-rust"; - version = "0.24.0"; + version = "0.23.2"; pyproject = true; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-rust"; tag = "v${version}"; - hash = "sha256-y3sJURlSTM7LRRN5WGIAeslsdRZU522Tfcu6dnXH/XQ="; + hash = "sha256-aT+tlrEKMgWqTEq/NHh8Vj92h6i1aU6uPikDyaP2vfc="; }; build-system = [ From a83cb1d89ceb00365baef204d85582a1f627eb29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 16 Jul 2025 09:21:23 +0200 Subject: [PATCH 3/3] python3Packages.textual: unbreak --- pkgs/development/python-modules/textual/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix index 33410f6c2ce88..db79df989841f 100644 --- a/pkgs/development/python-modules/textual/default.nix +++ b/pkgs/development/python-modules/textual/default.nix @@ -95,7 +95,5 @@ buildPythonPackage rec { changelog = "https://github.com/Textualize/textual/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ gepbird ]; - # https://github.com/Textualize/textual/issues/5868 - broken = true; }; }