Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vscode-extensions.vadimcn.vscode-lldb: 1.5.3 -> 1.6.1 and refactor #101179

Merged
merged 5 commits into from Feb 8, 2021

Conversation

@oxalica
Copy link
Contributor

@oxalica oxalica commented Oct 20, 2020

Motivation for this change
  1. vscode-lldb expects a special patched lldb to correctly print rust types. Upstream lldb cannot correctly handle rust enums.
  2. Bump version to 1.6.1 and sync compile options.
  3. Refactor and simplify.
  4. Add semi-automatic update script, which doesn't update patched lldb. Manual check is still required.

Tested to debug rust programs with vscodium. Pretty printers of Option and Vec both work.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
    • 352.8M (Patched lldb takes 344.5M)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
@ofborg ofborg bot requested a review from midchildan Oct 20, 2020
@oxalica
Copy link
Contributor Author

@oxalica oxalica commented Oct 30, 2020

ping @jonringer

@oxalica oxalica changed the title vscode-extensions.vadimcn.vscode-lldb: 1.5.3 -> 1.6.0 and many fixes vscode-extensions.vadimcn.vscode-lldb: 1.5.3 -> 1.6.1 and refactor Dec 31, 2020
@nixos-discourse
Copy link

@nixos-discourse nixos-discourse commented Jan 5, 2021

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

https://discourse.nixos.org/t/prs-ready-for-review/3032/430

@jonringer
Copy link
Contributor

@jonringer jonringer commented Jan 5, 2021

oops sorry. Haven't had as much time for nix.

You have some conflicts :(

@jonringer
Copy link
Contributor

@jonringer jonringer commented Jan 5, 2021

also, ofborg is failing:

anonymous function at /var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/mr-est/ofborg-evaluator-4/pkgs/development/node-packages/node-env.nix:3:1 called without required argument 'utillinux', 

@oxalica
Copy link
Contributor Author

@oxalica oxalica commented Jan 5, 2021

@jonringer Rebased.

You have some conflicts :(

The nodePackages on master is updated quite frequently. I think it's better to at least have someone reviewed other parts before making tons of rebases.

@oxalica
Copy link
Contributor Author

@oxalica oxalica commented Jan 6, 2021

Revert changes about utillinux and util-linux according to #108596
Unfortunately these two PR conflicts with each other. 😢 I'm not sure whether to merge these changes, they are not quite relevant.

@SuperSandro2000
Copy link
Member

@SuperSandro2000 SuperSandro2000 commented Jan 7, 2021

@oxalica please fix the merge conflict now after the other PR got merged.

@oxalica
Copy link
Contributor Author

@oxalica oxalica commented Jan 7, 2021

@jonringer
Copy link
Contributor

@jonringer jonringer commented Jan 8, 2021

still conflicts... wonder why there's so many conflicts

@oxalica
Copy link
Contributor Author

@oxalica oxalica commented Jan 9, 2021

@jonringer Just due to update of adjacent vscode extensions. Rebased.
Another issue is that currently we prefer a mass single global nodePackages to reuse packages and reduce nixpkgs tree size, but it suffers from frequent merge conflicts and a total regenerate (mass diff) of the whole file in any PR touching it.
Related: #86776

@SuperSandro2000
Copy link
Member

@SuperSandro2000 SuperSandro2000 commented Jan 10, 2021

frequent merge conflicts

That is an understatement. You get a merge conflict if anyone touches the file in the meanwhile.

@SuperSandro2000
Copy link
Member

@SuperSandro2000 SuperSandro2000 commented Jan 11, 2021

This is a semi-automatic executed nixpkgs-review which does not build all packages (e.g. lumo, tensorflow or pytorch)
If you find some bugs or got suggestions for further things to search or run please reach out to SuperSandro2000 on IRC.

Result of nixpkgs-review pr 101179 run on x86_64-linux 1

22 packages built:
  • epgstation
  • flood
  • gtop
  • joplin
  • mirakurun
  • netlify-cli
  • pm2
  • postcss-cli
  • redoc-cli
  • vimPlugins.coc-diagnostic
  • vimPlugins.coc-eslint
  • vimPlugins.coc-git
  • vimPlugins.coc-go
  • vimPlugins.coc-html
  • vimPlugins.coc-metals
  • vimPlugins.coc-prettier
  • vimPlugins.coc-rust-analyzer
  • vimPlugins.coc-solargraph
  • vimPlugins.coc-stylelint
  • vimPlugins.coc-tsserver
  • vscode-extensions.matklad.rust-analyzer
  • vscode-extensions.vadimcn.vscode-lldb

@oxalica
Copy link
Contributor Author

@oxalica oxalica commented Feb 3, 2021

Rebased. ping @jonringer

@SuperSandro2000
Copy link
Member

@SuperSandro2000 SuperSandro2000 commented Feb 4, 2021

@oxalica you did not resolve all merge conflicts.

@oxalica
Copy link
Contributor Author

@oxalica oxalica commented Feb 4, 2021

@SuperSandro2000 The new conflict is caused by #110813. Rebased again now.

pkgs/misc/vscode-extensions/vscode-lldb/update.sh Outdated Show resolved Hide resolved
pkgs/misc/vscode-extensions/default.nix Outdated Show resolved Hide resolved
@SuperSandro2000
Copy link
Member

@SuperSandro2000 SuperSandro2000 commented Feb 4, 2021

This is a semi-automatic executed nixpkgs-review with nixpkgs-review-checks extension. It is checked by a human on a best effort basis and does not build all packages (e.g. lumo, tensorflow or pytorch).
If you have any questions or problems please reach out to SuperSandro2000 on IRC.

Result of nixpkgs-review pr 101179 run on x86_64-linux 1

1 package marked as broken and skipped:
  • image_optim
1 package blacklisted:
  • tests.nixos-functions.nixos-test
28 packages built:
  • antora
  • bitwarden-cli
  • castnow
  • create-cycle-app
  • emojione
  • epgstation
  • etcher
  • flood
  • joplin
  • mirakurun
  • netlify-cli
  • parity-ui
  • postcss-cli
  • pulp
  • redoc-cli
  • ripcord
  • slack
  • teleprompter
  • thelounge
  • twemoji-color-font
  • vimPlugins.coc-metals
  • vimPlugins.coc-prettier
  • vimPlugins.coc-stylelint
  • vimPlugins.coc-tslint
  • vimPlugins.coc-vetur
  • vscode-extensions.matklad.rust-analyzer
  • vscode-extensions.vadimcn.vscode-lldb
  • wasm-text-gen

@oxalica oxalica requested a review from SuperSandro2000 Feb 5, 2021
@SuperSandro2000
Copy link
Member

@SuperSandro2000 SuperSandro2000 commented Feb 5, 2021

This is a semi-automatic executed nixpkgs-review with nixpkgs-review-checks extension. It is checked by a human on a best effort basis and does not build all packages (e.g. lumo, tensorflow or pytorch).
If you have any questions or problems please reach out to SuperSandro2000 on IRC.

Result of nixpkgs-review pr 101179 run on x86_64-darwin 1

1 package failed to build and are new build failure:
  • vscode-extensions.vadimcn.vscode-lldb: log was empty
1 package built:
  • vscode-extensions.matklad.rust-analyzer
error: --- Error -----------------------------------------------------------------------------------------------------------------------------------------------------------------------
nixbuilder for '/nix/store/armn7hc6ljgm5m1k33irk00qnlgbsrk1-vscode-lldb-adapter-1.6.1.drv' failed with exit code 101; last 10 log lines:
___cpp_closure_17014716006298275771 in liblldb-b0d0b3ec9b2efe72.rlib(cpp_closures.o)
ld: symbol(s) not found for architecture x86_64
clang-7: error: linker command failed with exit code 1 (use -v to see invocation)
error: aborting due to previous error
error: could not compile `codelldb`
To learn more, run the command again with --verbose.
error: --- Error -----------------------------------------------------------------------------------------------------------------------------------------------------------------------
nix1 dependencies of derivation '/nix/store/755mzzqcahpph93xkqqi5zpvd9hdix04-vscode-extension-vscode-lldb.drv' failed to build
error: --- Error -----------------------------------------------------------------------------------------------------------------------------------------------------------------------
nix1 dependencies of derivation '/nix/store/h7k7p26l4mkki727d5ql76draffhyfj3-env.drv' failed to build

@oxalica
Copy link
Contributor Author

@oxalica oxalica commented Feb 5, 2021

@SuperSandro2000 Sorry but I don't have any darwin machine for test. Currently I just limit supported platforms to x86_64-linux only.

@SuperSandro2000
Copy link
Member

@SuperSandro2000 SuperSandro2000 commented Feb 8, 2021

This is a semi-automatic executed nixpkgs-review with nixpkgs-review-checks extension. It is checked by a human on a best effort basis and does not build all packages (e.g. lumo, tensorflow or pytorch).
If you have any questions or problems please reach out to SuperSandro2000 on IRC.

Result of nixpkgs-review pr 101179 run on x86_64-linux 1

1 package marked as broken and skipped:
  • image_optim
1 package blacklisted:
  • tests.nixos-functions.nixos-test
28 packages built:
  • antora
  • bitwarden-cli
  • castnow
  • create-cycle-app
  • emojione
  • epgstation
  • etcher
  • flood
  • joplin
  • mirakurun
  • netlify-cli
  • parity-ui
  • postcss-cli
  • pulp
  • redoc-cli
  • ripcord
  • slack
  • teleprompter
  • thelounge
  • twemoji-color-font
  • vimPlugins.coc-metals
  • vimPlugins.coc-prettier
  • vimPlugins.coc-stylelint
  • vimPlugins.coc-tslint
  • vimPlugins.coc-vetur
  • vscode-extensions.matklad.rust-analyzer
  • vscode-extensions.vadimcn.vscode-lldb
  • wasm-text-gen

1 similar comment
@SuperSandro2000

This comment has been minimized.

@SuperSandro2000 SuperSandro2000 merged commit e339437 into NixOS:master Feb 8, 2021
20 checks passed
@oxalica oxalica deleted the vscode-lldb branch Mar 12, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants