Merge master into staging-next

2021-05-13 18:32:50 +00:00
parent 7465594428 48c25a9eaf
commit 39e3f7c2cc
46 changed files with 274 additions and 121 deletions
@@ -2,8 +2,11 @@
 }:
 with nixpkgs;
 mkShell {
-  buildInputs = [
-    bash luarocks-nix nix-prefetch-scripts parallel
+  packages = [
+    bash
+    luarocks-nix
+    nix-prefetch-scripts
+    parallel
  ];
  LUAROCKS_NIXPKGS_PATH = toString nixpkgs.path;
 }