From e12702b5991efab3b27f4c1850b5bb6af9363d15 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 15 Jun 2021 04:20:00 +0000 Subject: [PATCH 1/8] nodejs-14_x: 14.17.0 -> 14.17.1 https://github.com/nodejs/node/releases/tag/v14.17.1 (cherry picked from commit 3a61dc3cae9ed275ab6da0c577d828734ac99295) --- pkgs/development/web/nodejs/v14.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix index 7054e4c66b8..27b2a4f3319 100644 --- a/pkgs/development/web/nodejs/v14.nix +++ b/pkgs/development/web/nodejs/v14.nix @@ -1,14 +1,13 @@ -{ callPackage, icu68, python3, lib, stdenv, enableNpm ? true }: +{ callPackage, python3, lib, stdenv, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { - icu = icu68; python = python3; }; in buildNodejs { inherit enableNpm; - version = "14.17.0"; - sha256 = "1vf989canwcx0wdpngvkbz2x232yccp7fzs1vcbr60rijgzmpq2n"; + version = "14.17.1"; + sha256 = "0zr4b9gja8f9611rnmc9yacmh90bd76xv9ayikcyqdfzdpax5wfx"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } From 37573d9874d8ddddabda1837cc9d4b4a80b48b46 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 3 Jun 2021 04:20:00 +0000 Subject: [PATCH 2/8] nodejs-16_x: 16.2.0 -> 16.3.0 https://github.com/nodejs/node/releases/tag/v16.3.0 (cherry picked from commit 969eb59f2f253112339dac99e429fb01b7a48bf4) --- 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 dec02ad22f5..a97f3383a6b 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.2.0"; - sha256 = "1krm3cnpbnqg4mfl3cpp8x2i1rr6hba9qbl60wyg5f5g8ac3pyfh"; + version = "16.3.0"; + sha256 = "0pxcdy9i1iyxp4afmpaz30ajlwrj74y64jl3n9rjqw0r5jw4gavs"; } From 1e27742a0c5b052c49a3e1e68dffbcecea6c1fdc Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 23 Jun 2021 04:20:00 +0000 Subject: [PATCH 3/8] nodejs-16_x: 16.3.0 -> 16.4.0 https://github.com/nodejs/node/releases/tag/v16.4.0 (cherry picked from commit c50bd80253a3066af270466909f0f53b0adc4b04) --- 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 a97f3383a6b..8514baec8b1 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.3.0"; - sha256 = "0pxcdy9i1iyxp4afmpaz30ajlwrj74y64jl3n9rjqw0r5jw4gavs"; + version = "16.4.0"; + sha256 = "07f8g3hs0v7nsdvzlsr1p4pzgb04qn54pnhmbdsgmmb41cp227pr"; } From 77f9266ab706b30a712b53cd55be12ab69ebdd7f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 1 Jul 2021 04:20:00 +0000 Subject: [PATCH 4/8] nodejs-12_x: 12.22.1 -> 12.22.2 https://github.com/nodejs/node/releases/tag/v12.22.2 (cherry picked from commit a7a66aa2ea8715d5ce043f24d408a21fedf83c5f) --- 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 7fad6a020a8..776f84309da 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.1"; - sha256 = "12drpkffn79xx84pffg9y2cn9fiwycgaa2rjj3ix6visfzvhsrfx"; + version = "12.22.2"; + sha256 = "1p281hdw3y32pnbfr7cdc9igv2yrzqg16pn4yj3g01pi3mbhbn3z"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } From 3de5eef80f53a90ef0affef2090967edf7999edc Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 1 Jul 2021 04:20:00 +0000 Subject: [PATCH 5/8] nodejs-14_x: 14.17.1 -> 14.17.2 https://github.com/nodejs/node/releases/tag/v14.17.2 (cherry picked from commit 282c97bb2766590e12e8d393240fe63c235bfdf0) --- 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 27b2a4f3319..6271401a0f4 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.1"; - sha256 = "0zr4b9gja8f9611rnmc9yacmh90bd76xv9ayikcyqdfzdpax5wfx"; + version = "14.17.2"; + sha256 = "0gjq61l1lm15bv47w0phil44nbh0fsq3mmqf40xxlm92gswb4psg"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } From 0cde4bf18f77b2cc9c9fb3fdefa35492f1e905c8 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 1 Jul 2021 04:20:00 +0000 Subject: [PATCH 6/8] nodejs-16_x: 16.4.0 -> 16.4.1 https://github.com/nodejs/node/releases/tag/v16.4.1 (cherry picked from commit 4f90b61a11496e16d2e460301b73426ddd2be0b8) --- 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 8514baec8b1..305baadecac 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.0"; - sha256 = "07f8g3hs0v7nsdvzlsr1p4pzgb04qn54pnhmbdsgmmb41cp227pr"; + version = "16.4.1"; + sha256 = "1a1aygksmbafxvrs8g2jv0y1jj3cwyclk0qbqxkn5qfq5r1i943n"; } From 5225ed8b954e18907d5b20414ff10e1fdeee5ecd Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 1 Jul 2021 04:20:00 +0000 Subject: [PATCH 7/8] nodejs-15_x: remove expression Node.js 15 has reached EOL on June 1, 2021. (cherry picked from commit fd918d34bdbe94797afd6ca10cd4d578acce7943) --- pkgs/development/web/nodejs/v15.nix | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 pkgs/development/web/nodejs/v15.nix diff --git a/pkgs/development/web/nodejs/v15.nix b/pkgs/development/web/nodejs/v15.nix deleted file mode 100644 index e6903098b30..00000000000 --- a/pkgs/development/web/nodejs/v15.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ callPackage, icu68, python3, enableNpm ? true }: - -let - buildNodejs = callPackage ./nodejs.nix { - icu = icu68; - python = python3; - }; -in - buildNodejs { - inherit enableNpm; - version = "15.14.0"; - sha256 = "0vm6jdazqjd1plqsgngzvjrafv2d3mdahk6il4ray02gx97dq8l1"; - } From 6af75274fc957c5b0d7af7da3e2bdd21d82236c7 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 1 Jul 2021 04:20:00 +0000 Subject: [PATCH 8/8] beam: update reference to nodejs package nodejs-15_x has reached EOL, and removed from nixpkgs. (cherry picked from commit 39916f933ebef93e473115c5160e285d76d30133) --- doc/languages-frameworks/beam.section.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/languages-frameworks/beam.section.md b/doc/languages-frameworks/beam.section.md index c8dd3f9ed11..b4cb2edbe41 100644 --- a/doc/languages-frameworks/beam.section.md +++ b/doc/languages-frameworks/beam.section.md @@ -235,7 +235,7 @@ let git # replace with beam.packages.erlang.elixir_1_11 if you need beam.packages.erlang.elixir - nodejs-15_x + nodejs postgresql_13 # only used for frontend dependencies # you are free to use yarn2nix as well