Skip to content

deno: 2.3.5 -> 2.3.6, fix tests #416177

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SuperSandro2000 merged 3 commits into from
Jun 19, 2025
Merged

deno: 2.3.5 -> 2.3.6, fix tests #416177

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c81cc83
deno: 2.3.5 -> 2.3.6
ofalvai Jun 12, 2025
d88d273
deno: skip more flaky or unreliable tests
ofalvai Jun 17, 2025
abc9b18
deno: disable LTO on Linux and x86_64-darwin
ofalvai Jun 18, 2025
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
83 changes: 71 additions & 12 deletions pkgs/by-name/de/deno/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
lib,
callPackage,
fetchFromGitHub,
fetchpatch,
rustPlatform,
cmake,
yq,
Expand All @@ -21,35 +22,54 @@
nodejs,
git,
python3,
esbuild,
}:

let
canExecute = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "deno";
version = "2.3.5";
version = "2.3.6";

src = fetchFromGitHub {
owner = "denoland";
repo = "deno";
tag = "v${finalAttrs.version}";
fetchSubmodules = true; # required for tests
hash = "sha256-lu3r1v3iB9NIruooRrV9NawUnKqufqlYJQe+Aumgn8E=";
hash = "sha256-l3cWnv2cEmoeecYj38eMIlgqlRjDbtQuc6Q3DmOJoqE=";
};
Copy link
Contributor

@GaetanLepage GaetanLepage Jun 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
};
};
patches = [
(fetchpatch {
name = "fix-sigsegv-on-x86_64-unknown-linux-gnu-targets";
url = "https://github.com/denoland/deno/commit/9dd0e9aa15dfab867c16155aa719a2ed38b23308.patch";
hash = "";
})
];


useFetchCargoVendor = true;
cargoHash = "sha256-XJy7+cARYEX8tAPXLHJnEwXyZIwPaqhM7ZUzoem1Wo0=";
cargoHash = "sha256-alvn+d7XTYrw8KXw+k+++J3CsBwAUbQQlh24/EOEzwY=";
cargoPatches = [
(fetchpatch {
name = "fix-sigsegv-on-x86_64-unknown-linux-gnu-targets";
url = "https://github.com/denoland/deno/commit/400a9565c335b51d78c8909f4dbf1dbd4fb5e5d8.patch";
hash = "sha256-dTIw7P6sB6Esf+lSe/gc3cX54GkzLWF5X55yxP/QYoo=";
includes = [ "cli/Cargo.toml" ];
})
];

patches = [
./tests-replace-hardcoded-paths.patch
./tests-darwin-differences.patch
./tests-no-chown.patch
];
postPatch = ''
# Use patched nixpkgs libffi in order to fix https://github.com/libffi/libffi/pull/857
tomlq -ti '.workspace.dependencies.libffi = { "version": .workspace.dependencies.libffi, "features": ["system"] }' Cargo.toml
'';
postPatch =
''
# Use patched nixpkgs libffi in order to fix https://github.com/libffi/libffi/pull/857
tomlq -ti '.workspace.dependencies.libffi = { "version": .workspace.dependencies.libffi, "features": ["system"] }' Cargo.toml
''
+
lib.optionalString
(stdenv.hostPlatform.isLinux || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64))
''
# LTO crashes with the latest Rust + LLVM combination.
# https://github.com/rust-lang/rust/issues/141737
# TODO: remove this once LLVM is upgraded to 20.1.7
tomlq -ti '.profile.release.lto = false' Cargo.toml
'';

buildInputs = [
libffi
Expand Down Expand Up @@ -82,11 +102,42 @@ rustPlatform.buildRustPackage (finalAttrs: {
# To avoid this we pre-download the file and export it via RUSTY_V8_ARCHIVE
env.RUSTY_V8_ARCHIVE = librusty_v8;

preCheck = lib.optionalString stdenv.hostPlatform.isDarwin ''
# Unset the env var defined by bintools-wrapper because it triggers Deno's sandbox protection in some tests.
# ref: https://github.com/denoland/deno/pull/25271
unset LD_DYLD_PATH
'';
# Many tests depend on prebuilt binaries being present at `./third_party/prebuilt`.
# We provide nixpkgs binaries for these for all platforms, but the test runner itself only handles
# these four arch+platform combinations.
doCheck =
stdenv.hostPlatform.isDarwin
|| (stdenv.hostPlatform.isLinux && (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isx86_64));

preCheck =
# Provide esbuild binary at `./third_party/prebuilt/` just like upstream:
# https://github.com/denoland/deno_third_party/tree/master/prebuilt
# https://github.com/denoland/deno/blob/main/tests/util/server/src/servers/npm_registry.rs#L402
let
platform =
if stdenv.hostPlatform.isLinux then
"linux64"
else if stdenv.hostPlatform.isDarwin then
"mac"
else
throw "Unsupported platform";
arch =
if stdenv.hostPlatform.isAarch64 then
"aarch64"
else if stdenv.hostPlatform.isx86_64 then
"x64"
else
throw "Unsupported architecture";
in
''
mkdir -p ./third_party/prebuilt/${platform}
cp ${lib.getExe esbuild} ./third_party/prebuilt/${platform}/esbuild-${arch}
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
# Unset the env var defined by bintools-wrapper because it triggers Deno's sandbox protection in some tests.
# ref: https://github.com/denoland/deno/pull/25271
unset LD_DYLD_PATH
'';

cargoTestFlags = [
"--lib" # unit tests
Expand Down Expand Up @@ -119,9 +170,17 @@ rustPlatform.buildRustPackage (finalAttrs: {

# Flaky
"--skip=init::init_subcommand_serve"
"--skip=serve::deno_serve_parallel"
"--skip=js_unit_tests::stat_test" # timing-sensitive
"--skip=repl::pty_complete_imports"
"--skip=repl::pty_complete_expression"

# Test hangs, needs investigation
"--skip=repl::pty_complete_imports_no_panic_empty_specifier"

# Use of VSOCK, might not be available on all platforms
"--skip=js_unit_tests::serve_test"
"--skip=js_unit_tests::fetch_test"
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
# Expects specific shared libraries from macOS to be linked
Expand Down
Loading