From a2bc393fe7d89ec121fdb4c25305516b528435da Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Thu, 31 Oct 2024 17:03:16 +0100 Subject: [PATCH] nodejs_23: init at 23.1.0 (#349046) --- pkgs/development/web/nodejs/v23.nix | 52 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 10 ++++-- 2 files changed, 59 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/web/nodejs/v23.nix diff --git a/pkgs/development/web/nodejs/v23.nix b/pkgs/development/web/nodejs/v23.nix new file mode 100644 index 000000000000..2039e9385c4f --- /dev/null +++ b/pkgs/development/web/nodejs/v23.nix @@ -0,0 +1,52 @@ +{ + callPackage, + fetchpatch2, + openssl, + python3, + enableNpm ? true, +}: + +let + buildNodejs = callPackage ./nodejs.nix { + inherit openssl; + python = python3; + }; +in +buildNodejs { + inherit enableNpm; + version = "23.1.0"; + sha256 = "57cbfd3dd51f9300ea2b8e60a8ed215b1eaa71fbde4c3903a7d31a443a4a4423"; + patches = [ + ./configure-emulator.patch + ./configure-armv6-vfpv2.patch + ./disable-darwin-v8-system-instrumentation-node19.patch + ./bypass-darwin-xcrun-node16.patch + ./node-npm-build-npm-package-logic.patch + ./use-correct-env-in-tests.patch + ./bin-sh-node-run-v22.patch + + # Those reverts are due to a mismatch with the libuv version used upstream + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/dcbc5fbe65b068a90c3d0970155d3a68774caa38.patch?full_index=1"; + hash = "sha256-Q7YrooolMjsGflTQEj5ra6hRVGhMP6APaydf1MGH54Q="; + revert = true; + excludes = [ "doc/*" ]; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/ec867ac7ce4e4913a8415eda48a7af9fc226097d.patch?full_index=1"; + hash = "sha256-zfnHxC7ZMZAiu0/6PsX7RFasTevHMETv+azhTZnKI64="; + revert = true; + excludes = [ "doc/*" ]; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/f97865fab436fba24b46dad14435ec4b482243a2.patch?full_index=1"; + hash = "sha256-o5aPQqUXubtJKMX28jn8LdjZHw37/BqENkYt6RAR3kY="; + revert = true; + }) + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/54d55f2337ebe04451da770935ad453accb147f9.patch?full_index=1"; + hash = "sha256-gmIyiSyNzC3pClL1SM2YicckWM+/2tsbV1xv2S3d5G0="; + revert = true; + }) + ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fc04a63bd719..e15dae715d48 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9436,10 +9436,14 @@ with pkgs; nodejs-slim_22 = callPackage ../development/web/nodejs/v22.nix { enableNpm = false; }; corepack_22 = hiPrio (callPackage ../development/web/nodejs/corepack.nix { nodejs = nodejs_22; }); + nodejs_23 = callPackage ../development/web/nodejs/v23.nix { }; + nodejs-slim_23 = callPackage ../development/web/nodejs/v23.nix { enableNpm = false; }; + corepack_23 = hiPrio (callPackage ../development/web/nodejs/corepack.nix { nodejs = nodejs_23; }); + # Update this when adding the newest nodejs major version! - nodejs_latest = nodejs_22; - nodejs-slim_latest = nodejs-slim_22; - corepack_latest = hiPrio corepack_22; + nodejs_latest = nodejs_23; + nodejs-slim_latest = nodejs-slim_23; + corepack_latest = hiPrio corepack_23; buildNpmPackage = callPackage ../build-support/node/build-npm-package { };