Merge staging-next into staging

2021-01-30 12:23:09 +00:00
parent 2c6ca9ac8a 9513e74a50
commit 8dbc95f67b
42 changed files with 387 additions and 113 deletions
@@ -10,7 +10,7 @@ let
    inherit (pkgs) fetchurl fetchgit;
  });
  nodeEnv = import ../../development/node-packages/node-env.nix {
-    inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
+    inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile;
    inherit nodejs;
    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
  };