Skip to content

treewide: fix some builds in darwin sandbox#246723

Merged
wegank merged 1 commit intoNixOS:stagingfrom
tjni:darwin-sandbox
Aug 5, 2023
Merged

treewide: fix some builds in darwin sandbox#246723
wegank merged 1 commit intoNixOS:stagingfrom
tjni:darwin-sandbox

Conversation

@tjni
Copy link
Copy Markdown
Contributor

@tjni tjni commented Aug 2, 2023

Description of changes

I was building lots of packages locally and found a couple that failed in the Darwin sandbox.

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/)
  • 23.11 Release Notes (or backporting 23.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.

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Aug 2, 2023
@github-actions github-actions bot added the 6.topic: python Python is a high-level, general-purpose programming language. label Aug 2, 2023
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely target the staging branches. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Aug 2, 2023
@tjni tjni marked this pull request as draft August 2, 2023 07:21
@tjni tjni changed the base branch from master to staging August 2, 2023 07:25
@tjni tjni marked this pull request as ready for review August 2, 2023 07:25
viraptor
viraptor approved these changes Aug 3, 2023
View reviewed changes
Copy link
Copy Markdown
Contributor

@viraptor viraptor left a comment

Choose a reason for hiding this comment

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

Should this be wrapped up in a single commit?

Looks good otherwise.

@tjni
Copy link
Copy Markdown
Contributor Author

tjni commented Aug 3, 2023

Should this be wrapped up in a single commit?

I'll do that right now. Thank you for reviewing!

@tjni
Copy link
Copy Markdown
Contributor Author

tjni commented Aug 3, 2023

Squashed :)

@tjni
Copy link
Copy Markdown
Contributor Author

tjni commented Aug 4, 2023 •
edited
Loading

Rebased on latest staging and also added __darwinAllowLocalNetworking to wandb.

@tjni tjni mentioned this pull request Aug 5, 2023
Closed
@wegank wegank merged commit e02790c into NixOS:staging Aug 5, 2023
@tjni tjni deleted the darwin-sandbox branch August 5, 2023 22:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@viraptor viraptor viraptor approved these changes

@wegank wegank wegank approved these changes

Assignees

No one assigned

Labels

6.topic: darwin Running or building packages on Darwin 6.topic: python Python is a high-level, general-purpose programming language. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely target the staging branches. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@tjni @viraptor @wegank