Merge staging-next into staging

2019-07-03 08:59:42 +02:00
parent d41bc0ff56 3ad01beda7
commit 25a77b7210
411 changed files with 4314 additions and 2253 deletions
--- a/pkgs/development/web/nodejs/v12.nix
+++ b/pkgs/development/web/nodejs/v12.nix
@@ -5,6 +5,6 @@ let
 in
  buildNodejs {
    inherit enableNpm;
-    version = "12.4.0";
-    sha256 = "1qwcv8m1m3293vmb4x2xrpqlpaa1r1951gf0mva60b2hsdk27d90";
+    version = "12.5.0";
+    sha256 = "08haqs104lw44l92bxfii18sdn7y1k07cz3p0ni9bhw7kh4vf5c7";
  }