Merge pull request #129053 from marsam/backport-128928-to-release-21.05

[21.05] nodejs: 12.22.1 -> 12.22.2, 14.17.0 -> 14.17.2, 16.2.0 -> 16.4.1
This commit is contained in:
Mario Rodas 2021-07-02 19:47:46 -05:00 committed by GitHub
commit 91b3d48d6e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 22 deletions

View File

@ -235,7 +235,7 @@ let
git git
# replace with beam.packages.erlang.elixir_1_11 if you need # replace with beam.packages.erlang.elixir_1_11 if you need
beam.packages.erlang.elixir beam.packages.erlang.elixir
nodejs-15_x nodejs
postgresql_13 postgresql_13
# only used for frontend dependencies # only used for frontend dependencies
# you are free to use yarn2nix as well # you are free to use yarn2nix as well

View File

@ -8,7 +8,7 @@ let
in in
buildNodejs { buildNodejs {
inherit enableNpm; inherit enableNpm;
version = "12.22.1"; version = "12.22.2";
sha256 = "12drpkffn79xx84pffg9y2cn9fiwycgaa2rjj3ix6visfzvhsrfx"; sha256 = "1p281hdw3y32pnbfr7cdc9igv2yrzqg16pn4yj3g01pi3mbhbn3z";
patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
} }

View File

@ -1,14 +1,13 @@
{ callPackage, icu68, python3, lib, stdenv, enableNpm ? true }: { callPackage, python3, lib, stdenv, enableNpm ? true }:
let let
buildNodejs = callPackage ./nodejs.nix { buildNodejs = callPackage ./nodejs.nix {
icu = icu68;
python = python3; python = python3;
}; };
in in
buildNodejs { buildNodejs {
inherit enableNpm; inherit enableNpm;
version = "14.17.0"; version = "14.17.2";
sha256 = "1vf989canwcx0wdpngvkbz2x232yccp7fzs1vcbr60rijgzmpq2n"; sha256 = "0gjq61l1lm15bv47w0phil44nbh0fsq3mmqf40xxlm92gswb4psg";
patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
} }

View File

@ -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";
}

View File

@ -8,6 +8,6 @@ let
in in
buildNodejs { buildNodejs {
inherit enableNpm; inherit enableNpm;
version = "16.2.0"; version = "16.4.1";
sha256 = "1krm3cnpbnqg4mfl3cpp8x2i1rr6hba9qbl60wyg5f5g8ac3pyfh"; sha256 = "1a1aygksmbafxvrs8g2jv0y1jj3cwyclk0qbqxkn5qfq5r1i943n";
} }