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.

Sign up for GitHub

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

Jump to bottom

vscode: fix #76427 fallout #89196

Merged
merged 3 commits into from Jun 4, 2020
Merged

vscode: fix #76427 fallout #89196

merged 3 commits into from Jun 4, 2020

Conversation

eadwu
Copy link
Member

@eadwu eadwu commented May 30, 2020

Motivation for this change

PR #76427
Original change bb24faf

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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@eadwu eadwu requested a review from jonringer as a code owner May 30, 2020 02:28
@justin-gerhardt
Copy link
Contributor

justin-gerhardt commented May 30, 2020 •
edited

#76427 seems have undone the changes from bb24faf (It was commited before bb24faf was merged) to vscode-utils.nix but didn't touch pkgs/applications/editors/vscode/with-extensions.nix.
Your commit hardcodes the path as

nixpkgs/pkgs/applications/editors/vscode/with-extensions.nix

Line 73 in 0717848

--add-flags "--extensions-dir ${combinedExtensionsDrv}/share/vscode/extensions"

but "vscode" isn't guaranteed in the current version

nixpkgs/pkgs/misc/vscode-extensions/vscode-utils.nix

Line 28 in 319418f

installPrefix = "share/${extendedPkgName}/extensions/${vscodeExtUniqueId}";

As far as I can tell reverting the changes from bb24faf wasn't deliberate. Either reapplying bb24faf to update vscode-utils.nix or reverting bb24faf changes to with-extensions.nix seems like a better course of action

@eadwu
Copy link
Member Author

eadwu commented May 30, 2020

I'll keep the share/vscode/extensions since it seems like it's used after the PR.

nixpkgs/pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix

Line 21 in 319418f

origin = ''${e}/share/vscode/extensions/${e.vscodeExtUniqueId}'';

Was originally suggested here #71251 (comment).

Though I'll probably eventually(?) take a deeper look to fixup what was added.

@veprbl veprbl linked an issue Jun 4, 2020 that may be closed by this pull request
vscode-with-extensions can't find any extensions #89494
Closed
@veprbl veprbl merged commit dd8f077 into NixOS:master Jun 4, 2020
@pwm pwm mentioned this pull request Jun 13, 2020
Closed
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer Awaiting requested review from jonringer

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

vscode-with-extensions can't find any extensions
3 participants
@eadwu @justin-gerhardt @veprbl