Merge master into staging-next

2021-03-09 00:39:09 +00:00
parent 3521dc45ed 909cd83cb2
commit 3db2dee35f
65 changed files with 2594 additions and 1218 deletions
--- a/pkgs/development/web/nodejs/v15.nix
+++ b/pkgs/development/web/nodejs/v15.nix
@@ -8,6 +8,6 @@ let
 in
  buildNodejs {
    inherit enableNpm;
-    version = "15.10.0";
-    sha256 = "1i7fdlkkyh5ssncbvxmiz894a12mww4cmj7y4qzm9ddbbvqxhj3p";
+    version = "15.11.0";
+    sha256 = "1lfjm0jgzbr0a874c04pddbjnvjcdyx5vyaakdhp0fa222i92w0s";
  }