diff options
Diffstat (limited to 'pkgs/misc/vscode-extensions')
3 files changed, 30 insertions, 27 deletions
diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/pkgs/misc/vscode-extensions/cpptools/default.nix index e3463246ab2c..539d03d66fe1 100644 --- a/pkgs/misc/vscode-extensions/cpptools/default.nix +++ b/pkgs/misc/vscode-extensions/cpptools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, vscode-utils, jq, mono46, clang-tools, writeScript +{ stdenv, fetchzip, vscode-utils, jq, mono, clang-tools, writeScript , gdbUseFixed ? true, gdb # The gdb default setting will be fixed to specified. Use version from `PATH` otherwise. }: @@ -34,8 +34,8 @@ let name = "cpptools-language-component-binaries"; src = fetchzip { - url = https://download.visualstudio.microsoft.com/download/pr/11991016/8a81aa8f89aac452956b0e4c68e6620b/Bin_Linux.zip; - sha256 = "0ma59fxfldbgh6ijlvfbs3hnl4g0cnw5gs6286zdrp065n763sv4"; + url = "https://download.visualstudio.microsoft.com/download/pr/e8bc2ccc-bb10-4d40-8e29-edcd78986e9a/2e86fa29aefdbde2ea2cd1a6fceadeaa/bin_linux.zip"; + sha256 = "1hvrbp3c4733aryslgyh3l5azmqkw398j2wbgr3w788fphg4v6cc"; }; patchPhase = '' @@ -59,7 +59,7 @@ let export PATH=''${PATH}''${PATH:+:}${gdb}/bin '' else ""} - ${mono46}/bin/mono $BIN_DIR/bin/OpenDebugAD7.exe $* + ${mono}/bin/mono $BIN_DIR/bin/OpenDebugAD7.exe $* ''; in @@ -81,7 +81,7 @@ vscode-utils.buildVscodeMarketplaceExtension { # 1. Add activation events so that the extension is functional. This listing is empty when unpacking the extension but is filled at runtime. # 2. Patch `packages.json` so that nix's *gdb* is used as default value for `miDebuggerPath`. cat ./package_ori.json | \ - jq --slurpfile actEvts ${./package-activation-events-0-16-1.json} '(.activationEvents) = $actEvts[0]' | \ + jq --slurpfile actEvts ${./package-activation-events.json} '(.activationEvents) = $actEvts[0]' | \ jq '(.contributes.debuggers[].configurationAttributes | .attach , .launch | .properties.miDebuggerPath | select(. != null) | select(.default == "/usr/bin/gdb") | .default) = "${gdbDefaultsTo}"' > \ ./package.json diff --git a/pkgs/misc/vscode-extensions/cpptools/package-activation-events-0-16-1.json b/pkgs/misc/vscode-extensions/cpptools/package-activation-events-0-16-1.json deleted file mode 100644 index 3a12a8bc0474..000000000000 --- a/pkgs/misc/vscode-extensions/cpptools/package-activation-events-0-16-1.json +++ /dev/null @@ -1,22 +0,0 @@ -[ -"onLanguage:cpp", -"onLanguage:c", -"onCommand:extension.pickNativeProcess", -"onCommand:extension.pickRemoteNativeProcess", -"onCommand:C_Cpp.ConfigurationEdit", -"onCommand:C_Cpp.ConfigurationSelect", -"onCommand:C_Cpp.SwitchHeaderSource", -"onCommand:C_Cpp.Navigate", -"onCommand:C_Cpp.GoToDeclaration", -"onCommand:C_Cpp.PeekDeclaration", -"onCommand:C_Cpp.ToggleErrorSquiggles", -"onCommand:C_Cpp.ToggleIncludeFallback", -"onCommand:C_Cpp.ToggleDimInactiveRegions", -"onCommand:C_Cpp.ShowReleaseNotes", -"onCommand:C_Cpp.ResetDatabase", -"onCommand:C_Cpp.PauseParsing", -"onCommand:C_Cpp.ResumeParsing", -"onCommand:C_Cpp.ShowParsingCommands", -"onCommand:C_Cpp.TakeSurvey", -"onDebug" -] \ No newline at end of file diff --git a/pkgs/misc/vscode-extensions/cpptools/package-activation-events.json b/pkgs/misc/vscode-extensions/cpptools/package-activation-events.json new file mode 100644 index 000000000000..c2d8a10f340a --- /dev/null +++ b/pkgs/misc/vscode-extensions/cpptools/package-activation-events.json @@ -0,0 +1,25 @@ +[ + "onLanguage:cpp", + "onLanguage:c", + "onCommand:extension.pickNativeProcess", + "onCommand:extension.pickRemoteNativeProcess", + "onCommand:C_Cpp.ConfigurationEdit", + "onCommand:C_Cpp.ConfigurationSelect", + "onCommand:C_Cpp.ConfigurationProviderSelect", + "onCommand:C_Cpp.SwitchHeaderSource", + "onCommand:C_Cpp.Navigate", + "onCommand:C_Cpp.GoToDeclaration", + "onCommand:C_Cpp.PeekDeclaration", + "onCommand:C_Cpp.ToggleErrorSquiggles", + "onCommand:C_Cpp.ToggleIncludeFallback", + "onCommand:C_Cpp.ToggleDimInactiveRegions", + "onCommand:C_Cpp.ToggleSnippets", + "onCommand:C_Cpp.ShowReleaseNotes", + "onCommand:C_Cpp.ResetDatabase", + "onCommand:C_Cpp.PauseParsing", + "onCommand:C_Cpp.ResumeParsing", + "onCommand:C_Cpp.ShowParsingCommands", + "onCommand:C_Cpp.TakeSurvey", + "onDebug", + "workspaceContains:/.vscode/c_cpp_properties.json" +] |