summary refs log tree commit diff
path: root/pkgs/misc
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2021-06-16 18:24:14 +0200
committerGitHub <noreply@github.com>2021-06-16 18:24:14 +0200
commit22c313a68480c33c30c30dcb5e4d7070cab78ef3 (patch)
tree184dc7df2e44aa8d11143d122fdd820a46b45549 /pkgs/misc
parent05c4eda9afdba428994494f6e5118265b95955c3 (diff)
parent0fa94c1ab7f3b4f19ea34b7eccefc9edd8b3bede (diff)
downloadnixpkgs-22c313a68480c33c30c30dcb5e4d7070cab78ef3.tar
nixpkgs-22c313a68480c33c30c30dcb5e4d7070cab78ef3.tar.gz
nixpkgs-22c313a68480c33c30c30dcb5e4d7070cab78ef3.tar.bz2
nixpkgs-22c313a68480c33c30c30dcb5e4d7070cab78ef3.tar.lz
nixpkgs-22c313a68480c33c30c30dcb5e4d7070cab78ef3.tar.xz
nixpkgs-22c313a68480c33c30c30dcb5e4d7070cab78ef3.tar.zst
nixpkgs-22c313a68480c33c30c30dcb5e4d7070cab78ef3.zip
Merge pull request #127046 from happysalada/update_vscode_shellcheck
Diffstat (limited to 'pkgs/misc')
-rw-r--r--pkgs/misc/vscode-extensions/default.nix13
1 files changed, 10 insertions, 3 deletions
diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index 8f09964a2fb..dcd434853a4 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, buildEnv, callPackage, vscode-utils, nodePackages, jdk, llvmPackages_8, nixpkgs-fmt, jq }:
+{ config, lib, buildEnv, callPackage, vscode-utils, nodePackages, jdk, llvmPackages_8, nixpkgs-fmt, jq, shellcheck }:
 
 let
   inherit (vscode-utils) buildVscodeMarketplaceExtension;
@@ -1165,9 +1165,16 @@ let
         mktplcRef = {
           name = "shellcheck";
           publisher = "timonwong";
-          version = "0.12.3";
-          sha256 = "1i9rszgnac2z1kyahmgxmz05ib7z14s458fvvjlzmvl64fa1fdvf";
+          version = "0.14.1";
+          sha256 = "sha256-X3ihMxANcqNLWl9oTZjCgwRt1uBsSN2BmC2D4dPRFLE=";
         };
+        nativeBuildInputs = [ jq ];
+        postInstall = ''
+          cd "$out/$installPrefix"
+          tmp_package_json=$(mktemp)
+          jq '.contributes.configuration.properties."shellcheck.executablePath".default = "${shellcheck}/bin/shellcheck"' package.json > "$tmp_package_json"
+          mv "$tmp_package_json" package.json
+        '';
         meta = {
           license = lib.licenses.mit;
         };