Merge staging-next into staging

2019-08-31 10:04:20 +02:00
parent ebe4fd146b fc74ba8291
commit ad1d58c622
364 changed files with 8970 additions and 6854 deletions
@@ -5,7 +5,7 @@
  }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs-10_x}:

 let
-  nodeEnv = import ./node-env.nix {
+  nodeEnv = import ../../../node-packages/node-env.nix {
    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
    inherit nodejs;
    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;