Skip to content

vscode-extensions.ms-vscode.cpptools: 1.9.1 -> 1.11.0#178513

Merged
SuperSandro2000 merged 1 commit intoNixOS:masterfrom
StarGate01:fix/cpptools
Jul 7, 2022
Merged

vscode-extensions.ms-vscode.cpptools: 1.9.1 -> 1.11.0#178513
SuperSandro2000 merged 1 commit intoNixOS:masterfrom
StarGate01:fix/cpptools

Conversation

@StarGate01
Copy link
Copy Markdown
Member

@StarGate01 StarGate01 commented Jun 22, 2022

Description of changes

This PR was forked from #151228, it inherits some changes such as the removal of mono, and the automatic wrapping of the debugger. Based on the work by @vlaci .

  • Update the ms-vscode.cpptools Visual Studio Code extension to version 1.11.0
  • Use the standard buildVscodeMarketplaceExtension download and unpacking functionality
  • Download binary extension for the correct architecture
  • Fix debugging using OpenDebugAD7

Related issues:

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.11 Release Notes (or backporting 22.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@StarGate01 StarGate01 requested a review from jonringer as a code owner June 22, 2022 00:30
@ofborg ofborg bot requested a review from jraygauthier June 22, 2022 00:38
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Jun 22, 2022
@StarGate01
Copy link
Copy Markdown
Member Author

@eadwu @jraygauthier @firmero do you have any tips or comments for this PR?

@StarGate01 StarGate01 requested a review from vlaci June 30, 2022 03:26
@bobby285271 bobby285271 added the 12.approvals: 1 This PR was reviewed and approved by one person. label Jul 2, 2022
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
archurl = (if arch == "" then "" else "?targetPlatform=${arch}");
archurl = lib.optionalString (arch != "") "?targetPlatform=${arch}";

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would require a dependency on lib, which in turn would require changes to the rest of the vscode extension build system. Is that worth it?

@ofborg ofborg bot added the 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. label Jul 5, 2022
Copy link
Copy Markdown
Member

@jraygauthier jraygauthier left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Excellent job. I just tested debugger and go to symbols and it works fine. Package much cleaner than before.

@@ -1,6 +1,9 @@
{ publisher, name, version, sha256 ? "" }:
{ publisher, name, version, arch ? "", sha256 ? "" }:
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
{ publisher, name, version, arch ? "", sha256 ? "" }:
{ lib }
{ publisher, name, version, arch ? "", sha256 ? "" }:

We can't do this, right? If not then we can use if else to save us all the changes.

@SuperSandro2000 SuperSandro2000 merged commit 64cc7ab into NixOS:master Jul 7, 2022
@nixos-discourse
Copy link
Copy Markdown

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/vscode-cpptools-opendebugad7-is-broken-in-nixpkgs/17581/3

@StarGate01 StarGate01 deleted the fix/cpptools branch August 14, 2022 13:42
@Janik-Haag Janik-Haag added the 12.first-time contribution This PR is the author's first one; please be gentle! label Jun 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 12.approvals: 1 This PR was reviewed and approved by one person. 12.first-time contribution This PR is the author's first one; please be gentle!

Projects

None yet

Development

Successfully merging this pull request may close these issues.

vscode-extensions.ms-vscode.cpptools: not work

7 participants