Merge master into staging-next

2021-03-16 00:39:08 +00:00
parent 4915d2cb4c fee2e23c00
commit d18aaddde4
65 changed files with 1953 additions and 2070 deletions
--- a/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json
+++ b/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json
@@ -2,6 +2,7 @@
  "name": "rust-analyzer",
  "version": "0.4.0-dev",
  "dependencies": {
+    "https-proxy-agent": "^5.0.0",
    "node-fetch": "^2.6.1",
    "vscode-languageclient": "^7.1.0-next.4",
    "@rollup/plugin-commonjs": "^17.0.0",