From 036605d16b4b6b3ce5163650a13d7b9df522d1c6 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 3 Apr 2024 04:20:00 +0000 Subject: [PATCH 1/2] nodejs_18: 18.19.1 -> 18.20.1 https://github.com/nodejs/node/releases/tag/v18.20.0 https://github.com/nodejs/node/releases/tag/v18.20.1 --- pkgs/development/web/nodejs/v18.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix index a4121b9575fd..a003c0e9bfb9 100644 --- a/pkgs/development/web/nodejs/v18.nix +++ b/pkgs/development/web/nodejs/v18.nix @@ -19,11 +19,8 @@ let in buildNodejs { inherit enableNpm; - # The change to minor version 18.20.0 breaks compatibility with ffi-napi - # This breaks the compilation of some nix packages. - # While this is investigated and fixed, do not upgrade the minor version. - version = "18.19.1"; - sha256 = "sha256-CQ+WouzeCAtrOCxtZCvKXQvkcCp4y1Vb578CsgvRbe0="; + version = "18.20.1"; + sha256 = "sha256-xthnqfJeY1SBDv+4IB+BR6FbKAAOUHkP2gDRyhX0m4o="; patches = [ ./disable-darwin-v8-system-instrumentation.patch ./bypass-darwin-xcrun-node16.patch From bb22b55bde4bff4632bc68f2eb9d5777b1dc602d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 3 Apr 2024 04:20:00 +0000 Subject: [PATCH 2/2] =?UTF-8?q?openvscode-server:=20fix=20build=20with=20N?= =?UTF-8?q?ode.js=E2=89=A518.20.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/servers/openvscode-server/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/servers/openvscode-server/default.nix b/pkgs/servers/openvscode-server/default.nix index fe6f36617d23..6a8de3c6c7b4 100644 --- a/pkgs/servers/openvscode-server/default.nix +++ b/pkgs/servers/openvscode-server/default.nix @@ -117,6 +117,9 @@ stdenv.mkDerivation (finalAttrs: { ./remove-node-download.patch ]; + # Disable NAPI_EXPERIMENTAL to allow to build with Node.js≥18.20.0. + env.NIX_CFLAGS_COMPILE = "-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT"; + postPatch = '' export HOME=$PWD