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

_9base: fix build on x86_64-linux #372313

Merged
merged 2 commits into from
Jan 11, 2025
Merged

_9base: fix build on x86_64-linux #372313

merged 2 commits into from
Jan 11, 2025

Conversation

div72
Copy link
Contributor

@div72 div72 commented Jan 9, 2025

The previous Darwin breakage due to p9mbtowc also happens on Linux now.

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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

div72 added 2 commits January 9, 2025 11:25
@div72
_9base: fix build on x86_64-linux
ed59c74 
The previous Darwin breakage due to p9mbtowc also happens on Linux now.
@div72
_9base: format package.nix
d170722
@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Jan 9, 2025
@nix-owners nix-owners bot requested a review from 06kellyjac January 9, 2025 08:38
06kellyjac
06kellyjac approved these changes Jan 9, 2025
View reviewed changes
Copy link
Member

@06kellyjac 06kellyjac left a comment

Choose a reason for hiding this comment

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

nixpkgs-review didn't seem to find the change. I was able to manually build the changes in the PR

@06kellyjac 06kellyjac added the backport release-24.11 Backport PR automatically label Jan 9, 2025
@wegank wegank added 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package labels Jan 9, 2025
@wegank wegank merged commit b619b29 into NixOS:master Jan 11, 2025
27 of 30 checks passed
@nixpkgs-ci
Copy link

nixpkgs-ci bot commented Jan 11, 2025

Successfully created backport PR for release-24.11:

@nixpkgs-ci nixpkgs-ci bot mentioned this pull request Jan 11, 2025
Merged
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@06kellyjac 06kellyjac 06kellyjac approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package backport release-24.11 Backport PR automatically
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@div72 @06kellyjac @wegank