Merge staging-next into staging

This commit is contained in:
github-actions[bot]
2021-01-30 12:23:09 +00:00
committed by GitHub
42 changed files with 387 additions and 113 deletions
+1 -1
View File
@@ -6,7 +6,7 @@
let
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;
};
+1 -1
View File
@@ -6,7 +6,7 @@
let
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;
};