public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #93618 from marsam/update-nodejs-10_x 

nodejs: 10.21.0 -> 10.22.0, 12.18.2 -> 12.18.3, 14.5.0 -> 14.6.0
This commit is contained in:
Mario Rodas 2020-07-22 23:20:03 -05:00 committed by GitHub
parent 7d557a5d1b 8b0e3c75ed
commit 399b1773c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/web/nodejs/v10.nix
View File

@ -8,6 +8,6 @@ let
in in
buildNodejs { buildNodejs {
inherit enableNpm; inherit enableNpm;
version = "10.21.0"; version = "10.22.0";
sha256 = "0fxpvjm3gyfwapn55av8q9w1ds0l4nmn6ybdlslcmjiqhfi1zc16"; sha256 = "1nz18fa550li10r0kzsm28c2rvvq61nq8bqdygip0rmvbi2paxg0";
} }

4
pkgs/development/web/nodejs/v12.nix
View File

@ -8,6 +8,6 @@ let
in in
buildNodejs { buildNodejs {
inherit enableNpm; inherit enableNpm;
version = "12.18.2"; version = "12.18.3";
sha256 = "1wnxab2shqgs5in0h39qy2fc7f32pcz4gl9i2mj1001pfani1g9q"; sha256 = "03hdds6ghlmbz8q61alqj18pdnyd6hxmbhiws4pl51wlawk805bi";
} }

13
pkgs/development/web/nodejs/v13.nix
View File

@ -1,13 +0,0 @@
{ callPackage, openssl, icu, python3, enableNpm ? true }:
let
buildNodejs = callPackage ./nodejs.nix {
inherit openssl icu;
python = python3;
};
in
buildNodejs {
inherit enableNpm;
version = "13.14.0";
sha256 = "1gi9nl99wsiqpwm266jdsa8g6rmjw4wqwgrkx9f2qk1y3hjcs0vf";
}

8
pkgs/development/web/nodejs/v14.nix
View File

@ -1,14 +1,14 @@
{ callPackage, openssl, icu66, python3, enableNpm ? true }: { callPackage, openssl, icu67, python3, enableNpm ? true }:
let let
buildNodejs = callPackage ./nodejs.nix { buildNodejs = callPackage ./nodejs.nix {
inherit openssl; inherit openssl;
icu = icu66; icu = icu67;
python = python3; python = python3;
}; };
in in
buildNodejs { buildNodejs {
inherit enableNpm; inherit enableNpm;
version = "14.5.0"; version = "14.6.0";
sha256 = "1d6w7ycdiqbkip7m6m8xly31qgx7ywakzvrnqdq8ini5sricjlgb"; sha256 = "153a07ffrmvwbsc78wrc0xnwymmzrhva0kn6mgnfi3086v3h1wss";
} }

6
pkgs/top-level/all-packages.nix
View File

@ -4903,10 +4903,6 @@ in
nodejs-slim-12_x = callPackage ../development/web/nodejs/v12.nix { nodejs-slim-12_x = callPackage ../development/web/nodejs/v12.nix {
enableNpm = false; enableNpm = false;
}; };
nodejs-13_x = callPackage ../development/web/nodejs/v13.nix { };
nodejs-slim-13_x = callPackage ../development/web/nodejs/v13.nix {
enableNpm = false;
};
nodejs-14_x = callPackage ../development/web/nodejs/v14.nix { }; nodejs-14_x = callPackage ../development/web/nodejs/v14.nix { };
nodejs-slim-14_x = callPackage ../development/web/nodejs/v14.nix { nodejs-slim-14_x = callPackage ../development/web/nodejs/v14.nix {
enableNpm = false; enableNpm = false;
@ -9680,7 +9676,7 @@ in
kanif = callPackage ../applications/networking/cluster/kanif { }; kanif = callPackage ../applications/networking/cluster/kanif { };
lumo = callPackage ../development/interpreters/clojurescript/lumo { lumo = callPackage ../development/interpreters/clojurescript/lumo {
nodejs = nodejs-13_x; nodejs = nodejs_latest;
}; };
lxappearance = callPackage ../desktops/lxde/core/lxappearance { }; lxappearance = callPackage ../desktops/lxde/core/lxappearance { };