gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-04-01 06:05:36 +00:00
committed by GitHub
parent 39c5e1908e 7f092ef837
commit 917614d087
14 changed files with 277 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/an/anubis/package.nix
+2 -2
View File
@@ -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=";
pkgs/by-name/be/bender/package.nix
+3 -3
View File
@@ -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 = ''
pkgs/by-name/di/dive/package.nix
+3 -3
View File
@@ -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 ];
pkgs/by-name/mi/mimir/package.nix
+2 -2
View File
@@ -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;
pkgs/development/compilers/flutter/flutter.nix
+6
View File
@@ -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 <<EOF > bin/cache/flutter.version.json
{
pkgs/development/libraries/c-blosc/2.nix
+2 -2
View File
@@ -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
pkgs/development/python-modules/aider-chat/default.nix
+6 -7
View File
@@ -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
pkgs/development/python-modules/grep-ast/default.nix
+6 -6
View File
@@ -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" ];
pkgs/development/python-modules/tree-sitter-c-sharp/default.nix
+59
View File
@@ -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 ];
};
}
pkgs/development/python-modules/tree-sitter-embedded-template/default.nix
+59
View File
@@ -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 ];
};
}
pkgs/development/python-modules/tree-sitter-language-pack/default.nix
+54
View File
@@ -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 ];
};
}
pkgs/development/python-modules/tree-sitter-yaml/default.nix
+59
View File
@@ -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 ];
};
}
pkgs/development/python-modules/yara-x/default.nix
+4 -4
View File
@@ -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" ];
pkgs/top-level/python-packages.nix
+12
View File
@@ -17380,6 +17380,12 @@ 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-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 { };
@@ -17388,12 +17394,16 @@ 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 { };
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 { };
@@ -18986,6 +18996,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 { };