public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2021-03-11 00:39:21 +00:00
committed by GitHub
parent 6a3a358b0d 74fd954e6f
commit 0a8ec23e51
48 changed files with 1450 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/misc/vim-plugins/generated.nix
+218 -218
View File
File diff suppressed because it is too large Load Diff
pkgs/misc/vim-plugins/overrides.nix
+1 -1
View File
@@ -729,7 +729,7 @@ self: super: {
libiconv
];
cargoSha256 = "042dbg80mx0khm8xahm4l490s7bfbav362r0mz5bfhq4fy2s9nsi";
cargoSha256 = "F+kIVnO7MBuaYRa2MPsD3eQ2d5W5VxHhxHKeo/ic6TE=";
};
in
''
pkgs/misc/vim-plugins/vim-plugin-names
+1 -1
View File
@@ -627,7 +627,7 @@ tpope/vim-tbone
tpope/vim-unimpaired
tpope/vim-vinegar
travitch/hasksyn
tremor-rs/tremor-vim
tremor-rs/tremor-vim@main
triglav/vim-visual-increment
troydm/zoomwintab.vim
twerth/ir_black
pkgs/misc/vscode-extensions/terraform/default.nix
+2 -2
View File
@@ -3,13 +3,13 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
mktplcRef = {
name = "terraform";
publisher = "hashicorp";
version = "2.7.0";
version = "2.8.1";
};
vsix = fetchurl {
name = "${mktplcRef.publisher}-${mktplcRef.name}.zip";
url = "https://github.com/hashicorp/vscode-terraform/releases/download/v${mktplcRef.version}/terraform-${mktplcRef.version}.vsix";
sha256 = "0lpsng7rd88ppjybmypzw42czr6swwin5cyl78v36z3wjwqx26xp";
sha256 = "1pdpl8diqybqf68jvfk4kq9wg4k6c38811mh8iq12j4ba31cig9s";
};
patches = [ ./fix-terraform-ls.patch ];
pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch
+5 -6
View File
@@ -1,18 +1,17 @@
diff --git a/out/extension.js b/out/extension.js
index 375048c..fa5eff0 100644
index 4a2c6a9..158fe28 100644
--- a/out/extension.js
+++ b/out/extension.js
@@ -209,20 +209,7 @@ function pathToBinary() {
@@ -215,19 +215,7 @@ function pathToBinary() {
if (!_pathToBinaryPromise) {
let command = vscodeUtils_1.config('terraform').get('languageServer.pathToBinary');
if (!command) { // Skip install/upgrade if user has set custom binary path
- const installDir = `${extensionPath}/lsp`;
- const installer = new languageServerInstaller_1.LanguageServerInstaller();
- const installer = new languageServerInstaller_1.LanguageServerInstaller(reporter);
- try {
- yield installer.install(installDir);
- }
- catch (err) {
- vscode.window.showErrorMessage(err);
- reporter.sendTelemetryException(err);
- throw err;
- }
@@ -22,5 +21,5 @@ index 375048c..fa5eff0 100644
- command = `${installDir}/terraform-ls`;
+ command = 'TERRAFORM-LS-PATH';
}
_pathToBinaryPromise = Promise.resolve(command);
}
else {
reporter.sendTelemetryEvent('usePathToBinary');