Merge branch 'staging-next' into staging

The transmission conflict was non-trivial:
- libbrotli added to apparmor rules <https://github.com/NixOS/nixpkgs/commit/1bdda029cd85b5f4358697afd2c8f6a1996c6ccf>
- apparmor rules rewritten <https://github.com/NixOS/nixpkgs/commit/b280e64078d69c59cf4fccfcaa9d56a59d789dc9>

Chosen the rewrite and verified that brotli is part of the rule set generated by `apparmorRulesFromClosure`.
This commit is contained in:
Jan Tojnar
2021-05-06 08:42:50 +02:00
73 changed files with 365 additions and 304 deletions
@@ -3,13 +3,13 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
mktplcRef = {
name = "terraform";
publisher = "hashicorp";
version = "2.10.1";
version = "2.10.2";
};
vsix = fetchurl {
name = "${mktplcRef.publisher}-${mktplcRef.name}.zip";
url = "https://github.com/hashicorp/vscode-terraform/releases/download/v${mktplcRef.version}/${mktplcRef.name}-${mktplcRef.version}.vsix";
sha256 = "1galibrk4fx4qwa6q17mmwlikx78nmhgv1h98haiyak666cinzcq";
sha256 = "0fkkjkybjshgzbkc933jscxyxqwmqnhq3718pnw9hsac8qv0grrz";
};
patches = [ ./fix-terraform-ls.patch ];