diff --git a/pkgs/by-name/de/deno/librusty_v8.nix b/pkgs/by-name/de/deno/librusty_v8.nix index d5a03f4c6818..1d0e8a490f2c 100644 --- a/pkgs/by-name/de/deno/librusty_v8.nix +++ b/pkgs/by-name/de/deno/librusty_v8.nix @@ -2,11 +2,11 @@ { fetchLibrustyV8 }: fetchLibrustyV8 { - version = "140.2.0"; + version = "142.2.0"; shas = { - x86_64-linux = "sha256-r3qrYDVaT4Z6udC6YuQG1BKqrsQc7IhuACDCTbr083U="; - aarch64-linux = "sha256-LtlAIk+qpeU8zCm+H9sqtivHKrM0U1LP6GkCRr1GVL0="; - x86_64-darwin = "sha256-B/6GPHX40TgAgaesNGsVQDPN1FeSFiT+cCC1wB49IXg="; - aarch64-darwin = "sha256-eZ2l9ovI2divQake+Z4/Ofcl5QwJ+Y/ql2Dymisx1oA="; + x86_64-linux = "sha256-xHmofo8wTNg88/TuC2pX2OHDRYtHncoSvSBnTV65o+0="; + aarch64-linux = "sha256-24q6wX8RTRX1tMGqgcz9/wN3Y+hWxM2SEuVrYhECyS8="; + x86_64-darwin = "sha256-u7fImeadycU1gS5m+m35WZA/G2SOdPrLOMafY54JwY4="; + aarch64-darwin = "sha256-XvJ7M5XxOzmevv+nPpy/mvEDD1MfHr986bImvDG0o4U="; }; } diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix index 58884dd9b516..d861d8b09f6e 100644 --- a/pkgs/by-name/de/deno/package.nix +++ b/pkgs/by-name/de/deno/package.nix @@ -29,27 +29,19 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "deno"; - version = "2.5.6"; + version = "2.6.3"; src = fetchFromGitHub { owner = "denoland"; repo = "deno"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; # required for tests - hash = "sha256-Ppw2fyfFvSmGO+FcEvclkOU7LATOqkYH3wErBdKgWJY="; + hash = "sha256-qJ5ZIGfUqV/ayZVABbrcOBGa6xFLZ53WGuBz8JsXvOw="; }; - cargoHash = "sha256-EN87p8wX5QAzf3cWfX8I/+XzYRc9rA5EWj996iUpSPg="; + cargoHash = "sha256-DNwuybqdHQtosQwtVgbds4gu0YCXY3tnX2IqXhhyfs8="; patches = [ - # Patch out the remote upgrade (deno update) check. - # Not a blocker in the build sandbox, since implementation and tests are - # considerately written for no external networking, but removing brings - # in-line with common nixpkgs practice. - ./patches/0000-remove-deno-upgrade-check.patch - # Patch out the upgrade sub-command since that wouldn't correctly upgrade - # deno from nixpkgs. - ./patches/0001-remove-deno-upgrade.patch ./patches/0002-tests-replace-hardcoded-paths.patch ./patches/0003-tests-linux-no-chown.patch ./patches/0004-tests-darwin-fixes.patch @@ -85,6 +77,12 @@ rustPlatform.buildRustPackage (finalAttrs: { buildFlags = [ "--package=cli" ]; + # Disable the default feature `upgrade` (which controls the self-update subcommand and update checks) + buildNoDefaultFeatures = true; + buildFeatures = [ + "__vendored_zlib_ng" + ]; + # work around "error: unknown warning group '-Wunused-but-set-parameter'" env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unknown-warning-option"; # The v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem @@ -169,6 +167,16 @@ rustPlatform.buildRustPackage (finalAttrs: { # Use of VSOCK, might not be available on all platforms "--skip=js_unit_tests::serve_test" "--skip=js_unit_tests::fetch_test" + + # We disable the upgrade feature on purpose + "--skip=upgrade::upgrade_prompt" + "--skip=upgrade::upgrade_invalid_lockfile" + + # Wants to access /etc/group + "--skip=node_unit_tests::process_test" + + # sqlite extension tests are in a separate Cargo crate and therefore are not handled by the nixpkgs Cargo tooling + "--skip=sqlite_extension_test" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Expects specific shared libraries from macOS to be linked diff --git a/pkgs/by-name/de/deno/patches/0000-remove-deno-upgrade-check.patch b/pkgs/by-name/de/deno/patches/0000-remove-deno-upgrade-check.patch deleted file mode 100644 index 48e95530ca5c..000000000000 --- a/pkgs/by-name/de/deno/patches/0000-remove-deno-upgrade-check.patch +++ /dev/null @@ -1,41 +0,0 @@ - -diff --git a/cli/tools/upgrade.rs b/cli/tools/upgrade.rs -index 3f4bcc8c7..74d5805a3 100644 ---- a/cli/tools/upgrade.rs -+++ b/cli/tools/upgrade.rs -@@ -310,10 +310,7 @@ async fn print_release_notes( - } - - pub fn upgrade_check_enabled() -> bool { -- matches!( -- env::var("DENO_NO_UPDATE_CHECK"), -- Err(env::VarError::NotPresent) -- ) -+ false - } - - pub fn check_for_upgrades( -diff --git a/cli/args/flags.rs b/cli/args/flags.rs -index e1bc861e4..612599c4c 100644 ---- a/cli/args/flags.rs -+++ b/cli/args/flags.rs -@@ -1283,7 +1283,6 @@ static ENV_VARIABLES_HELP: &str = cstr!( - database. - DENO_EMIT_CACHE_MODE Control if the transpiled sources should be cached. - DENO_NO_PACKAGE_JSON Disables auto-resolution of package.json -- DENO_NO_UPDATE_CHECK Set to disable checking if a newer Deno version is available - DENO_SERVE_ADDRESS Override address for Deno.serve - Example: "tcp:0.0.0.0:8080", "unix:/tmp/deno.sock", or "vsock:1234:5678" - DENO_AUTO_SERVE If the entrypoint contains export default { fetch }, `deno run` -diff --git a/tests/integration/upgrade_tests.rs b/tests/integration/upgrade_tests.rs -index b342c17f7..1f54292f0 100644 ---- a/tests/integration/upgrade_tests.rs -+++ b/tests/integration/upgrade_tests.rs -@@ -43,6 +43,7 @@ fn upgrade_invalid_lockfile() { - ); - } - -+#[ignore] - #[flaky_test::flaky_test] - fn upgrade_prompt() { - let context = upgrade_context(); diff --git a/pkgs/by-name/de/deno/patches/0001-remove-deno-upgrade.patch b/pkgs/by-name/de/deno/patches/0001-remove-deno-upgrade.patch deleted file mode 100644 index fa67e84b79de..000000000000 --- a/pkgs/by-name/de/deno/patches/0001-remove-deno-upgrade.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff --git a/cli/args/flags.rs b/cli/args/flags.rs -index e1bc861e4..05f070563 100644 ---- a/cli/args/flags.rs -+++ b/cli/args/flags.rs -@@ -1349,8 +1349,6 @@ static DENO_HELP: &str = cstr!( - test Run tests - deno test | deno test test.ts - publish Publish the current working directory's package or workspace -- upgrade Upgrade deno executable to given version -- deno upgrade | deno upgrade 1.45.0 | deno upgrade canary - {after-help} - - Docs: https://docs.deno.com -@@ -1536,7 +1534,6 @@ pub fn flags_from_vec(args: Vec) -> clap::error::Result { - "types" => types_parse(&mut flags, &mut m), - "uninstall" => uninstall_parse(&mut flags, &mut m), - "update" => outdated_parse(&mut flags, &mut m, true)?, -- "upgrade" => upgrade_parse(&mut flags, &mut m), - "vendor" => vendor_parse(&mut flags, &mut m), - "publish" => publish_parse(&mut flags, &mut m)?, - _ => unreachable!(), -@@ -1797,7 +1794,6 @@ pub fn clap_root() -> Command { - .subcommand(test_subcommand()) - .subcommand(types_subcommand()) - .subcommand(update_subcommand()) -- .subcommand(upgrade_subcommand()) - .subcommand(vendor_subcommand()); - - let help = help_subcommand(&cmd); -@@ -6644,6 +6640,7 @@ mod tests { - assert_eq!(flags2, flags); - } - -+ #[ignore] - #[test] - fn upgrade() { - let r = flags_from_vec(svec!["deno", "upgrade", "--dry-run", "--force"]); -@@ -6665,6 +6662,7 @@ mod tests { - ); - } - -+ #[ignore] - #[test] - fn upgrade_with_output_flag() { - let r = flags_from_vec(svec!["deno", "upgrade", "--output", "example.txt"]); -@@ -10599,6 +10597,7 @@ mod tests { - ); - } - -+ #[ignore] - #[test] - fn upgrade_with_ca_file() { - let r = flags_from_vec(svec!["deno", "upgrade", "--cert", "example.crt"]); -@@ -10620,6 +10619,7 @@ mod tests { - ); - } - -+ #[ignore] - #[test] - fn upgrade_release_candidate() { - let r = flags_from_vec(svec!["deno", "upgrade", "--rc"]); -diff --git a/tests/integration/upgrade_tests.rs b/tests/integration/upgrade_tests.rs -index b342c17f7..a6c2aafc6 100644 ---- a/tests/integration/upgrade_tests.rs -+++ b/tests/integration/upgrade_tests.rs -@@ -9,6 +9,7 @@ use test_util::TestContext; - use test_util::assert_starts_with; - use util::TestContextBuilder; - -+#[ignore] - #[flaky_test::flaky_test] - fn upgrade_invalid_lockfile() { - let context = upgrade_context();