patchelf: if targetPlatform.isMips: apply patchelf/pull/380 #178207
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ofborg
bot
added
10.rebuild-darwin: 1-10
klemensn
approved these changes
Jun 19, 2022
This PR applies the patches which fix a MIPS-specific bug in patchelf. The patches are applied only if targetPlatform.isMips in order to: 1. Not cause a mass-rebuild on the mainstream platforms 2. Make this PR acceptable for inclusion in `master` rather than `staging`. This is the very last commit needed in order for Hydra to be able to produce a bootstrap-files tarball for mips64el (the other one is in `staging-next`). This PR can be reverted after the next release of patchelf lands in nixpkgs.
ghost
marked this pull request as ready for review
Mindavi
approved these changes
Jun 21, 2022
Contributor
Mindavi
left a comment
Mindavi
left a comment
There was a problem hiding this comment.
LGTM, but that patch hasn't been merged yet, right? Maybe we should wait a bit.
ghost
marked this pull request as draft
Author
Sorry, somehow I thought it had been. My mistake. |
ghost
marked this pull request as ready for review
Author
|
NixOS/patchelf#380 has merged into patchelf. Also, Hydra builds of the mips64el |
ghost
mentioned this pull request
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
(draftified until patchelf/pull/380 merges into patchelf)Description of changes
This PR applies the patches which fix a MIPS-specific bug in patchelf. The patches are applied only if targetPlatform.isMips in order to:
Not cause a mass-rebuild on the mainstream platforms
Make this PR acceptable for inclusion in
masterrather thanstaging.This is the very last commit needed in order for Hydra to be able to produce a useful bootstrap-files tarball for mips64el (the other one is in
staging-next).This PR can be reverted after the next release of patchelf lands in nixpkgs.
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)nixos/doc/manual/md-to-db.shto update generated release notes