Skip to content

[staging-next] pkgsMusl.procps: fix build #204212

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
Merged
yu-re-ka merged 1 commit into from
Dec 3, 2022
Merged

[staging-next] pkgsMusl.procps: fix build #204212

yu-re-ka merged 1 commit into from
Dec 3, 2022

Conversation

@yu-re-ka
Copy link
Contributor

@yu-re-ka yu-re-ka commented Dec 3, 2022 •
edited
Loading

Description of changes

The update to 3.3.17 in #199513 broke the musl build of procps.
The different options for fixing this are all a bit ugly and complicated, but I've decided that for now pulling Alpine's workaround patch is the best option.
And I've documented what change will be needed in the 4.x update.

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.05 Release Notes (or backporting 22.11 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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@yu-re-ka yu-re-ka requested a review from alyssais December 3, 2022 01:13
@yu-re-ka yu-re-ka changed the title pkgsMusl.procps: fix build [staging-next] pkgsMusl.procps: fix build Dec 3, 2022
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Dec 3, 2022
kloenk
kloenk approved these changes Dec 3, 2022
View reviewed changes
Copy link
Member

@kloenk kloenk left a comment

Choose a reason for hiding this comment

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

LGTM, sounds reasonable

@yu-re-ka yu-re-ka merged commit 9cbe4d6 into NixOS:staging-next Dec 3, 2022
@yu-re-ka yu-re-ka deleted the musl-procps branch December 3, 2022 11:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@alyssais alyssais Awaiting requested review from alyssais

1 more reviewer

@kloenk kloenk kloenk approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 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

@yu-re-ka @kloenk @yuyuyureka