Merge master into staging-next

This commit is contained in:
nixpkgs-ci[bot]
2026-04-02 06:27:48 +00:00
committed by GitHub
23 changed files with 189 additions and 316 deletions
@@ -11,18 +11,18 @@
vimUtils,
}:
let
version = "0.4.3-nightly.0a18692-unstable-2026-03-24";
version = "0.5.1-nightly.538c593-unstable-2026-04-01";
src = fetchFromGitHub {
owner = "dmtrKovalenko";
repo = "fff.nvim";
rev = "eb577ea4f39f7b9296ff8c6b4bf2b2899d017ded";
hash = "sha256-m/KykUyhE3xUVmmE84xUaqW0T4fbuRp6iAVBbCioiCI=";
rev = "538c593b7ba173b08beec15e6bce66fccb8f6ab0";
hash = "sha256-e+x1ELa2m60j2cQ9g99XSrAMMvmF3WtlMF5HWYrrJps=";
};
fff-nvim-lib = rustPlatform.buildRustPackage {
pname = "fff-nvim-lib";
inherit version src;
cargoHash = "sha256-hMwPyPc4V0pTxpn1U3ay31KttFeoU54h6Z4HGv8nFYQ=";
cargoHash = "sha256-K6xAzx6YqzrDUalZ1rE4eOBRc1xvXVhac14krskl87M=";
nativeBuildInputs = [
pkg-config
@@ -1499,12 +1499,12 @@
"vendorHash": "sha256-Z4DfoG4ApXbPNXZs9YvBWQj1bH7moLNI6P+nKDHt/Jc="
},
"yandex-cloud_yandex": {
"hash": "sha256-ajA9ktS9TIwB/HexEHZCNkkBKtH6BDxjwq4BxLQB82M=",
"hash": "sha256-F2nbu/MImDXHSYPjo3O6K0tsZJ4PTrmB14Ghfvnp5sc=",
"homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex",
"owner": "yandex-cloud",
"repo": "terraform-provider-yandex",
"rev": "v0.193.0",
"rev": "v0.195.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-wD6KGxlNxZZm0lNtzFjfLhitkpxaEgTdcTS4YlOqMqA="
"vendorHash": "sha256-lSpDmhzCed9NUJkQ35tsrUbMIzx6wnEJ20UFMPbwhWE="
}
}
+2 -2
View File
@@ -17,10 +17,10 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "archipelago";
version = "0.6.6";
version = "0.6.7";
src = fetchurl {
url = "https://github.com/ArchipelagoMW/Archipelago/releases/download/${finalAttrs.version}/Archipelago_${finalAttrs.version}_linux-x86_64.AppImage";
hash = "sha256-mJ0bPBBou3BRqEW5QierjD0ohDBQ9J0jnoV4TCf9XOM=";
hash = "sha256-a5UazzqGu7q4Zg1AYHnbQjCTQNdcNaL/gZUjYV3Rk5Q=";
};
dontUnpack = true;
+6 -9
View File
@@ -2,26 +2,23 @@
lib,
stdenvNoCC,
fetchzip,
installFonts,
gitUpdater,
}:
stdenvNoCC.mkDerivation rec {
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "beedii";
version = "1.0.0";
src = fetchzip {
url = "https://github.com/webkul/beedii/releases/download/v${version}/beedii.zip";
url = "https://github.com/webkul/beedii/releases/download/v${finalAttrs.version}/beedii.zip";
hash = "sha256-MefkmWl7LdhQiePpixKcatoIeOTlrRaO3QA9xWAxJ4Q=";
stripRoot = false;
};
installPhase = ''
runHook preInstall
sourceRoot = "${finalAttrs.src.name}/Fonts";
install -Dm444 Fonts/*.ttf -t $out/share/fonts/truetype/${pname}
runHook postInstall
'';
nativeBuildInputs = [ installFonts ];
passthru.updateScript = gitUpdater {
url = "https://github.com/webkul/beedii";
@@ -41,4 +38,4 @@ stdenvNoCC.mkDerivation rec {
kachick
];
};
}
})
+3 -6
View File
@@ -2,6 +2,7 @@
lib,
stdenvNoCC,
fetchzip,
installFonts,
nix-update-script,
}:
@@ -17,13 +18,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
hash = "sha256-7PlIrQX1fnFHXm7mjfoOCVp3GSnLT2GlVZdSoZbh/s4=";
};
installPhase = ''
runHook preInstall
sourceRoot = "${finalAttrs.src.name}/fonts";
install -Dm444 fonts/ttf/*.ttf -t "$out/share/fonts/truetype/"
runHook postInstall
'';
nativeBuildInputs = [ installFonts ];
passthru = {
updateScript = nix-update-script { };
+2 -8
View File
@@ -2,6 +2,7 @@
lib,
stdenvNoCC,
fetchFromGitHub,
installFonts,
}:
stdenvNoCC.mkDerivation {
pname = "bodoni-moda";
@@ -14,14 +15,7 @@ stdenvNoCC.mkDerivation {
hash = "sha256-OQi+KKBM+BrmA2pDit6dib5krrQBba5dVCBd2/G5sIM=";
};
installPhase = ''
runHook preInstall
mkdir -p $out/share/fonts/truetype
cp fonts/*/*.ttf $out/share/fonts/truetype
runHook postInstall
'';
nativeBuildInputs = [ installFonts ];
meta = {
homepage = "https://indestructibletype.com/Bodoni.html";
+3 -3
View File
@@ -12,16 +12,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cargo-generate";
version = "0.23.7";
version = "0.23.8";
src = fetchFromGitHub {
owner = "cargo-generate";
repo = "cargo-generate";
tag = "v${finalAttrs.version}";
hash = "sha256-1GMgVdRhgZPYCOxn6Y7q+1xgIJL7XSbY/F2tW1N9ckw=";
hash = "sha256-Me3hgG6Z+JSsCjLVxbFDY3/6dUi4KtV6ArugFPgnda0=";
};
cargoHash = "sha256-zO8h567ptsIQmexmdfqC6++xjxxOTjVvJFDB3Hxgt78=";
cargoHash = "sha256-QhXHPnlU77ikaeTQLxBFYIc4j+tEZb0un3kVJanq7ZI=";
nativeBuildInputs = [ pkg-config ];
+3 -3
View File
@@ -16,14 +16,14 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cargo-update";
version = "18.2.0";
version = "19.0.1";
src = fetchCrate {
inherit (finalAttrs) pname version;
hash = "sha256-znDi45NpUVuIalgTh+jEOf4lFfI8MCLvSWgsdyv4gTk=";
hash = "sha256-XK5ky0t8IdQRVsDU6VDB+HzWzgn4uXhlvOS66GPCVn8=";
};
cargoHash = "sha256-bdKmWqCJaJq1iq8pu7BIxrKCT9SdReTMcJIcmAuaqLA=";
cargoHash = "sha256-/teRXWO3alCU4i4WsQaojCNAXVm/DnpxbYysCEb/Ohg=";
nativeBuildInputs = [
cmake
@@ -1,7 +1,7 @@
{
lib,
copyDesktopItems,
electron_40,
electron_41,
fetchFromGitHub,
deltachat-rpc-server,
makeDesktopItem,
@@ -21,37 +21,37 @@
let
deltachat-rpc-server' = deltachat-rpc-server.overrideAttrs rec {
version = "2.43.0";
version = "2.48.0";
src = fetchFromGitHub {
owner = "chatmail";
repo = "core";
tag = "v${version}";
hash = "sha256-3hpsc/IMBTVHH6Lun9R8Dx3s53sJOb9J1fU1O56MpIc=";
hash = "sha256-9qrxzAoBdCzDaMWZnCPxKy9bISd19aI4U1kRcK85Mzg=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
pname = "chatmail-core";
inherit version src;
hash = "sha256-kDYWu8QrVv1fAyNsPN5xY7QqExbdiM7C+Af0l9HVRDQ=";
hash = "sha256-UcQoY2NvnvWmGjHn1xwi0deyPZjtnbfQJJo32K7TX38=";
};
};
electron = electron_40;
electron = electron_41;
in
stdenv.mkDerivation (finalAttrs: {
pname = "deltachat-desktop";
version = "2.43.0";
version = "2.48.0";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-desktop";
tag = "v${finalAttrs.version}";
hash = "sha256-OIRfh0/E0fg0LepWRREmpcLbUKRSdJA+RWO3vkOu6so=";
hash = "sha256-7LCaZOI9fBzVMyT0RqgGykDvN0eSTz2h6fRXK2kyRDk=";
};
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs) pname version src;
pnpm = pnpm_9;
fetcherVersion = 2;
hash = "sha256-auvoo1YhHptbhTfeRbOQjc8vADCJhByb9efQFyskZPM=";
hash = "sha256-1R8vCGQlT3pvybrcPc2SKbmezprgvrIt0J+BsZHPJ7c=";
};
nativeBuildInputs = [
+26 -4
View File
@@ -18,18 +18,18 @@
nix-update-script,
}:
let
version = "1.0.68";
version = "1.0.69";
src = fetchFromGitHub {
name = "exo";
owner = "exo-explore";
repo = "exo";
tag = "v${version}";
hash = "sha256-ryaz68vXS/SjPxGsWxtUSlzZrLBxV1tbBmJVraZu3RI=";
hash = "sha256-xHEvjztTSDMwfxdNt16Yo/hX1Fhpwz/zF7mnQsIOteY=";
};
python = python3.override {
packageOverrides = _final: prev: {
# https://github.com/exo-explore/exo/blob/ba611f9cd0e21d3e63e2327b18fbc888fd085269/pyproject.toml#L67
# https://github.com/exo-explore/exo/blob/v1.0.69/pyproject.toml#L63
mlx = prev.mlx.overridePythonAttrs (old: {
version = "custom";
@@ -39,6 +39,27 @@ let
rev = "address-rdma-gpu-locks";
hash = "sha256-GosFIWxIB48Egb1MqJrR3xhsUsQeWdRk5rV93USY6wQ=";
};
# mlx.meta.changelog fails to evaluate as it depends on mlx.src.tag which is not defined in
# this override
meta = old.meta // {
changelog = "";
};
});
# https://github.com/exo-explore/exo/blob/v1.0.69/pyproject.toml#L64
mlx-lm = prev.mlx-lm.overridePythonAttrs (old: {
version = "custom";
src = fetchFromGitHub {
owner = "rltakashige";
repo = "mlx-lm";
rev = "leo/fix-deepseek-v32-indexer";
hash = "sha256-sRMykX0hd15VF8tdO5MCjuVxkQvpjeluaS8U+wQvP4Q=";
};
# mlx-lm.meta.changelog fails to evaluate as it depends on mlx-lm.src.tag which is not
# defined in this override
meta = old.meta // {
changelog = "";
};
@@ -56,7 +77,7 @@ let
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) pname src version;
hash = "sha256-Ga3/Yhg2Wn2w8cnNtq11/AN7K4nht4chSEIVOkYEI/U=";
hash = "sha256-gwOdA2sHz8n4GfNjK+OYmttXUTle4WYmAE2Y0KXYrwg=";
};
# Bypass rust nightly features not being available on rust stable
@@ -200,6 +221,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
# Require internet access:
# openai_harmony.HarmonyError: error downloading or loading vocab file: failed to download or load vocab file
"TestParseGptOssMaxTokensTruncation"
"test_both_formats_produce_identical_tool_calls"
"test_format_a_yields_tool_call"
"test_format_b_yields_tool_call"
@@ -2,23 +2,31 @@
lib,
stdenvNoCC,
fetchzip,
installFonts,
}:
stdenvNoCC.mkDerivation rec {
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "fantasque-sans-mono";
version = "1.8.0";
outputs = [
"out"
"webfont"
"doc"
];
src = fetchzip {
url = "https://github.com/belluzj/fantasque-sans/releases/download/v${version}/FantasqueSansMono-Normal.zip";
url = "https://github.com/belluzj/fantasque-sans/releases/download/v${finalAttrs.version}/FantasqueSansMono-Normal.zip";
stripRoot = false;
hash = "sha256-MNXZoDPi24xXHXGVADH16a3vZmFhwX0Htz02+46hWFc=";
};
nativeBuildInputs = [ installFonts ];
installPhase = ''
runHook preInstall
install -Dm644 OTF/*.otf -t $out/share/fonts/opentype
install -Dm644 README.md -t $out/share/doc/${pname}-${version}
install -m644 -Dt $doc/share/doc/${finalAttrs.pname}-${finalAttrs.version} {*.md,*.txt}
runHook postInstall
'';
@@ -30,4 +38,4 @@ stdenvNoCC.mkDerivation rec {
platforms = lib.platforms.all;
maintainers = [ lib.maintainers.rycee ];
};
}
})
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule (finalAttrs: {
pname = "gojq";
version = "0.12.18";
version = "0.12.19";
src = fetchFromGitHub {
owner = "itchyny";
repo = "gojq";
rev = "v${finalAttrs.version}";
hash = "sha256-9oqyNG8kaM4LmMWOZ2aQqabx97xw6Bt1PgjhVuPU+YE=";
hash = "sha256-egaBNHKKzwDwaUN4GT+Xvt11Nz6ojNMSIrXbcEisyI4=";
};
vendorHash = "sha256-NxhoCbDRduegRcBoZbNi2CB7QRXvqpLv7cAL2mEy9tM=";
vendorHash = "sha256-6UnX9YHh4RGcIFfqaJLxDPxuGQ6KO4UIOryXsoJUjFs=";
ldflags = [
"-s"
@@ -31,13 +31,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "homepage-dashboard";
version = "1.11.0";
version = "1.12.1";
src = fetchFromGitHub {
owner = "gethomepage";
repo = "homepage";
tag = "v${finalAttrs.version}";
hash = "sha256-jnv9PnClm/jIQ4uU6c4A1UiAmwoihG0l6k3fUbD47I4=";
hash = "sha256-+ssT+eV/w9mzY2QTbna/RKYLVkeRREt318sc/bVgW1k=";
};
pnpmDeps = fetchPnpmDeps {
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
;
pnpm = pnpm_10;
fetcherVersion = 3;
hash = "sha256-X5j9XppbcasGuC7fUsj4XzbaQFM9WcRcXjgJHN/inR8=";
hash = "sha256-deKVLAmgQEld59PpuaWse+laPoe4L9Ck1IjmgiP26bg=";
};
nativeBuildInputs = [
+2 -11
View File
@@ -3,6 +3,7 @@
stdenvNoCC,
fetchFromGitHub,
nix-update-script,
installFonts,
}:
stdenvNoCC.mkDerivation (finalAttrs: {
@@ -19,17 +20,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
dontConfigure = true;
dontBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out/share/fonts/truetype
cp font/*.ttf $out/share/fonts/truetype
mkdir -p $out/share/fonts/opentype
cp font/*.otf $out/share/fonts/opentype
runHook postInstall
'';
nativeBuildInputs = [ installFonts ];
passthru.updateScript = nix-update-script { };
+3 -3
View File
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "minijinja";
version = "2.18.0";
version = "2.19.0";
src = fetchFromGitHub {
owner = "mitsuhiko";
repo = "minijinja";
rev = finalAttrs.version;
hash = "sha256-l/79Q/5enkhQ3KggSWQKtjlF+bxSzOz73dwDhewM6mo=";
hash = "sha256-aZBC2OypmrPNU/uuaCCjhcFTJn0jl3VPTJYHh0piTxo=";
};
cargoHash = "sha256-WujWLLnz3xSR5H1IOsVYoB1o/R84a+BBdUTROMHz7xA=";
cargoHash = "sha256-TGqfng5SB2tTplZaFWC6BM/L385av6tYTQvcHsSk3h0=";
# The tests relies on the presence of network connection
doCheck = false;
+2 -7
View File
@@ -2,6 +2,7 @@
lib,
stdenvNoCC,
fetchzip,
installFonts,
}:
let
@@ -18,13 +19,7 @@ stdenvNoCC.mkDerivation {
stripRoot = false;
};
installPhase = ''
runHook preInstall
install -D -m444 -t $out/share/fonts/opentype $src/*.otf
runHook postInstall
'';
nativeBuildInputs = [ installFonts ];
meta = {
homepage = "https://dotcolon.net/font/seshat/";
+5 -11
View File
@@ -2,25 +2,19 @@
lib,
stdenvNoCC,
fetchurl,
installFonts,
}:
stdenvNoCC.mkDerivation rec {
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "takao";
version = "00303.01";
src = fetchurl {
url = "mirror://ubuntu/pool/universe/f/fonts-takao/fonts-takao_${version}.orig.tar.gz";
url = "mirror://ubuntu/pool/universe/f/fonts-takao/fonts-takao_${finalAttrs.version}.orig.tar.gz";
hash = "sha256-0wjHNv1yStp0q9D0WfwjgUYoUKcCrXA5jFO8PEVgq5k=";
};
installPhase = ''
runHook preInstall
mkdir -p $out/share/fonts
cp *.ttf $out/share/fonts
runHook postInstall
'';
nativeBuildInputs = [ installFonts ];
meta = {
description = "Japanese TrueType Gothic, P Gothic, Mincho, P Mincho fonts";
@@ -29,4 +23,4 @@ stdenvNoCC.mkDerivation rec {
maintainers = with lib.maintainers; [ serge ];
platforms = lib.platforms.all;
};
}
})
@@ -6,16 +6,16 @@
}:
buildGoModule (finalAttrs: {
pname = "terraform-mcp-server";
version = "0.4.0";
version = "0.5.0";
src = fetchFromGitHub {
owner = "hashicorp";
repo = "terraform-mcp-server";
tag = "v${finalAttrs.version}";
hash = "sha256-+fqhSF+5XNqmIgqUBNNDUOUkVwV8ZdMjqWxNSxMKMrA=";
hash = "sha256-V+TcIuw9SrSbqtjZMM5CSUjPof9xpdwN0NKGrU7M6kQ=";
};
vendorHash = "sha256-L6Fak8NKEQOzeX/xFpqsqSS/BgtFUKGkFD2+418bANE=";
vendorHash = "sha256-8bKDnnByc6tId7mWCaSxY9zgoBW7Ajlmd33xuMrJp1E=";
ldflags = [
"-X main.version=${finalAttrs.version}"
+2 -2
View File
@@ -8,13 +8,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "wavelog";
version = "2.3.1";
version = "2.4";
src = fetchFromGitHub {
owner = "wavelog";
repo = "wavelog";
tag = finalAttrs.version;
hash = "sha256-BHe+d2tKDQ+EVbMA8SaDmowrF6q5OOko5NuAwjXGwOE=";
hash = "sha256-ELCLVZ0CiXcefxDKpE3AODDzDCgnljXY/ooy0U+ut54=";
};
installPhase = ''
+4 -3
View File
@@ -8,11 +8,12 @@
version,
name ? "${pname}-${version}",
src,
fetchAll ? false,
hash ? lib.fakeHash,
}@args:
}:
runCommand "${name}-zig-deps"
{
inherit (args) src;
inherit src fetchAll;
nativeBuildInputs = [ zig ];
@@ -26,7 +27,7 @@ runCommand "${name}-zig-deps"
runHook unpackPhase
cd $sourceRoot
zig build --fetch
zig build --fetch''${fetchAll:+=all}
mv $ZIG_GLOBAL_CACHE_DIR/p $out
''
@@ -14,14 +14,14 @@
buildPythonPackage (finalAttrs: {
pname = "ddgs";
version = "9.11.4";
version = "9.12.0";
pyproject = true;
src = fetchFromGitHub {
owner = "deedy5";
repo = "ddgs";
tag = "v${finalAttrs.version}";
hash = "sha256-+UefNpWKq1Rcm90M+hQavEORYZF4FWC1FzH7TfAH6WA=";
hash = "sha256-z6IFwQwtyqKW0mn+z3K1aoFkFoPH0OOofukmTIk5gVs=";
};
build-system = [ setuptools ];
+81 -210
View File
@@ -1,6 +1,6 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
version = 3
version = 4
[[package]]
name = "adler2"
@@ -32,15 +32,6 @@ dependencies = [
"alloc-no-stdlib",
]
[[package]]
name = "alloca"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e5a7d05ea6aea7e9e64d25b9156ba2fee3fdd659e34e41063cd2fc7cd020d7f4"
dependencies = [
"cc",
]
[[package]]
name = "allocator-api2"
version = "0.2.21"
@@ -53,56 +44,12 @@ version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
[[package]]
name = "anstream"
version = "0.6.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a"
dependencies = [
"anstyle",
"anstyle-parse",
"anstyle-query",
"anstyle-wincon",
"colorchoice",
"is_terminal_polyfill",
"utf8parse",
]
[[package]]
name = "anstyle"
version = "1.0.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78"
[[package]]
name = "anstyle-parse"
version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2"
dependencies = [
"utf8parse",
]
[[package]]
name = "anstyle-query"
version = "1.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
dependencies = [
"windows-sys 0.61.2",
]
[[package]]
name = "anstyle-wincon"
version = "3.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
dependencies = [
"anstyle",
"once_cell_polyfill",
"windows-sys 0.61.2",
]
[[package]]
name = "anyhow"
version = "1.0.102"
@@ -368,12 +315,6 @@ dependencies = [
"cc",
]
[[package]]
name = "colorchoice"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
[[package]]
name = "compression-codecs"
version = "0.4.37"
@@ -469,11 +410,10 @@ dependencies = [
[[package]]
name = "criterion"
version = "0.8.2"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "950046b2aa2492f9a536f5f4f9a3de7b9e2476e575e05bd6c333371add4d98f3"
checksum = "e1c047a62b0cc3e145fa84415a3191f628e980b194c2755aa12300a4e6cbd928"
dependencies = [
"alloca",
"anes",
"cast",
"ciborium",
@@ -482,7 +422,6 @@ dependencies = [
"itertools",
"num-traits",
"oorandom",
"page_size",
"plotters",
"rayon",
"regex",
@@ -494,9 +433,9 @@ dependencies = [
[[package]]
name = "criterion-plot"
version = "0.8.2"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d8d80a2f4f5b554395e47b5d8305bc3d27813bacb73493eb1001e8f76dae29ea"
checksum = "9b1bcc0dc7dfae599d84ad0b1a55f80cde8af3725da8313b528da95ef783e338"
dependencies = [
"cast",
"itertools",
@@ -636,16 +575,6 @@ dependencies = [
"syn",
]
[[package]]
name = "env_filter"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a1c3cc8e57274ec99de65301228b537f1e4eedc1b8e0f9411c6caac8ae7308f"
dependencies = [
"log",
"regex",
]
[[package]]
name = "env_logger"
version = "0.10.2"
@@ -659,19 +588,6 @@ dependencies = [
"termcolor",
]
[[package]]
name = "env_logger"
version = "0.11.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b2daee4ea451f429a58296525ddf28b45a3b64f1acf6587e2067437bb11e218d"
dependencies = [
"anstream",
"anstyle",
"env_filter",
"jiff",
"log",
]
[[package]]
name = "equivalent"
version = "1.0.2"
@@ -893,7 +809,7 @@ version = "0.4.13"
dependencies = [
"atomic-waker",
"bytes",
"env_logger 0.10.2",
"env_logger",
"fnv",
"futures-core",
"futures-sink",
@@ -1380,12 +1296,6 @@ dependencies = [
"windows-sys 0.61.2",
]
[[package]]
name = "is_terminal_polyfill"
version = "1.70.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695"
[[package]]
name = "itertools"
version = "0.13.0"
@@ -1401,30 +1311,6 @@ version = "1.0.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2"
[[package]]
name = "jiff"
version = "0.2.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1a3546dc96b6d42c5f24902af9e2538e82e39ad350b0c766eb3fbf2d8f3d8359"
dependencies = [
"jiff-static",
"log",
"portable-atomic",
"portable-atomic-util",
"serde_core",
]
[[package]]
name = "jiff-static"
version = "0.2.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2a8c8b344124222efd714b73bb41f8b5120b27a7cc1c75593a6ff768d9d05aa4"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "jobserver"
version = "0.1.34"
@@ -1723,12 +1609,6 @@ dependencies = [
"portable-atomic",
]
[[package]]
name = "once_cell_polyfill"
version = "1.70.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"
[[package]]
name = "oorandom"
version = "11.1.5"
@@ -1789,16 +1669,6 @@ dependencies = [
"vcpkg",
]
[[package]]
name = "page_size"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "30d5b2194ed13191c1999ae0704b7839fb18384fa22e49b57eeaa97d79ce40da"
dependencies = [
"libc",
"winapi",
]
[[package]]
name = "parking_lot"
version = "0.12.5"
@@ -1987,15 +1857,6 @@ version = "1.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49"
[[package]]
name = "portable-atomic-util"
version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a9db96d7fa8782dd8c15ce32ffe8680bbd1e978a43bf51a34d39483540495f5"
dependencies = [
"portable-atomic",
]
[[package]]
name = "potential_utf"
version = "0.1.4"
@@ -2032,7 +1893,7 @@ version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "865724d4dbe39d9f3dd3b52b88d859d66bcb2d6a0acfd5ea68a65fb66d4bdc1c"
dependencies = [
"env_logger 0.10.2",
"env_logger",
"log",
]
@@ -2048,71 +1909,23 @@ dependencies = [
[[package]]
name = "primp"
version = "1.1.3"
version = "1.2.1"
dependencies = [
"base64",
"brotli",
"bytes",
"cookie",
"cookie_store",
"criterion",
"doc-comment",
"encoding_rs",
"env_logger 0.11.9",
"flate2",
"futures-channel",
"futures-core",
"futures-util",
"h2",
"h3",
"h3-quinn",
"hickory-resolver",
"http",
"http-body",
"http-body-util",
"hyper",
"hyper-rustls",
"hyper-tls",
"hyper-util",
"js-sys",
"libc",
"log",
"mime",
"mime_guess",
"native-tls",
"num_cpus",
"once_cell",
"percent-encoding",
"pin-project-lite",
"quinn",
"rand 0.10.0",
"reqwest",
"rustls",
"rustls-native-certs",
"rustls-pki-types",
"serde",
"serde_json",
"serde_urlencoded",
"sync_wrapper",
"tokio",
"tokio-native-tls",
"tokio-rustls",
"tokio-util",
"tower",
"tower-http",
"tower-service",
"url",
"wasm-bindgen",
"wasm-bindgen-futures",
"wasm-bindgen-test",
"wasm-streams",
"web-sys",
"webpki-roots",
"zstd",
]
[[package]]
name = "primp-python"
version = "1.1.3"
version = "1.2.1"
dependencies = [
"anyhow",
"bytes",
@@ -2296,6 +2109,7 @@ version = "0.11.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31"
dependencies = [
"aws-lc-rs",
"bytes",
"getrandom 0.3.4",
"lru-slab",
@@ -2493,6 +2307,68 @@ version = "0.8.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a"
[[package]]
name = "reqwest"
version = "0.13.2"
dependencies = [
"base64",
"brotli",
"bytes",
"cookie",
"cookie_store",
"doc-comment",
"encoding_rs",
"env_logger",
"flate2",
"futures-channel",
"futures-core",
"futures-util",
"h2",
"h3",
"h3-quinn",
"hickory-resolver",
"http",
"http-body",
"http-body-util",
"hyper",
"hyper-rustls",
"hyper-tls",
"hyper-util",
"js-sys",
"libc",
"log",
"mime",
"mime_guess",
"native-tls",
"num_cpus",
"once_cell",
"percent-encoding",
"pin-project-lite",
"quinn",
"rustls",
"rustls-native-certs",
"rustls-pki-types",
"serde",
"serde_json",
"serde_urlencoded",
"sync_wrapper",
"tokio",
"tokio-native-tls",
"tokio-rustls",
"tokio-util",
"tower",
"tower-http",
"tower-service",
"url",
"wasm-bindgen",
"wasm-bindgen-futures",
"wasm-bindgen-test",
"wasm-streams",
"web-sys",
"webpki-roots",
"zstd",
]
[[package]]
name = "resolv-conf"
version = "0.7.6"
@@ -2543,14 +2419,14 @@ dependencies = [
[[package]]
name = "rustls"
version = "0.23.36"
version = "0.23.37"
dependencies = [
"aws-lc-rs",
"base64",
"bencher",
"brotli",
"brotli-decompressor",
"env_logger 0.10.2",
"env_logger",
"hashbrown 0.16.1",
"hex",
"log",
@@ -2571,6 +2447,7 @@ dependencies = [
"x509-parser",
"zeroize",
"zlib-rs",
"zstd",
]
[[package]]
@@ -2907,7 +2784,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "82a72c767771b47409d2345987fda8628641887d5466101319899796367354a0"
dependencies = [
"fastrand",
"getrandom 0.4.2",
"getrandom 0.3.4",
"once_cell",
"rustix",
"windows-sys 0.61.2",
@@ -3227,18 +3104,18 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
[[package]]
name = "typed-builder"
version = "0.23.2"
version = "0.20.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "31aa81521b70f94402501d848ccc0ecaa8f93c8eb6999eb9747e72287757ffda"
checksum = "cd9d30e3a08026c78f246b173243cf07b3696d274debd26680773b6773c2afc7"
dependencies = [
"typed-builder-macro",
]
[[package]]
name = "typed-builder-macro"
version = "0.23.2"
version = "0.20.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "076a02dc54dd46795c2e9c8282ed40bcfb1e22747e955de9389a1de28190fb26"
checksum = "3c36781cc0e46a83726d9879608e4cf6c2505237e263a8eb8c24502989cfdb28"
dependencies = [
"proc-macro2",
"quote",
@@ -3305,12 +3182,6 @@ version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
[[package]]
name = "utf8parse"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
[[package]]
name = "uuid"
version = "1.21.0"
@@ -11,14 +11,14 @@
buildPythonPackage (finalAttrs: {
pname = "primp";
version = "1.1.3";
version = "1.2.1";
pyproject = true;
src = fetchFromGitHub {
owner = "deedy5";
repo = "primp";
tag = "v${finalAttrs.version}";
hash = "sha256-ahTIEStYQ5M7EYidQYpYEVbYwwFFRfBXErWOMDdgNnk=";
hash = "sha256-3NAu8hAHdazsV+KEH7gUms8XGKW84nasHnygIz5jRa8=";
};
# The Cargo.lock is not pushed upstream
@@ -43,7 +43,10 @@ buildPythonPackage (finalAttrs: {
pytestCheckHook
pytest-asyncio
];
disabledTestPaths = [ "crates/primp-python/tests/test_impersonate.py" ];
disabledTestPaths = [
"crates/primp-python/tests/test_impersonate.py"
"crates/primp-python/tests/test_header_order.py"
];
# Tests crash with Abort trap: 6 on Darwin due to tokio runtime
# initialization in PyInit_pyo3_async_runtimes being blocked by the sandbox.