Merge master into staging-next

This commit is contained in:
nixpkgs-ci[bot]
2026-08-20 06:09:05 +00:00
committed by GitHub
20 changed files with 93 additions and 94 deletions

View File

@@ -6,17 +6,17 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "codex-relay";
version = "0.5.6";
version = "0.5.8";
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "MetaFARS";
repo = "codex-relay";
tag = "v${finalAttrs.version}";
hash = "sha256-JjrtQev2lujweV3dNiPC5ZV+LTPHX4BjWASfrI4/zy8=";
hash = "sha256-cdBzuurqJGT4EzgZbq4deXZKiJoOjCg+S1efnpk0/wU=";
};
cargoHash = "sha256-Ihdm2GhUhxlZw61w01Nakod4ZIAdHeBv2rCCrMQrC7I=";
cargoHash = "sha256-ak4yEKEf94NPvOlcoT97/X53sKu6+euwfWfbs52Tef0=";
doInstallCheck = true;

View File

@@ -8,17 +8,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "datafusion-cli";
version = "54.1.0";
version = "55.0.0";
src = fetchFromGitHub {
name = "datafusion-cli-source";
owner = "apache";
repo = "datafusion";
tag = finalAttrs.version;
hash = "sha256-zeR6eyU4Cc5gHiE331ap8wuyYEj7s7BgqB+oOKwMfZw=";
hash = "sha256-wP63vXcMuxoZzoQVGorSjjGUdRa8z8z9oB7Y8HApDYE=";
};
cargoHash = "sha256-XXR1Turs+QwONZHq38MZHbcjv5DYZH9iqeuBl20gy3U=";
cargoHash = "sha256-D6kmXzKb9VFGkxKahQdWZXFAAN4klpmTgKIsgrTnKmg=";
buildAndTestSubdir = "datafusion-cli";

View File

@@ -26,14 +26,10 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
"python-socketio"
];
pythonRemoveDeps = [
"python-owasp-zap-v2.4"
];
pythonRemoveDeps = [ "python-owasp-zap-v2.4" ];
build-system = with python3.pkgs; [ setuptools-scm ];
nativeBuildInputs = with python3.pkgs; [ python-owasp-zap-v2-4 ];
dependencies = with python3.pkgs; [
aiohttp
click
@@ -43,13 +39,13 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
psutil
pytenable
python-gvm
python-owasp-zap-v2-4
python-socketio
pyyaml
requests
requests-ratelimiter
syslog-rfc5424-formatter
websockets
zaproxy
];
nativeCheckInputs = with python3.pkgs; [

View File

@@ -47,7 +47,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "fastfetch-unwrapped";
version = "2.67.0";
version = "2.67.1";
strictDeps = true;
__structuredAttrs = true;
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "fastfetch-cli";
repo = "fastfetch";
tag = finalAttrs.version;
hash = "sha256-IwptETUR3mDVxF7IkBwRMHVqbh8Wl39uiVl6yxXiJmw=";
hash = "sha256-o4jjRkwrsfnnKiXxJZhTevw5x5zoXAn3XNprxEFWMmU=";
};
outputs = [

View File

@@ -1,42 +1,38 @@
# generated by zon2nix (https://github.com/nix-community/zon2nix)
{
linkFarm,
fetchzip,
fetchgit,
}:
{ linkFarm, fetchgit }:
linkFarm "zig-packages" [
{
name = "12204a4669fa6e8ebb1720e3581a24c1a7f538f2f4ee3ebc91a9e36285c89572d761";
name = "known_folders-0.0.0-Fy-PJk7KAAC41mQXzmFyGa0Q7tvmQjatENkREa6Gc4zu";
path = fetchgit {
url = "https://github.com/MFAshby/zig-lsp-kit.git";
rev = "1c07e3e3305f8dd6355735173321c344fc152d3e";
hash = "sha256-WBJ7hbc69W3mtzrMLwehcKccSbVe/8Dy9sX4IA4VbcY=";
url = "https://github.com/ziglibs/known-folders";
rev = "175f5596b3d2ee3c658282bb07885580895a0e73";
hash = "sha256-gTnTyqkAAT5AYXxbG80ybiiRk+pOkm7dvqThcNWGmpo=";
};
}
{
name = "1220841471bd4891cbb199d27cc5e7e0fb0a5b7c5388a70bd24fa3eb7285755c396c";
name = "lsp_kit-0.1.0-bi_PL_kyDACVTEhLaMq2-PJx0MocqRyjXDAN0ybMUyQQ";
path = fetchgit {
url = "https://github.com/kubkon/zig-yaml.git";
rev = "beddd5da24de91d430ca7028b00986f7745b13e9";
hash = "sha256-CJms2LjwoYNlbhapFYzvOImuaMH/zikllYeQ2/VlHi0=";
url = "https://github.com/zigtools/lsp-kit";
rev = "ec325a3c33d1da7708cf513355208f74d9560580";
hash = "sha256-60F2BOCrl3CreQFmpH3HAz6zzxd3VgJ3iSEkP39gtgQ=";
};
}
{
name = "12209cde192558f8b3dc098ac2330fc2a14fdd211c5433afd33085af75caa9183147";
name = "pennant-0.1.0-MwI8MKRGAABMDdwYvJNkdeWgU4iQ9JHqA9fTxk1zsFFq";
path = fetchgit {
url = "https://github.com/ziglibs/known-folders.git";
rev = "0ad514dcfb7525e32ae349b9acc0a53976f3a9fa";
hash = "sha256-X+XkFj56MkYxxN9LUisjnkfCxUfnbkzBWHy9pwg5M+g=";
url = "https://github.com/Arnau478/pennant";
rev = "8441e0ca7ad9e140293d6692c82e59bcabe82205";
hash = "sha256-zZqXO9tI44xkbq4yVU9OEadAVRFn0YtF/vuvUQXcEfE=";
};
}
{
name = "1220c198cdaf6cb73fca6603cc5039046ed10de2e9f884cae9224ff826731df1c68d";
name = "ziggy-0.1.0-kTg8v1ZWBgDLi7Y-AtdRRzqEvmYJiOq4I9r4mB2wLaKQ";
path = fetchgit {
url = "https://github.com/kristoff-it/ziggy";
rev = "ae30921d8c98970942d3711553aa66ff907482fe";
hash = "sha256-dZemnsmM0383HnA7zhykyO/DnG0mx+PVjjr9NiIfu4I=";
rev = "6760f0f4c4fc1ae01428bc6d87109e32124eeeb7";
hash = "sha256-uhC4Wg/yAZPdivQ49nwekKwLqwFYxikO/8j8+U2EK5Q=";
};
}
]

View File

@@ -3,30 +3,32 @@
fetchFromCodeberg,
lib,
stdenv,
zig_0_13,
zig_0_16,
}:
let
zig = zig_0_13;
zig = zig_0_16;
in
stdenv.mkDerivation (finalAttrs: {
pname = "hevi";
version = "1.1.0";
version = "1.1.0-unstable-2026-05-03";
src = fetchFromCodeberg {
owner = "arnauc";
repo = "hevi";
tag = "v${finalAttrs.version}";
hash = "sha256-wnpuM2qlbeDIupDPQPKdWmjAKepCG0+u3uxcLDFB09w=";
rev = "3c6f08ec73ac56673321f0449d4ae0a74b7674a9";
hash = "sha256-5i1Fe3/AYFu4HKQSXBWsdYDNl+FCp7QOZJ0eX1bw3f8=";
};
nativeBuildInputs = [
zig
];
postConfigure = ''
ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
'';
deps = callPackage ./deps.nix { };
zigBuildFlags = [
"--system"
"${finalAttrs.deps}"
];
meta = {
description = "Hex viewer";

View File

@@ -1,17 +1,17 @@
{
"version": "3.246.0",
"version": "3.249.0",
"assets": {
"x86_64-linux": {
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.246.0/mirrord_linux_x86_64",
"hash": "sha256-xcy5kvvoAjqS6m07GxkUWwAdohbNxFFdUxZJb2gko0A="
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.249.0/mirrord_linux_x86_64",
"hash": "sha256-x9uQnH7QhGLFyo5PEoNpqVZTrX2kepF4crnOZoa9tbQ="
},
"aarch64-linux": {
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.246.0/mirrord_linux_aarch64",
"hash": "sha256-SfAQ5M1ZdtdAv3GP8mK/tAiafm01SNBqmYFfl2FvI74="
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.249.0/mirrord_linux_aarch64",
"hash": "sha256-QUyIoBVeoQpKS8/T+qA5AAfNpoE8Igjnoojt9AzCM5U="
},
"aarch64-darwin": {
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.246.0/mirrord_mac_universal",
"hash": "sha256-/FY2liFumaTSAAHgkGsJFLccWQPttErwe+YSbfqTz54="
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.249.0/mirrord_mac_universal",
"hash": "sha256-a1n6HWzpvINn8Rtsh/6cDDX46NzhV0In2f1ouvToyPw="
}
}
}

View File

@@ -6,14 +6,14 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "protonup-rs";
version = "0.14.0";
version = "0.15.0";
src = fetchCrate {
inherit (finalAttrs) pname version;
hash = "sha256-FHT//OHxMm7FXm/L+tZ+diGwbQ1i4EABKuFKO9SPm1M=";
hash = "sha256-SqE3SKsiVnZUDa9ffazWi4RaIrIO9j7WanFM1HN6uW4=";
};
cargoHash = "sha256-NOLYmJx0SvZ6azk34Ha/3512VSx+UHsepQQIYrHdLwM=";
cargoHash = "sha256-l54zI1llVRjYjSKtgjAc2DXSnLS31CVhD3Q0TEKdNBA=";
checkFlags = [
# Requires internet access

View File

@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "rgrc";
version = "0.6.14";
version = "0.6.20";
src = fetchFromGitHub {
owner = "lazywalker";
repo = "rgrc";
tag = "v${finalAttrs.version}";
hash = "sha256-DEsxdqX9kAK/TqmP8PMOLQE4ij0+8mkoK/QapbXikss=";
hash = "sha256-tvmR9l9boM05OOGZUlAZ9hRBa1BlflDrKbzoP9nU3pk=";
};
cargoHash = "sha256-OLDMaHwrDO4Q4V0hVIbXmkTiBowpGoZc/xOISwS25Nc=";
cargoHash = "sha256-1TrcTFcyesFp1GaC2iSK5yEWGaV+BxENCLd2OL5tt9E=";
buildFeatures = [ "embed-configs" ];
nativeBuildInputs = [ installShellFiles ];

View File

@@ -8,11 +8,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "siege";
version = "4.1.7";
version = "4.2.0";
src = fetchurl {
url = "https://download.joedog.org/siege/siege-${finalAttrs.version}.tar.gz";
hash = "sha256-7BQM7dFZl5OD1g2+h6AVHCwSraeHkQlaj6hK5jW5MCY=";
hash = "sha256-eK9IL8ZV8c9ycP28MXFYHtTLMWMAn39PBW/Ct+LSRFM=";
};
env =

View File

@@ -2,23 +2,23 @@
lib,
stdenv,
fetchFromGitHub,
zig_0_13,
zig_0_16,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "zigimports";
version = "0.1.0";
version = "0.1.0-unstable-2026-07-25";
src = fetchFromGitHub {
owner = "tusharsadhwani";
repo = "zigimports";
tag = "v${finalAttrs.version}";
hash = "sha256-2cri+5mhhTQqlkv9db/3CQ3rCMq4yW4drMoRTZBhndE=";
rev = "bcfbb03a85553638f8a80e6596bdfaa93a0cc266";
hash = "sha256-ARM+pmk0elu+uYnrEdIixq6AS0eyUeqobOAPteER76w=";
};
nativeBuildInputs = [
zig_0_13
zig_0_16
];
# Remove the system suffix on the program name.
@@ -34,6 +34,6 @@ stdenv.mkDerivation (finalAttrs: {
license = lib.licenses.mit;
maintainers = [ lib.maintainers.jmbaur ];
mainProgram = "zigimports";
inherit (zig_0_13.meta) platforms;
inherit (zig_0_16.meta) platforms;
};
})

View File

@@ -91,6 +91,13 @@ buildPythonPackage rec {
"tests/unittest/test_websockets.py::on_message"
"tests/unittest/test_websockets.py::test_on_data_callback"
"tests/unittest/test_websockets.py::test_hello_twice_async"
# Fails on newer versions of http3
# remove once 0.16.0 is merged
"tests/unittest/test_async_session.py::test_verify"
"tests/unittest/test_curl.py::test_verify"
"tests/unittest/test_requests.py::test_verify"
"tests/unittest/test_requests.py::test_delete_cookies"
];
disabledTests = [

View File

@@ -6,6 +6,7 @@
httpx,
tqdm,
urllib3,
packaging,
vcrpy,
pytestCheckHook,
}:
@@ -30,6 +31,7 @@ buildPythonPackage rec {
httpx
tqdm
urllib3
packaging
];
nativeCheckInputs = [

View File

@@ -25,12 +25,12 @@
buildPythonPackage rec {
pname = "pyinstaller";
version = "6.18.0";
version = "6.22.2";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-zcUHVCeDURytSFb85YL9w36fKWZcpZaInGY8g+yMbsk=";
hash = "sha256-ibZaOtB9ndWDIlPje8RfMYctENf51cn9D91giKg4Kd0=";
};
build-system = [ hatchling ];

View File

@@ -37,6 +37,12 @@ buildPythonPackage (finalAttrs: {
hash = "sha256-KRZbrJgIxdNAnlmP7Ww/JasoDJqJZkBkd0qXm9gfXp4=";
};
postPatch = ''
# pytest 9 rejects marks on fixtures, where they never had any effect
substituteInPlace tests/sc/conftest.py \
--replace-fail "@pytest.mark.filterwarnings('ignore::DeprecationWarning')" ""
'';
build-system = [ setuptools ];
dependencies = [
@@ -65,32 +71,16 @@ buildPythonPackage (finalAttrs: {
responses
];
pytestFlags = [
"-Wignore::pytest.PytestRemovedIn9Warning"
];
disabledTestPaths = [
# Disable tests that requires network access
"tests/io/"
];
disabledTests = [
# Disable tests that requires a Docker container
"test_uploads_docker_push_name_typeerror"
"test_uploads_docker_push_tag_typeerror"
"test_uploads_docker_push_cs_name_typeerror"
"test_uploads_docker_push_cs_tag_typeerror"
# Test requires network access
"test_assets_list_vcr"
"test_events_list_vcr"
"test_session_ssl_error"
# https://github.com/tenable/pyTenable/issues/953
"test_construct_query_str"
"test_construct_query_stored_file"
"test_iterator_empty_page"
"test_iterator_max_page_term"
"test_iterator_pagination"
"test_iterator_total_term"
];
pythonImportsCheck = [ "tenable" ];

View File

@@ -34,10 +34,11 @@ buildPythonPackage rec {
pythonImportsCheck = [ "qasync" ];
# crashes the interpreter
disabledTestPaths = [
"tests/test_qeventloop.py"
"tests/test_run.py"
env.QT_QPA_PLATFORM = "offscreen";
disabledTests = [
"test_no_stale_reference_as_argument"
"test_no_stale_reference_as_result"
];
meta = {

View File

@@ -2,7 +2,6 @@
lib,
buildPythonPackage,
fetchFromGitHub,
importlib-resources,
pytestCheckHook,
setuptools,
typing-extensions,
@@ -10,20 +9,19 @@
buildPythonPackage rec {
pname = "typeshed-client";
version = "2.11.0";
version = "2.13.0";
pyproject = true;
src = fetchFromGitHub {
owner = "JelleZijlstra";
repo = "typeshed_client";
tag = "v${version}";
hash = "sha256-hSyhGn+xEUjZVrYUYaxZ/3CwNXy4EJ2TG73S9o3o0gw=";
hash = "sha256-n7iWe4zh2TqJD0Sv5L5BSHqxOcAmsZ8VLNfSOiPte4A=";
};
build-system = [ setuptools ];
dependencies = [
importlib-resources
typing-extensions
];

View File

@@ -2,19 +2,22 @@
lib,
buildPythonPackage,
fetchFromGitHub,
nix-update-script,
poetry-core,
pyhamcrest,
pytestCheckHook,
requests,
requests-mock,
requests,
six,
}:
buildPythonPackage (finalAttrs: {
pname = "python-owasp-zap-v2-4";
pname = "zaproxy";
version = "0.6.0";
pyproject = true;
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "zaproxy";
repo = "zap-api-python";
@@ -37,9 +40,12 @@ buildPythonPackage (finalAttrs: {
pythonImportsCheck = [ "zapv2" ];
passthru.updateScript = nix-update-script { };
meta = {
description = "Python library to access the OWASP ZAP API";
description = "ZAP Python API";
homepage = "https://github.com/zaproxy/zap-api-python";
changelog = "https://github.com/zaproxy/zap-api-python/blob/${finalAttrs.src.rev}/CHANGELOG.md";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ fab ];
};

View File

@@ -587,6 +587,7 @@ mapAliases {
python-mbedtls = throw "'python-mbedtls' has been removed as it is unmaintained";
python-openzwave = throw "python-openzwave was removed because openzwave is no longer maintained upstream. Consider using python3Packages.zwave-js-server-python"; # Added 2026-05-14
python-otcextensions = otcextensions; # Added 2026-07-31
python-owasp-zap-v2-4 = zaproxy; # Added 2026-08-20
python-qt = throw "python-qt has been removed, because hard to maintain and not required by anything"; # Added 2025-01-14
python-simple-hipchat = throw "'python-simple-hipchat' has been removed because it was broken and unmaintained"; # added 2025-08-26
python-subunit = throw "'python-subunit' has been renamed to/replaced by 'subunit'"; # Converted to throw 2025-10-29

View File

@@ -17039,8 +17039,6 @@ self: super: with self; {
python-overseerr = callPackage ../development/python-modules/python-overseerr { };
python-owasp-zap-v2-4 = callPackage ../development/python-modules/python-owasp-zap-v2-4 { };
python-oxmsg = callPackage ../development/python-modules/python-oxmsg { };
python-packer = callPackage ../development/python-modules/python-packer { };
@@ -22922,6 +22920,8 @@ self: super: with self; {
zapf = callPackage ../development/python-modules/zapf { };
zaproxy = callPackage ../development/python-modules/zaproxy { };
zarr = callPackage ../development/python-modules/zarr { };
zbar = callPackage ../development/python-modules/zbar { };