From a05ff553100caf217464d11de4c5f709c7f00d15 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Mar 2025 18:13:21 +0000 Subject: [PATCH 01/13] c-blosc2: 2.17.0 -> 2.17.1 --- pkgs/development/libraries/c-blosc/2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/c-blosc/2.nix b/pkgs/development/libraries/c-blosc/2.nix index fe719c131f73..507c862c27f1 100644 --- a/pkgs/development/libraries/c-blosc/2.nix +++ b/pkgs/development/libraries/c-blosc/2.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "c-blosc2"; - version = "2.17.0"; + version = "2.17.1"; src = fetchFromGitHub { owner = "Blosc"; repo = "c-blosc2"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-zrUfDsbgMzexwtB6oAP8keu6NPNAMtUex3g50rdGWa4="; + sha256 = "sha256-VxMErhuk160/0jF6pl6/YKAwaswnfBKnmOD5ZgcU2U4="; }; # https://github.com/NixOS/nixpkgs/issues/144170 From 3e2faf724a0cb2de395db02ce5660c912cced219 Mon Sep 17 00:00:00 2001 From: Ivy Fan-Chiang Date: Sat, 29 Mar 2025 21:45:13 -0400 Subject: [PATCH 02/13] python312Packages.yara-x: add module to top-level/python-packages.nix and switch to rustPlatform.fetchCargoVendor --- pkgs/development/python-modules/yara-x/default.nix | 8 ++++---- pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/yara-x/default.nix b/pkgs/development/python-modules/yara-x/default.nix index ce7b079d00f2..efbd33f13584 100644 --- a/pkgs/development/python-modules/yara-x/default.nix +++ b/pkgs/development/python-modules/yara-x/default.nix @@ -5,7 +5,7 @@ fetchFromGitHub, pythonOlder, pytestCheckHook, - yara-x, + pkgs, }: buildPythonPackage rec { pname = "yara-x"; @@ -23,9 +23,9 @@ buildPythonPackage rec { buildAndTestSubdir = "py"; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit pname src version; - hash = "sha256-8s8IUblGJGob/y8x8BoPcXJe83zRmqIZHMxs0iQD7R0="; + hash = "sha256-pD4qyw+TTpmcoX1N3C65VelYszYifm9sFOsEkXEysvo="; }; nativeBuildInputs = [ @@ -33,7 +33,7 @@ buildPythonPackage rec { rustPlatform.maturinBuildHook ]; - buildInputs = [ yara-x ]; + buildInputs = [ pkgs.yara-x ]; pythonImportsCheck = [ "yara_x" ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f9e04abda169..b94bfe16ee85 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18825,6 +18825,8 @@ self: super: with self; { yara-python = callPackage ../development/python-modules/yara-python { }; + yara-x = callPackage ../development/python-modules/yara-x { }; + yaramod = callPackage ../development/python-modules/yaramod { }; yarg = callPackage ../development/python-modules/yarg { }; From d50372811d7a9952a60d222ca050cadc751a5c15 Mon Sep 17 00:00:00 2001 From: emaryn Date: Mon, 31 Mar 2025 19:44:33 +0800 Subject: [PATCH 03/13] flutter: readd package_config.json --- pkgs/development/compilers/flutter/flutter.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix index 36052e7b163a..09ef3d980c29 100644 --- a/pkgs/development/compilers/flutter/flutter.nix +++ b/pkgs/development/compilers/flutter/flutter.nix @@ -103,6 +103,12 @@ let echo "$(git rev-parse HEAD)" > bin/cache/flutter_tools.stamp ln -s '${flutterTools}/share/flutter_tools.snapshot' bin/cache/flutter_tools.snapshot + # Some of flutter_tools's dependencies contain static assets. The + # application attempts to read its own package_config.json to find these + # assets at runtime. + mkdir -p packages/flutter_tools/.dart_tool + ln -s '${flutterTools.pubcache}/package_config.json' packages/flutter_tools/.dart_tool/package_config.json + echo -n "${version}" > version cat < bin/cache/flutter.version.json { From f7836c381c9e05d49646aa29e2959ea0b14bea60 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 31 Mar 2025 20:29:10 +0000 Subject: [PATCH 04/13] bender: 0.28.1 -> 0.28.2 --- pkgs/by-name/be/bender/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/be/bender/package.nix b/pkgs/by-name/be/bender/package.nix index 62465ffbe764..c1bd5569317b 100644 --- a/pkgs/by-name/be/bender/package.nix +++ b/pkgs/by-name/be/bender/package.nix @@ -10,17 +10,17 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "bender"; - version = "0.28.1"; + version = "0.28.2"; src = fetchFromGitHub { owner = "pulp-platform"; repo = "bender"; tag = "v${finalAttrs.version}"; - hash = "sha256-eC4BY3ri73vgEtcXoPQ5NDknjZcPrKOzLo2vXWj4Adg="; + hash = "sha256-OJWYhs5QmfUC1I5OkEJAeLTpklEQyQ6024wmhv1sSnA="; }; useFetchCargoVendor = true; - cargoHash = "sha256-fV4pWSRNlXCdnpeDgg3QW8s1Ixd1LEY8qP/Pb4t5xdc="; + cargoHash = "sha256-nZ2gchifWSmDlVJIsPcvrnUxzhyXYoA1kE9f2pZDJzs="; nativeCheckInputs = [ gitMinimal ]; postCheck = '' From bc96c6b8729fba3b2d86947ffe5c92f7f8c56683 Mon Sep 17 00:00:00 2001 From: Zev Isert Date: Mon, 31 Mar 2025 14:13:57 -0700 Subject: [PATCH 05/13] dive: 0.13.0 -> 0.13.1 --- pkgs/by-name/di/dive/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/di/dive/package.nix b/pkgs/by-name/di/dive/package.nix index cccb45755f5d..1feb042f3e59 100644 --- a/pkgs/by-name/di/dive/package.nix +++ b/pkgs/by-name/di/dive/package.nix @@ -10,16 +10,16 @@ }: buildGoModule rec { pname = "dive"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "wagoodman"; repo = "dive"; rev = "v${version}"; - hash = "sha256-kVFXidcvSlYi+aD+3yEPYy1Esm0bl02ioX1DmO0L1Hs="; + hash = "sha256-PXimdEgcPS1QQbhkaI2a55EIyWMIZTwRWj0Wx81nqcQ="; }; - vendorHash = "sha256-9lNtKpfGDVE3U0ZX0QcaCJrqCxoubvWqR26IvSKkImM="; + vendorHash = "sha256-egsFnnHZMPRTJeFw6uByE9OJH06zqKRTvQi9XhegbDI="; nativeBuildInputs = [ pkg-config ]; From 1cce98619216a94eff58f904cb70f118cddbd9ec Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Mon, 31 Mar 2025 21:55:20 +0000 Subject: [PATCH 06/13] mimir: 2.15.1 -> 2.16.0 https://github.com/grafana/mimir/releases/tag/mimir-2.16.0 --- pkgs/by-name/mi/mimir/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mi/mimir/package.nix b/pkgs/by-name/mi/mimir/package.nix index 1e972d183729..5892858a7230 100644 --- a/pkgs/by-name/mi/mimir/package.nix +++ b/pkgs/by-name/mi/mimir/package.nix @@ -7,13 +7,13 @@ }: buildGoModule rec { pname = "mimir"; - version = "2.15.1"; + version = "2.16.0"; src = fetchFromGitHub { rev = "${pname}-${version}"; owner = "grafana"; repo = pname; - hash = "sha256-dqWDp8vf4OkwSKSAoF92lFZhe5rT1lqQ2oMchUFrmdM="; + hash = "sha256-75KHS+jIPEvcB7SHBBcBi5uycwY7XR4RNc1khNYVZFE="; }; vendorHash = null; From 8e764a0f09562865ebd01951e0785a2ac5230b55 Mon Sep 17 00:00:00 2001 From: Cassie Cheung Date: Tue, 1 Apr 2025 07:47:55 +0800 Subject: [PATCH 07/13] anubis: 1.15.0 -> 1.15.1 Fix for a recurrence of CVE-2025-24369. See [1] for details. [1]: https://github.com/TecharoHQ/anubis/security/advisories/GHSA-428r-47m3-x9hx --- pkgs/by-name/an/anubis/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/an/anubis/package.nix b/pkgs/by-name/an/anubis/package.nix index b5282ed05206..f772dd03f7e4 100644 --- a/pkgs/by-name/an/anubis/package.nix +++ b/pkgs/by-name/an/anubis/package.nix @@ -7,13 +7,13 @@ }: buildGoModule (finalAttrs: { pname = "anubis"; - version = "1.15.0"; + version = "1.15.1"; src = fetchFromGitHub { owner = "TecharoHQ"; repo = "anubis"; tag = "v${finalAttrs.version}"; - hash = "sha256-n70H2FBvp7hxvRqU1+bvef9UrOzkSpg9QtFoqGyXiaM="; + hash = "sha256-PlZEGe3kTBkTd17nTLSW6pGiUKIPVQttep92FT+10g8="; }; vendorHash = "sha256-Rcra5cu7zxGm2LhL2x9Kd3j/uQaEb8OOh/j5Rhh8S1k="; From 4e8e483a4fc3d5422a69a43ebf9391bad2fd5caf Mon Sep 17 00:00:00 2001 From: Zexin Yuan Date: Sun, 30 Mar 2025 23:07:39 +0800 Subject: [PATCH 08/13] python3Packages.tree-sitter-c-sharp: init at 0.23.2 --- .../tree-sitter-c-sharp/default.nix | 59 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/development/python-modules/tree-sitter-c-sharp/default.nix diff --git a/pkgs/development/python-modules/tree-sitter-c-sharp/default.nix b/pkgs/development/python-modules/tree-sitter-c-sharp/default.nix new file mode 100644 index 000000000000..5b24e7d0f4be --- /dev/null +++ b/pkgs/development/python-modules/tree-sitter-c-sharp/default.nix @@ -0,0 +1,59 @@ +{ + lib, + fetchFromGitHub, + buildPythonPackage, + pythonOlder, + cargo, + rustPlatform, + rustc, + setuptools, + wheel, + tree-sitter, +}: + +let + version = "0.23.1"; + + src = fetchFromGitHub { + owner = "tree-sitter"; + repo = "tree-sitter-c-sharp"; + rev = "v${version}"; + hash = "sha256-weH0nyLpvVK/OpgvOjTuJdH2Hm4a1wVshHmhUdFq3XA="; + }; +in +buildPythonPackage { + pname = "tree-sitter-c-sharp"; + inherit version src; + pyproject = true; + disabled = pythonOlder "3.9"; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit src; + hash = "sha256-IogdMRj1eHRLtdNFdGNInpEQAAbRpM248GqkY+Mgu10="; + }; + + build-system = [ + cargo + rustPlatform.cargoSetupHook + rustc + setuptools + wheel + ]; + + optional-dependencies = { + core = [ + tree-sitter + ]; + }; + + pythonImportsCheck = [ + "tree_sitter_c_sharp" + ]; + + meta = { + description = "C# Grammar for tree-sitter"; + homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ yzx9 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 157e7314e4f7..f5c40f166652 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17380,6 +17380,8 @@ self: super: with self; { tree-sitter = callPackage ../development/python-modules/tree-sitter { }; + tree-sitter-c-sharp = callPackage ../development/python-modules/tree-sitter-c-sharp { }; + tree-sitter-html = callPackage ../development/python-modules/tree-sitter-html { }; tree-sitter-javascript = callPackage ../development/python-modules/tree-sitter-javascript { }; From a9ccf91ea286278ad0722c37d37103f3e2d54007 Mon Sep 17 00:00:00 2001 From: Zexin Yuan Date: Sun, 30 Mar 2025 23:09:16 +0800 Subject: [PATCH 09/13] python3Packages.tree-sitter-embedded-template: init at 0.23.2 --- .../tree-sitter-embedded-template/default.nix | 59 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 ++ 2 files changed, 63 insertions(+) create mode 100644 pkgs/development/python-modules/tree-sitter-embedded-template/default.nix diff --git a/pkgs/development/python-modules/tree-sitter-embedded-template/default.nix b/pkgs/development/python-modules/tree-sitter-embedded-template/default.nix new file mode 100644 index 000000000000..2843636c7a07 --- /dev/null +++ b/pkgs/development/python-modules/tree-sitter-embedded-template/default.nix @@ -0,0 +1,59 @@ +{ + lib, + fetchFromGitHub, + buildPythonPackage, + pythonOlder, + cargo, + rustPlatform, + rustc, + setuptools, + wheel, + tree-sitter, +}: + +let + version = "0.23.2"; + + src = fetchFromGitHub { + owner = "tree-sitter"; + repo = "tree-sitter-embedded-template"; + rev = "v${version}"; + hash = "sha256-C2Lo3tT2363O++ycXiR6x0y+jy2zlmhcKp7t1LhvCe8="; + }; +in +buildPythonPackage { + pname = "tree-sitter-embedded-template"; + inherit version src; + pyproject = true; + disabled = pythonOlder "3.9"; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit src; + hash = "sha256-DscTKXKukh3RsqtKjplyzrxY977zUgpFpeXtFOLJEXA="; + }; + + build-system = [ + cargo + rustPlatform.cargoSetupHook + rustc + setuptools + wheel + ]; + + optional-dependencies = { + core = [ + tree-sitter + ]; + }; + + pythonImportsCheck = [ + "tree_sitter_embedded_template" + ]; + + meta = { + description = "Tree-sitter grammar for embedded template languages like ERB, EJS"; + homepage = "https://github.com/tree-sitter/tree-sitter-embedded-template"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ yzx9 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f5c40f166652..6035e1baf74e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17382,6 +17382,10 @@ self: super: with self; { tree-sitter-c-sharp = callPackage ../development/python-modules/tree-sitter-c-sharp { }; + tree-sitter-embedded-template = + callPackage ../development/python-modules/tree-sitter-embedded-template + { }; + tree-sitter-html = callPackage ../development/python-modules/tree-sitter-html { }; tree-sitter-javascript = callPackage ../development/python-modules/tree-sitter-javascript { }; From de290fd512e2c6f0b6dba88b165348db673263c5 Mon Sep 17 00:00:00 2001 From: Zexin Yuan Date: Sun, 30 Mar 2025 23:09:34 +0800 Subject: [PATCH 10/13] python3Packages.tree-sitter-yaml: init at 0.7.0 --- .../tree-sitter-yaml/default.nix | 59 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/development/python-modules/tree-sitter-yaml/default.nix diff --git a/pkgs/development/python-modules/tree-sitter-yaml/default.nix b/pkgs/development/python-modules/tree-sitter-yaml/default.nix new file mode 100644 index 000000000000..054c0571aeb8 --- /dev/null +++ b/pkgs/development/python-modules/tree-sitter-yaml/default.nix @@ -0,0 +1,59 @@ +{ + lib, + fetchFromGitHub, + buildPythonPackage, + pythonOlder, + cargo, + rustPlatform, + rustc, + setuptools, + wheel, + tree-sitter, +}: + +let + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "tree-sitter-grammars"; + repo = "tree-sitter-yaml"; + rev = "v${version}"; + hash = "sha256-23/zcjnQUQt32N2EdQMzWM9srkXfQxlBvOo7FWH6rnw="; + }; +in +buildPythonPackage { + pname = "tree-sitter-yaml"; + inherit version src; + pyproject = true; + disabled = pythonOlder "3.9"; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit src; + hash = "sha256-Rxjimtp5Lg0x8wgWvyyCepMJipPdc0TplxznrF9COtM="; + }; + + build-system = [ + cargo + rustPlatform.cargoSetupHook + rustc + setuptools + wheel + ]; + + optional-dependencies = { + core = [ + tree-sitter + ]; + }; + + pythonImportsCheck = [ + "tree_sitter_yaml" + ]; + + meta = { + description = "YAML grammar for tree-sitter"; + homepage = "https://github.com/tree-sitter-grammars/tree-sitter-yaml"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ yzx9 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6035e1baf74e..b069ae15fc9c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17400,6 +17400,8 @@ self: super: with self; { tree-sitter-rust = callPackage ../development/python-modules/tree-sitter-rust { }; + 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 { }; From 669838a73e22fea65660f7bdfe90ca5fb8511509 Mon Sep 17 00:00:00 2001 From: Zexin Yuan Date: Sun, 30 Mar 2025 23:11:06 +0800 Subject: [PATCH 11/13] python3Packages.tree-sitter-language-pack: init at 0.23.2 Co-authored-by: Diogo Doreto --- .../tree-sitter-language-pack/default.nix | 54 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/development/python-modules/tree-sitter-language-pack/default.nix diff --git a/pkgs/development/python-modules/tree-sitter-language-pack/default.nix b/pkgs/development/python-modules/tree-sitter-language-pack/default.nix new file mode 100644 index 000000000000..a9fdc22471bf --- /dev/null +++ b/pkgs/development/python-modules/tree-sitter-language-pack/default.nix @@ -0,0 +1,54 @@ +{ + lib, + buildPythonPackage, + pythonOlder, + fetchPypi, + cython, + setuptools, + typing-extensions, + tree-sitter, + tree-sitter-c-sharp, + tree-sitter-embedded-template, + tree-sitter-yaml, +}: + +let + version = "0.6.1"; +in +buildPythonPackage { + pname = "tree-sitter-language-pack"; + inherit version; + pyproject = true; + disabled = pythonOlder "3.9"; + + src = fetchPypi { + pname = "tree_sitter_language_pack"; + inherit version; + hash = "sha256-pGNfW2ubZCVi2QHk6qJfyClJ1mDIi5R1Pm1GfZY0Ark="; + }; + + build-system = [ + cython + setuptools + typing-extensions + ]; + + dependencies = [ + tree-sitter + tree-sitter-c-sharp + tree-sitter-embedded-template + tree-sitter-yaml + ]; + + pythonImportsCheck = [ + "tree_sitter_language_pack" + "tree_sitter_language_pack.bindings" + ]; + + meta = { + description = "Comprehensive collection of tree-sitter languages"; + homepage = "https://github.com/Goldziher/tree-sitter-language-pack/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ yzx9 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b069ae15fc9c..47b4bc797262 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17394,6 +17394,8 @@ self: super: with self; { tree-sitter-languages = callPackage ../development/python-modules/tree-sitter-languages { }; + tree-sitter-language-pack = callPackage ../development/python-modules/tree-sitter-language-pack { }; + tree-sitter-make = callPackage ../development/python-modules/tree-sitter-make { }; tree-sitter-python = callPackage ../development/python-modules/tree-sitter-python { }; From 4596c6380193ca74afbc6eac823d4c5ef2d5c796 Mon Sep 17 00:00:00 2001 From: Zexin Yuan Date: Sun, 30 Mar 2025 23:11:57 +0800 Subject: [PATCH 12/13] python3Packages.grep-ast: 0.6.1 -> 0.8.1 --- pkgs/development/python-modules/grep-ast/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/grep-ast/default.nix b/pkgs/development/python-modules/grep-ast/default.nix index a65f82e2f784..7e71fb18a785 100644 --- a/pkgs/development/python-modules/grep-ast/default.nix +++ b/pkgs/development/python-modules/grep-ast/default.nix @@ -4,30 +4,30 @@ lib, pathspec, - pytestCheckHook, setuptools, - tree-sitter-languages, + tree-sitter-language-pack, }: buildPythonPackage rec { pname = "grep-ast"; - version = "0.6.1"; + version = "0.8.1"; pyproject = true; src = fetchPypi { inherit version; pname = "grep_ast"; - hash = "sha256-uQRYCpkUl6/UE1xRohfQAbJwhjI7x1KWc6HdQAPuJNA="; + hash = "sha256-j68oX0QEKvR9xqRfHh+AKYZgSFY9dYpxmwU5ytJkGH8="; }; build-system = [ setuptools ]; dependencies = [ pathspec - tree-sitter-languages + tree-sitter-language-pack ]; - nativeCheckInputs = [ pytestCheckHook ]; + # Tests disabled due to pending update from tree-sitter-languages to tree-sitter-language-pack + # nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "grep_ast" ]; From 506f6cf56afa4bc82b12c91e92c3c6ff614dbd4f Mon Sep 17 00:00:00 2001 From: Zexin Yuan Date: Mon, 31 Mar 2025 12:48:42 +0800 Subject: [PATCH 13/13] python3Packages.aider-chat: 0.75.2 -> 0.80.0 --- .../python-modules/aider-chat/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/aider-chat/default.nix b/pkgs/development/python-modules/aider-chat/default.nix index 08771cbb23e4..9995b8526247 100644 --- a/pkgs/development/python-modules/aider-chat/default.nix +++ b/pkgs/development/python-modules/aider-chat/default.nix @@ -18,11 +18,9 @@ let nltk-data.stopwords ]; }; - python3 = python312.override { - self = python3; - packageOverrides = _: super: { tree-sitter = super.tree-sitter_0_21; }; - }; - version = "0.75.2"; + + python3 = python312; + version = "0.80.0"; aider-chat = python3.pkgs.buildPythonPackage { pname = "aider-chat"; inherit version; @@ -32,7 +30,7 @@ let owner = "Aider-AI"; repo = "aider"; tag = "v${version}"; - hash = "sha256-+XpvAnxsv6TbsJwTAgNdJtZxxoPXQ9cxRVUaFZCnS8w="; + hash = "sha256-W3GO5+0rprQHmn1upL3pcXuv2e9Wir6TW0tUnvZj48E="; }; pythonRelaxDeps = true; @@ -117,8 +115,9 @@ let tokenizers tqdm tree-sitter - tree-sitter-languages + tree-sitter-language-pack typing-extensions + typing-inspection urllib3 watchfiles wcwidth