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

[backport release 24.05] vscode: fix darwin build #347728

Merged
merged 1 commit into from
Oct 10, 2024
Merged

[backport release 24.05] vscode: fix darwin build #347728

merged 1 commit into from
Oct 10, 2024

Conversation

drupol
Copy link
Contributor

@drupol drupol commented Oct 10, 2024

Manual backport of #346727

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.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
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@drupol drupol changed the base branch from release-24.05 to release-20.03 October 10, 2024 12:48
@drupol drupol changed the base branch from release-20.03 to release-24.05 October 10, 2024 12:49
@tjni @drupol
vscode: fix darwin build
9f688ac 
It seems that the ripgrep path has changed in 1.94.0.
@drupol drupol force-pushed the push-ywllmwtyzpwq branch from fdd4712 to 9f688ac Compare October 10, 2024 13:06
@drupol drupol marked this pull request as ready for review October 10, 2024 13:07
@drupol drupol mentioned this pull request Oct 10, 2024
Merged
13 tasks
@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Oct 10, 2024
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Oct 10, 2024
@bobby285271 bobby285271 merged commit 255bc4f into NixOS:release-24.05 Oct 10, 2024
27 of 29 checks passed
@drupol drupol deleted the push-ywllmwtyzpwq branch October 11, 2024 10:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bobby285271 bobby285271 Awaiting requested review from bobby285271

@Synthetica9 Synthetica9 Awaiting requested review from Synthetica9

@LudovicoPiero LudovicoPiero Awaiting requested review from LudovicoPiero

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 6.topic: vscode 10.rebuild-darwin: 1-10 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@drupol @bobby285271 @tjni