Merge master into staging-next

2019-08-02 09:18:37 +02:00
parent 55e4555b77 7d4f67a23f
commit 6f723b9bad
104 changed files with 9648 additions and 15712 deletions
@@ -1,10 +0,0 @@
-{ callPackage, enableNpm ? true }:
-
-let
-  buildNodejs = callPackage ./nodejs.nix {};
-in
-  buildNodejs {
-    inherit enableNpm;
-    version = "8.16.0";
-    sha256 = "0h3k5y51fyysqnqb8n5v5zxga937pipag49xzx6xr9b82phfh59m";
-  }
@@ -2,7 +2,7 @@

 {pkgs ? import <nixpkgs> {
    inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:

 let
  nodeEnv = import ../../node-packages/node-env.nix {