From ffe7604c237b85612b7d5dd67f749c6643709937 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 11 Aug 2021 19:00:00 -0500 Subject: [PATCH 01/13] nodejs-12_x: 12.22.4 -> 12.22.5 https://github.com/nodejs/node/releases/tag/v12.22.5 (cherry picked from commit 16adcc430c75c0382c2b1ae70d68a4f8eb03e887) --- pkgs/development/web/nodejs/v12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix index 66cf2e4904d..e59b7959420 100644 --- a/pkgs/development/web/nodejs/v12.nix +++ b/pkgs/development/web/nodejs/v12.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "12.22.4"; - sha256 = "0k6dwkhpmjcdb71zd92a5v0l82rsk06p57iyjby84lhy2fmlxka4"; + version = "12.22.5"; + sha256 = "057xhxk440pxlgqpblsh4vfwmfzy0fx1h6q3jr2j79y559ngy9zr"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } From ffffe30c14969796305e7ac517b10c659bd5d6ef Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 1 Sep 2021 07:37:23 -0500 Subject: [PATCH 02/13] nodejs-12_x: 12.22.5 -> 12.22.6 https://github.com/nodejs/node/releases/tag/v12.22.6 (cherry picked from commit 00fa834e558bca1feeedae4ec9b6cd55bfe4281d) --- pkgs/development/web/nodejs/v12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix index e59b7959420..7717dfa6c9c 100644 --- a/pkgs/development/web/nodejs/v12.nix +++ b/pkgs/development/web/nodejs/v12.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "12.22.5"; - sha256 = "057xhxk440pxlgqpblsh4vfwmfzy0fx1h6q3jr2j79y559ngy9zr"; + version = "12.22.6"; + sha256 = "0yhgkcp7lx5nglxsrybbjymx1fys3wkbbhkj6h6652gnp0b2y0n2"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } From 7dc3972bf50bf66d1e9e72655d11d5c478e1eba1 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 11 Aug 2021 19:01:00 -0500 Subject: [PATCH 03/13] nodejs-14_x: 14.17.4 -> 14.17.5 https://github.com/nodejs/node/releases/tag/v14.17.5 (cherry picked from commit 2a14fcb7f943d82e34ae68540fee6217d14a5d44) --- pkgs/development/web/nodejs/v14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix index 3b04f751b48..bad8ebfa5ae 100644 --- a/pkgs/development/web/nodejs/v14.nix +++ b/pkgs/development/web/nodejs/v14.nix @@ -7,7 +7,7 @@ let in buildNodejs { inherit enableNpm; - version = "14.17.4"; - sha256 = "0b6gadc53r07gx6qr6281ifr5m9bgprmfdqyz9zh5j7qhkkz8yxf"; + version = "14.17.5"; + sha256 = "1a0zj505nhpfcj19qvjy2hvc5a7gadykv51y0rc6032qhzzsgca2"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } From 46fc920ae8674fb644910e36a9fd1b87f2c12a8e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 1 Sep 2021 07:37:51 -0500 Subject: [PATCH 04/13] nodejs-14_x: 14.17.5 -> 14.17.6 https://github.com/nodejs/node/releases/tag/v14.17.6 (cherry picked from commit aff25d4cf0b0461cd2fc7790518593984822cb6c) --- pkgs/development/web/nodejs/v14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix index bad8ebfa5ae..1ec04407f89 100644 --- a/pkgs/development/web/nodejs/v14.nix +++ b/pkgs/development/web/nodejs/v14.nix @@ -7,7 +7,7 @@ let in buildNodejs { inherit enableNpm; - version = "14.17.5"; - sha256 = "1a0zj505nhpfcj19qvjy2hvc5a7gadykv51y0rc6032qhzzsgca2"; + version = "14.17.6"; + sha256 = "0pmd0haav2ychhcsw44klx6wfn8c7j1rsw08rc8hcm5i3h5wsn7l"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } From 9f5b3edda9c68635cacaedcd9e543a61b48d1901 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 5 Jul 2021 04:20:00 +0000 Subject: [PATCH 05/13] nodejs-16_x: 16.4.1 -> 16.4.2 https://github.com/nodejs/node/releases/tag/v16.4.2 (cherry picked from commit 77f710d74c5bb9feca2d95b130dd3c4c3732822b) --- pkgs/development/web/nodejs/v16.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix index 305baadecac..350abed7ec7 100644 --- a/pkgs/development/web/nodejs/v16.nix +++ b/pkgs/development/web/nodejs/v16.nix @@ -8,6 +8,6 @@ let in buildNodejs { inherit enableNpm; - version = "16.4.1"; - sha256 = "1a1aygksmbafxvrs8g2jv0y1jj3cwyclk0qbqxkn5qfq5r1i943n"; + version = "16.4.2"; + sha256 = "048x4vznpi6dai6fripg0yk21kfxm9s2mw7jb0rzisyv5aw8v2dj"; } From b8ecf1d1794cbed9f30bf63a652bd6920061508c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 14 Jul 2021 08:27:09 -0500 Subject: [PATCH 06/13] nodejs-16_x: 16.4.2 -> 16.5.0 https://github.com/nodejs/node/releases/tag/v16.5.0 (cherry picked from commit cf8defb1dd5c4351c5c0e85c1481bb5be58759e0) --- pkgs/development/web/nodejs/v16.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix index 350abed7ec7..766df734a4a 100644 --- a/pkgs/development/web/nodejs/v16.nix +++ b/pkgs/development/web/nodejs/v16.nix @@ -8,6 +8,6 @@ let in buildNodejs { inherit enableNpm; - version = "16.4.2"; - sha256 = "048x4vznpi6dai6fripg0yk21kfxm9s2mw7jb0rzisyv5aw8v2dj"; + version = "16.5.0"; + sha256 = "16dapj5pm2y1m3ldrjjlz8rq9axk85nn316iz02nk6qjs66y6drz"; } From 726a6358b9de87795be5af44205478bf2ddab819 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 29 Jul 2021 04:20:00 +0000 Subject: [PATCH 07/13] nodejs-16_x: 16.5.0 -> 16.6.0 https://github.com/nodejs/node/releases/tag/v16.6.0 (cherry picked from commit f5de4158dd462c51741ec48be2e47a3f8015930d) --- pkgs/development/web/nodejs/v16.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix index 766df734a4a..c89b48ae3dd 100644 --- a/pkgs/development/web/nodejs/v16.nix +++ b/pkgs/development/web/nodejs/v16.nix @@ -8,6 +8,6 @@ let in buildNodejs { inherit enableNpm; - version = "16.5.0"; - sha256 = "16dapj5pm2y1m3ldrjjlz8rq9axk85nn316iz02nk6qjs66y6drz"; + version = "16.6.0"; + sha256 = "1ndrqx3k5m62r7nzl5za59m33bx10541n7xbaxxz7088ifh18msw"; } From e9448d6282c7994b6996ec132b784cd402c91ee7 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 4 Aug 2021 07:17:19 -0500 Subject: [PATCH 08/13] Revert "nodejs-16_x: 16.5.0 -> 16.6.0" Node.js 16.6.0 fails to build on Darwin This reverts commit f5de4158dd462c51741ec48be2e47a3f8015930d. (cherry picked from commit ae780c6e7d454e3d20b5ae34d15981eaf75cf062) --- pkgs/development/web/nodejs/v16.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix index c89b48ae3dd..766df734a4a 100644 --- a/pkgs/development/web/nodejs/v16.nix +++ b/pkgs/development/web/nodejs/v16.nix @@ -8,6 +8,6 @@ let in buildNodejs { inherit enableNpm; - version = "16.6.0"; - sha256 = "1ndrqx3k5m62r7nzl5za59m33bx10541n7xbaxxz7088ifh18msw"; + version = "16.5.0"; + sha256 = "16dapj5pm2y1m3ldrjjlz8rq9axk85nn316iz02nk6qjs66y6drz"; } From bcbbb4bc44c2a9e99d6ae997a507b46061a2f9d7 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 4 Aug 2021 08:22:00 -0500 Subject: [PATCH 09/13] nodejs-16_x: add patch for CVE-2021-22930 (cherry picked from commit c73d1006a216134713593a54686bca21976b443e) --- pkgs/development/web/nodejs/v16.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix index 766df734a4a..494edc1e997 100644 --- a/pkgs/development/web/nodejs/v16.nix +++ b/pkgs/development/web/nodejs/v16.nix @@ -1,4 +1,4 @@ -{ callPackage, openssl, python3, enableNpm ? true }: +{ callPackage, openssl, python3, fetchpatch, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { @@ -10,4 +10,12 @@ in inherit enableNpm; version = "16.5.0"; sha256 = "16dapj5pm2y1m3ldrjjlz8rq9axk85nn316iz02nk6qjs66y6drz"; + patches = [ + # Fix CVE-2021-22930 https://github.com/nodejs/node/pull/39423. + # It should be fixed by Node.js 16.6.0, but currently it fails to build on Darwin + (fetchpatch { + url = "https://github.com/nodejs/node/commit/9d950a0956bf2c3dd87bacb56807f37e16a91db4.patch"; + sha256 = "1narhk5dqdkbndh9hg0dn5ghhgrd6gsamjqszpivmp33nl5hgsx3"; + }) + ]; } From 4795a1882d78dcc350730c9ab17a3cacb538abfd Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 8 Aug 2021 04:20:00 +0000 Subject: [PATCH 10/13] nodejs-16_x: 16.5.0 -> 16.6.1 https://github.com/nodejs/node/releases/tag/v16.6.0 https://github.com/nodejs/node/releases/tag/v16.6.1 (cherry picked from commit 0066c05ae2cfa7b7d56b8bd47468bb34d45fb092) --- ...isable-darwin-v8-system-instrumentation.patch | 16 ++++++++++++++++ pkgs/development/web/nodejs/v16.nix | 15 ++++----------- 2 files changed, 20 insertions(+), 11 deletions(-) create mode 100644 pkgs/development/web/nodejs/disable-darwin-v8-system-instrumentation.patch diff --git a/pkgs/development/web/nodejs/disable-darwin-v8-system-instrumentation.patch b/pkgs/development/web/nodejs/disable-darwin-v8-system-instrumentation.patch new file mode 100644 index 00000000000..63e9107b33d --- /dev/null +++ b/pkgs/development/web/nodejs/disable-darwin-v8-system-instrumentation.patch @@ -0,0 +1,16 @@ +Disable v8 system instrumentation on Darwin + +On Darwin, the v8 system instrumentation requires the header "os/signpost.h" +which is available since apple_sdk 11+. See: https://github.com/nodejs/node/issues/39584 + +--- old/tools/v8_gypfiles/features.gypi ++++ new/tools/v8_gypfiles/features.gypi +@@ -62,7 +62,7 @@ + }, { + 'is_component_build': 0, + }], +- ['OS == "win" or OS == "mac"', { ++ ['OS == "win"', { + # Sets -DSYSTEM_INSTRUMENTATION. Enables OS-dependent event tracing + 'v8_enable_system_instrumentation': 1, + }, { diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix index 494edc1e997..bee01d7aae2 100644 --- a/pkgs/development/web/nodejs/v16.nix +++ b/pkgs/development/web/nodejs/v16.nix @@ -1,4 +1,4 @@ -{ callPackage, openssl, python3, fetchpatch, enableNpm ? true }: +{ callPackage, openssl, python3, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { @@ -8,14 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "16.5.0"; - sha256 = "16dapj5pm2y1m3ldrjjlz8rq9axk85nn316iz02nk6qjs66y6drz"; - patches = [ - # Fix CVE-2021-22930 https://github.com/nodejs/node/pull/39423. - # It should be fixed by Node.js 16.6.0, but currently it fails to build on Darwin - (fetchpatch { - url = "https://github.com/nodejs/node/commit/9d950a0956bf2c3dd87bacb56807f37e16a91db4.patch"; - sha256 = "1narhk5dqdkbndh9hg0dn5ghhgrd6gsamjqszpivmp33nl5hgsx3"; - }) - ]; + version = "16.6.1"; + sha256 = "0mz5wfhf2k1qf3d57h4r8b30izhyg93g5m9c8rljlzy6ih2ymcbr"; + patches = [ ./disable-darwin-v8-system-instrumentation.patch ]; } From dc9e1a31fbf6b0cac36431a30e37e2a8977cf249 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 11 Aug 2021 19:02:00 -0500 Subject: [PATCH 11/13] nodejs-16_x: 16.6.1 -> 16.6.2 https://github.com/nodejs/node/releases/tag/v16.6.2 (cherry picked from commit 898660842e9cde1e9b8ef154b25361cdaee3b612) --- pkgs/development/web/nodejs/v16.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix index bee01d7aae2..e0aa5fb7bd3 100644 --- a/pkgs/development/web/nodejs/v16.nix +++ b/pkgs/development/web/nodejs/v16.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "16.6.1"; - sha256 = "0mz5wfhf2k1qf3d57h4r8b30izhyg93g5m9c8rljlzy6ih2ymcbr"; + version = "16.6.2"; + sha256 = "1svrkm2zq8dyvw2l7gvgm75x2fqarkbpc33970521r3iz6hwp547"; patches = [ ./disable-darwin-v8-system-instrumentation.patch ]; } From 32e7630d8a1ef68842d1137d060f50f1b5f4bfdb Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 22 Aug 2021 13:45:05 -0500 Subject: [PATCH 12/13] nodejs-16_x: 16.6.2 -> 16.7.0 https://github.com/nodejs/node/releases/tag/v16.7.0 (cherry picked from commit f3706ab27f99b2ffdaeb6dd03ee6e2f26511c6db) --- pkgs/development/web/nodejs/v16.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix index e0aa5fb7bd3..113f0cf95c0 100644 --- a/pkgs/development/web/nodejs/v16.nix +++ b/pkgs/development/web/nodejs/v16.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "16.6.2"; - sha256 = "1svrkm2zq8dyvw2l7gvgm75x2fqarkbpc33970521r3iz6hwp547"; + version = "16.7.0"; + sha256 = "0drd7zyadjrhng9k0mspz456j3pmr7kli5dd0kx8grbqsgxzv1gs"; patches = [ ./disable-darwin-v8-system-instrumentation.patch ]; } From a2303a63e45a70c10ad90045f910ac2b3a7ee05d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 25 Aug 2021 22:30:44 -0500 Subject: [PATCH 13/13] nodejs-16_x: 16.7.0 -> 16.8.0 https://github.com/nodejs/node/releases/tag/v16.8.0 (cherry picked from commit 372b7ce697010444e41e4a89428aed05fd4fe7bc) --- pkgs/development/web/nodejs/v16.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix index 113f0cf95c0..805e62be8d6 100644 --- a/pkgs/development/web/nodejs/v16.nix +++ b/pkgs/development/web/nodejs/v16.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "16.7.0"; - sha256 = "0drd7zyadjrhng9k0mspz456j3pmr7kli5dd0kx8grbqsgxzv1gs"; + version = "16.8.0"; + sha256 = "14k3njj382im3q4k6dhsxdk07gs81hw2k0nrixfvlw1964k04ydq"; patches = [ ./disable-darwin-v8-system-instrumentation.patch ]; }