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: fix darwin build #346727

Merged
merged 1 commit into from
Oct 7, 2024
Merged

vscode: fix darwin build #346727

merged 1 commit into from
Oct 7, 2024

Conversation

tjni
Copy link
Contributor

@tjni tjni commented Oct 5, 2024

It seems that the ripgrep path has changed in 1.94.0.

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.

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Oct 5, 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 5, 2024
@softinio softinio mentioned this pull request Oct 5, 2024
13 tasks
@taciturnaxolotl
Copy link
Contributor

oof sorry my pr broke the path; thanks for fixing it!

@bobby285271
Copy link
Member

bobby285271 commented Oct 6, 2024

vscodium is not on 1.94 yet, so I guess we will have to either do this conditionally using e.g. lib.versionAtLeast or update vscodium too.

https://logs.ofborg.org/?key=nixos/nixpkgs.346727&attempt_id=41b20ee8-93ca-4c95-a31d-19b906a574fb

It seems that the ripgrep path has changed in 1.94.0.
@tjni
Copy link
Contributor Author

tjni commented Oct 6, 2024

Thank you for the catch. I added the condition, so we can update vscodium at its own pace.

@bobby285271 bobby285271 merged commit 792b14b into NixOS:master Oct 7, 2024
25 of 26 checks passed
@tjni tjni deleted the vscode-darwin branch October 7, 2024 02:47
@bobby285271 bobby285271 mentioned this pull request Oct 10, 2024
13 tasks
Copy link
Contributor

Backport failed for release-24.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-24.05
git worktree add -d .worktree/backport-346727-to-release-24.05 origin/release-24.05
cd .worktree/backport-346727-to-release-24.05
git switch --create backport-346727-to-release-24.05
git cherry-pick -x d22149100ec58a7994ce02cf9a0cf2e3692490f6

@drupol
Copy link
Contributor

drupol commented Oct 10, 2024

Manual backport at #347728

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

4 participants