From e2ee5d659c825f9ca4f91d2cc760ebd08312c807 Mon Sep 17 00:00:00 2001 From: Mynacol Date: Fri, 24 Jul 2026 11:58:26 +0000 Subject: [PATCH] deno: 2.9.3 -> 2.9.4 This also updates rusty-v8 from 149.4.0 to 150.2.0, and that required a new patch to make it build. And another deno test fails due to our build setup that we have to skip. --- pkgs/by-name/de/deno/package.nix | 8 +++++--- .../de/deno/rusty-v8/c_additional_outputs.patch | 16 ++++++++++++++++ pkgs/by-name/de/deno/rusty-v8/default.nix | 7 ++++--- 3 files changed, 25 insertions(+), 6 deletions(-) create mode 100644 pkgs/by-name/de/deno/rusty-v8/c_additional_outputs.patch diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix index 761c33d3000e..9ccc1cb21e96 100644 --- a/pkgs/by-name/de/deno/package.nix +++ b/pkgs/by-name/de/deno/package.nix @@ -33,7 +33,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "deno"; - version = "2.9.3"; + version = "2.9.4"; __structuredAttrs = true; @@ -47,10 +47,10 @@ rustPlatform.buildRustPackage (finalAttrs: { repo = "deno"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; # required for tests - hash = "sha256-XMHlWK+lhyn1KO1CSxcuM3KzTjYviVrRw+FUL74bBPc="; + hash = "sha256-ivch++yGRUyWtox/5QqomC4DlTvMBxK+gIcN9/7tt5E="; }; - cargoHash = "sha256-WZxyoD9WMnaLyD3/86R90KWC+9OA15fIMw8SjmovNHA="; + cargoHash = "sha256-ynbHLZXkPPYpsC4dCu6jA6x8ftiTHWZ/uxzdbUcUaa0="; patches = [ ./patches/0002-tests-replace-hardcoded-paths.patch @@ -211,6 +211,8 @@ rustPlatform.buildRustPackage (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isLinux [ # Wants to access /etc/resolv.conf: https://github.com/hickory-dns/hickory-dns/issues/2959 "--skip=tests::test_userspace_resolver" + # We don't have a tmp dir with sticky bit during build + "--skip=util::temp::test::test_ensure_secure_temp_parent_rejects_non_sticky_writable_dir" ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/by-name/de/deno/rusty-v8/c_additional_outputs.patch b/pkgs/by-name/de/deno/rusty-v8/c_additional_outputs.patch new file mode 100644 index 000000000000..ba9ad143ea40 --- /dev/null +++ b/pkgs/by-name/de/deno/rusty-v8/c_additional_outputs.patch @@ -0,0 +1,16 @@ +Submodule build contains modified content +diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn +index 11ddb4916..0bd001600 100644 +--- a/build/config/compiler/BUILD.gn ++++ b/build/config/compiler/BUILD.gn +@@ -2827,10 +2827,6 @@ config("split_dwarf") { + # thinlto requires -gsplit-dwarf in ldflags. + if (use_thin_lto && !is_apple) { + ldflags = split_dwarf_flags +- } else { +- # .dwo files are generated when ThinLTO is not used. +- c_additional_outputs = +- [ "{{target_out_dir}}/{{label_name}}/{{source_name_part}}.dwo" ] + } + } + diff --git a/pkgs/by-name/de/deno/rusty-v8/default.nix b/pkgs/by-name/de/deno/rusty-v8/default.nix index 8a61c63adce2..25a56b014ef3 100644 --- a/pkgs/by-name/de/deno/rusty-v8/default.nix +++ b/pkgs/by-name/de/deno/rusty-v8/default.nix @@ -71,26 +71,27 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "rusty-v8"; - version = "149.4.0"; + version = "150.2.0"; src = fetchFromGitHub { owner = "denoland"; repo = "rusty_v8"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-n4dKtki9ov0lWBeLmMDI4Tpk8zQ8YYSf04QW6DTYisY="; + hash = "sha256-Iwgc08bUHR4OiwqopJua6fkQYMOdC5k9TgoCmZQrWIw="; }; patches = [ ./librusty_v8_no_downloads.patch ./llvm22.patch ./gn_inputs_fix.patch + ./c_additional_outputs.patch ] ++ lib.optionals stdenv.targetPlatform.isDarwin [ ./librusty_v8-darwin-fix-__rust_no_alloc_shim_is_unstable_v2.patch ]; - cargoHash = "sha256-bGqg/6sfBaF/JpObgXyP4Mh+4P9zfuzd454m4wjluGw="; + cargoHash = "sha256-M65ODvL+o3njO3SdbJaCvgRupoguCGCIoYY/dYiJPng="; nativeBuildInputs = [ llvmPackages.clang