Skip to content

Comments

[staging-next] gnugrep: Fix build on Musl#234943

Merged
vcunat merged 1 commit intoNixOS:staging-nextfrom
helsinki-systems:fix/coreutils-musl
May 30, 2023
Merged

[staging-next] gnugrep: Fix build on Musl#234943
vcunat merged 1 commit intoNixOS:staging-nextfrom
helsinki-systems:fix/coreutils-musl

Conversation

@dasJ
Copy link
Member

@dasJ dasJ commented May 30, 2023

Description of changes
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
  • Fits CONTRIBUTING.md.

@dasJ dasJ requested review from risicle and vcunat May 30, 2023 06:18
@dasJ
Copy link
Member Author

dasJ commented May 30, 2023 •
edited
Loading

This should work but is a draft because I currently don't have the build capacity to test this.
I might have more capacity near the end of this week.
It's still building for me.
PTAL

vcunat
vcunat requested changes May 30, 2023
View reviewed changes
Copy link
Member

@vcunat vcunat left a comment

Choose a reason for hiding this comment

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

This way it rebuilds on all platforms. We could instead use if .isMusl then foo else null;

@dasJ dasJ force-pushed the fix/coreutils-musl branch from ac0c4ed to 4e6bb70 Compare May 30, 2023 06:53
@dasJ
Copy link
Member Author

dasJ commented May 30, 2023

Fixed. I have successfully built pkgsStatic.gnugrep with this

@dasJ dasJ marked this pull request as ready for review May 30, 2023 06:54
@wegank
Copy link
Member

wegank commented May 30, 2023

@ofborg build pkgsStatic.gnugrep

vcunat
vcunat approved these changes May 30, 2023
View reviewed changes
Copy link
Member

@vcunat vcunat left a comment

Choose a reason for hiding this comment

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

Rebuild fixed. I can now build pkgsStatic.gnugrep pkgsMusl.gnugrep

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. labels May 30, 2023
@ofborg ofborg bot requested a review from m00wl May 30, 2023 07:26
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. and removed 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels May 30, 2023
@vcunat vcunat merged commit 5b83182 into NixOS:staging-next May 30, 2023
@vcunat
Copy link
Member

vcunat commented May 30, 2023

(ofBorg got the rebuild labels wrong; most likely confused by the force-push)

@dasJ dasJ deleted the fix/coreutils-musl branch May 30, 2023 08:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@vcunat vcunat vcunat approved these changes

@wegank wegank wegank approved these changes

@risicle risicle Awaiting requested review from risicle

@m00wl m00wl Awaiting requested review from m00wl

Assignees

No one assigned

Labels

10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@dasJ @wegank @vcunat