git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #113409 from rhoriguchi/vscode-extensions/hashicorp.terraform

vscode-extensions.hashicorp.terraform: Init at 2.6.0

commit5db1943bda106137c62b5a677fd03585bce49be7 authorSandro <sandro.jaeckel@gmail.com> dateThu 18 Feb 2021, 04:01 (6 years ago) parentadf9976dcc609c
3 files changed+52
pkgs/misc/vscode-extensions/default.nix+2 pkgs/misc/vscode-extensions/terraform/default.nix+25 pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch+25
pkgs/misc/vscode-extensions/default.nix+2
@@ -357,6 +357,8 @@ let
357357 };
358358 };
359359
360+ hashicorp.terraform = callPackage ./terraform {};
361+
360362 hookyqr.beautify = buildVscodeMarketplaceExtension {
361363 mktplcRef = {
362364 name = "beautify";
pkgs/misc/vscode-extensions/terraform/default.nixnew file+25
@@ -0,0 +1,25 @@
1+{ lib, fetchurl, vscode-utils, terraform-ls }:
2+vscode-utils.buildVscodeMarketplaceExtension rec {
3+ mktplcRef = {
4+ name = "terraform";
5+ publisher = "hashicorp";
6+ version = "2.6.0";
7+ };
8+
9+ vsix = fetchurl {
10+ name = "${mktplcRef.publisher}-${mktplcRef.name}.zip";
11+ url = "https://github.com/hashicorp/vscode-terraform/releases/download/v${mktplcRef.version}/terraform-${mktplcRef.version}.vsix";
12+ sha256 = "1zg90x2asl6gakd2w8fn4imllqgrzdb1dn3728s63blmml42a1xp";
13+ };
14+
15+ patches = [ ./fix-terraform-ls.patch ];
16+
17+ postPatch = ''
18+ substituteInPlace out/extension.js --replace TERRAFORM-LS-PATH ${terraform-ls}/bin/terraform-ls
19+ '';
20+
21+ meta = with lib; {
22+ license = licenses.mit;
23+ maintainers = with maintainers; [ rhoriguchi ];
24+ };
25+}
pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patchnew file+25
@@ -0,0 +1,25 @@
1+diff --git a/out/extension.js b/out/extension.js
2+index 1de8aab..e2b3a3e 100644
3+--- a/out/extension.js
4++++ b/out/extension.js
5+@@ -204,19 +204,7 @@ function pathToBinary() {
6+ if (!_pathToBinaryPromise) {
7+ let command = vscodeUtils_1.config('terraform').get('languageServer.pathToBinary');
8+ if (!command) { // Skip install/upgrade if user has set custom binary path
9+- const installDir = `${extensionPath}/lsp`;
10+- const installer = new languageServerInstaller_1.LanguageServerInstaller();
11+- try {
12+- yield installer.install(installDir);
13+- }
14+- catch (err) {
15+- vscode.window.showErrorMessage(err);
16+- throw err;
17+- }
18+- finally {
19+- yield installer.cleanupZips(installDir);
20+- }
21+- command = `${installDir}/terraform-ls`;
22++ command = 'TERRAFORM-LS-PATH';
23+ }
24+ _pathToBinaryPromise = Promise.resolve(command);
25+ }