Merge branch 'staging-next' into staging

This commit is contained in:
Jan Tojnar
2020-07-23 08:32:33 +02:00
80 changed files with 6010 additions and 1879 deletions

View File

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

View File

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

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

View File

@@ -8,6 +8,6 @@ let
in
buildNodejs {
inherit enableNpm;
version = "14.5.0";
sha256 = "1d6w7ycdiqbkip7m6m8xly31qgx7ywakzvrnqdq8ini5sricjlgb";
version = "14.6.0";
sha256 = "153a07ffrmvwbsc78wrc0xnwymmzrhva0kn6mgnfi3086v3h1wss";
}