deno: 2.5.3 -> 2.5.6 (#457067)

This commit is contained in:
Pol Dellaiera
2025-10-30 22:13:00 +00:00
committed by GitHub
2 changed files with 4 additions and 41 deletions

View File

@@ -29,17 +29,17 @@ let
in in
rustPlatform.buildRustPackage (finalAttrs: { rustPlatform.buildRustPackage (finalAttrs: {
pname = "deno"; pname = "deno";
version = "2.5.3"; version = "2.5.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "denoland"; owner = "denoland";
repo = "deno"; repo = "deno";
tag = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
fetchSubmodules = true; # required for tests fetchSubmodules = true; # required for tests
hash = "sha256-UqD9Va33XVX73bjwUdb6woZ3kP/Xz6iBVqV1ceRbXq0="; hash = "sha256-Ppw2fyfFvSmGO+FcEvclkOU7LATOqkYH3wErBdKgWJY=";
}; };
cargoHash = "sha256-OrKg3bOA5AyLQA+LIsHwWpk9DHodhcCVzdKW/S9+mNY="; cargoHash = "sha256-EN87p8wX5QAzf3cWfX8I/+XzYRc9rA5EWj996iUpSPg=";
patches = [ patches = [
# Patch out the remote upgrade (deno update) check. # Patch out the remote upgrade (deno update) check.
@@ -53,10 +53,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
./patches/0002-tests-replace-hardcoded-paths.patch ./patches/0002-tests-replace-hardcoded-paths.patch
./patches/0003-tests-linux-no-chown.patch ./patches/0003-tests-linux-no-chown.patch
./patches/0004-tests-darwin-fixes.patch ./patches/0004-tests-darwin-fixes.patch
# some new TS tests don't identify `deno` location from parent actively
# running `deno` instance
# https://github.com/denoland/deno/pull/30914
./patches/0005-tests-fix-deno-path.patch
]; ];
postPatch = '' postPatch = ''
# Use patched nixpkgs libffi in order to fix https://github.com/libffi/libffi/pull/857 # Use patched nixpkgs libffi in order to fix https://github.com/libffi/libffi/pull/857
@@ -182,6 +178,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
"--skip=watcher" "--skip=watcher"
"--skip=node_unit_tests::_fs_watch_test" "--skip=node_unit_tests::_fs_watch_test"
"--skip=js_unit_tests::fs_events_test" "--skip=js_unit_tests::fs_events_test"
"--skip=js_unit_tests::utime_test"
] ]
++ lib.optionals stdenv.hostPlatform.isLinux [ ++ lib.optionals stdenv.hostPlatform.isLinux [
# Wants to access /etc/resolv.conf: https://github.com/hickory-dns/hickory-dns/issues/2959 # Wants to access /etc/resolv.conf: https://github.com/hickory-dns/hickory-dns/issues/2959

View File

@@ -1,34 +0,0 @@
From 798fc5e7e87c1b985a383b7b92a7e55c82e41efa Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Fri, 3 Oct 2025 14:20:53 +0100
Subject: [PATCH] test: leverage `Deno.execPath()` matching other tests
Currently most TS tests use `Deno.execPath()` to identify where `deno` lives
In the event deno is not on the `$PATH` these tests will fail.
If deno is on the `$PATH` you can end up testing the wrong instance of `deno`.
---
tests/unit/process_test.ts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/unit/process_test.ts b/tests/unit/process_test.ts
index 7b82fe5ba782f5..1c26a6f990d1b0 100644
--- a/tests/unit/process_test.ts
+++ b/tests/unit/process_test.ts
@@ -623,7 +623,7 @@ Deno.test(
// @ts-ignore `Deno.run()` was soft-removed in Deno 2.
const p = Deno.run({
- cmd: ["deno", "run", "--watch", tempFile],
+ cmd: [Deno.execPath(), "run", "--watch", tempFile],
stdout: "piped",
stderr: "null",
});
@@ -661,7 +661,7 @@ Deno.serve({ signal: ac.signal }, () => new Response("Hello World"));
// @ts-ignore `Deno.run()` was soft-removed in Deno 2.
const p = Deno.run({
- cmd: ["deno", "run", "--watch", tempFile],
+ cmd: [Deno.execPath(), "run", "--watch", tempFile],
stdout: "piped",
stderr: "null",
});