Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion test/parallel/test-blocklist.js
Original file line number Diff line number Diff line change
Expand Up @@ -888,7 +888,9 @@ const util = require('util');
const mixed = 'ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255';
blockList.addAddress(mixed, 'ipv6');
assert.strictEqual(blockList.check(mixed, 'ipv6'), true);
assert.strictEqual(blockList.check(`${mixed}%${'z'.repeat(200)}`, 'ipv6'), false);
assert.strictEqual(blockList.check(`${mixed}%${'z'.repeat(200)}`, 'ipv6'),
// This returns true as of libuv 1.53.0 (there are no 0.53.0 version)
(([major, minor]) => major > 1 || minor > 52)(process.versions.uv.split('.')));
}

// check() family parameter is case-insensitive.
Expand Down
4 changes: 2 additions & 2 deletions tools/nix/pkgs-26.05.nix
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
arg:
let
repo = "https://github.com/NixOS/nixpkgs";
rev = "42966a9c76f2cdb95b108c9fac939a27b0b8f2c5";
rev = "752cbac9446602fbb78bdd1c3597455a3dd38432";
nixpkgs = import (builtins.fetchTarball {
url = "${repo}/archive/${rev}.tar.gz";
sha256 = "0i0n2r8hsskzzkhkjgp61r5q94wj644i2jdw733gn4f5ffr61qvk";
sha256 = "0h4w0f8nkmpmmpjky3blvc2r147s515pc0z4hisywln4ryryr29z";
}) arg;
in
# Unstable channel no longer supports Intel architecture for macOS. We can use the 26.05 channel
Expand Down
11 changes: 3 additions & 8 deletions tools/nix/pkgs.nix
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
arg:
let
repo = "https://github.com/NixOS/nixpkgs";
rev = "f20cd90e28fe0403873f473b29e42662cd86e8c4";
rev = "901c54c08bdc20e00c2b3c73716b97497b1b3c74";
nixpkgs = import (builtins.fetchTarball {
url = "${repo}/archive/${rev}.tar.gz";
sha256 = "1vv6crfchmhjk5j61zgajggc3cgkalak2rvng07g41cvlcf6ldhj";
sha256 = "0bicjz6w8n0ahwxxj837rbg494siw57vfk7ff3w8v3gvnykzxlia";
}) arg;
in
# Unstable channel no longer supports Intel architecture for macOS. We can use the 26.05 channel
Expand All @@ -23,12 +23,7 @@ else

boringssl =
let
inherit (nixpkgs) callPackage lib writeTextFile;
# TODO: remove this override once nixpkgs.boringssl is 0.20261020.0 or newer.
boringssl = callPackage (builtins.fetchurl {
url = "${repo}/raw/1c17f6e5f086bf6b259e7a28f68657ed8548a25a/pkgs/by-name/bo/boringssl/package.nix";
sha256 = "10cw2np6shjanxa2vzfxsrbyz451g1b6qan2v9c1ln75i3n5zn8a";
}) { };
inherit (nixpkgs) boringssl lib writeTextFile;
in
# BoringSSL does not install the openssl.pc metadata required by configure.
# https://boringssl-review.googlesource.com/c/boringssl/+/104208
Expand Down
Loading