diff options
| author | Robin Gloster <mail@glob.in> | 2021-05-24 09:55:24 -0500 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2021-05-24 09:55:24 -0500 |
| commit | 4bc5fbef9d159e143fb7e2c3231932e6e76f667c (patch) | |
| tree | e2198f5c552e0667d838b8ec764ddb3a4d8f6dec /pkgs/misc/vscode-extensions/terraform | |
| parent | jq: fix build with structured-attrs on darwin (diff) | |
| parent | Merge pull request #123802 from superherointj/package-virtmanager-bugfix (diff) | |
| download | nixpkgs-origin/structured-attrs.tar.gz | |
Merge remote-tracking branch 'upstream/master' into structured-attrsorigin/structured-attrs
Diffstat (limited to 'pkgs/misc/vscode-extensions/terraform')
| -rw-r--r-- | pkgs/misc/vscode-extensions/terraform/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch | 11 |
2 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/misc/vscode-extensions/terraform/default.nix b/pkgs/misc/vscode-extensions/terraform/default.nix index 592994c33147..44e2bdb1005c 100644 --- a/pkgs/misc/vscode-extensions/terraform/default.nix +++ b/pkgs/misc/vscode-extensions/terraform/default.nix @@ -3,13 +3,13 @@ vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "terraform"; publisher = "hashicorp"; - version = "2.10.0"; + version = "2.11.0"; }; 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 = "1xhypy4vvrzxj3qwkzpfx8b48hddf72mxmh0hgz7iry6bch6sh5f"; + sha256 = "0wqdya353b415qxs8jczmis3q6d8fddv1pdd8jdd0w64s1ibv3sy"; }; patches = [ ./fix-terraform-ls.patch ]; diff --git a/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch b/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch index d91ffcc17ab4..95e8d92da332 100644 --- a/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch +++ b/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch @@ -1,11 +1,11 @@ diff --git a/out/extension.js b/out/extension.js -index e44cef2..fba0899 100644 +index e932d27..099126b 100644 --- a/out/extension.js +++ b/out/extension.js -@@ -141,24 +141,6 @@ function updateLanguageServer() { +@@ -143,25 +143,6 @@ function updateLanguageServer() { return __awaiter(this, void 0, void 0, function* () { - const delay = 1000 * 60 * 24; - setTimeout(updateLanguageServer, delay); // check for new updates every 24hrs + const delay = 1000 * 60 * 60 * 24; + languageServerUpdater.timeout(updateLanguageServer, delay); // check for new updates every 24hrs - // skip install if a language server binary path is set - if (!vscodeUtils_1.config('terraform').get('languageServer.pathToBinary')) { - const installer = new languageServerInstaller_1.LanguageServerInstaller(installPath, reporter); @@ -16,6 +16,7 @@ index e44cef2..fba0899 100644 - yield installer.install(); - } - catch (err) { +- console.log(err); // for test failure reporting - reporter.sendTelemetryException(err); - throw err; - } @@ -27,7 +28,7 @@ index e44cef2..fba0899 100644 return startClients(); // on repeat runs with no install, this will be a no-op }); } -@@ -256,7 +238,7 @@ function pathToBinary() { +@@ -259,7 +240,7 @@ function pathToBinary() { reporter.sendTelemetryEvent('usePathToBinary'); } else { |