libarchive: backport fix for static linking #212540
Merged
Conversation
This file contains 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 eval |
|
ye gads, rebuild city. |
|
@ofborg eval |
|
Yay less red. |
AndersonTorres
suggested changes
Jan 25, 2023
|
Also, squash the commits into only one. |
libarchive 3.6.2 broke static linking, which is causing the nixStatic jobs to fail on Hydra: - https://hydra.nixos.org/job/nixpkgs/cross-trunk/powerpc64le-nixCrossStatic.nixStatic.x86_64-linux - https://hydra.nixos.org/job/nixpkgs/cross-trunk/mips64el-nixCrossStatic.nixStatic.x86_64-linux This commit backports the fix (merged upstream) from libarchive 3.6.3. Co-authored-by: Anderson Torres <torres.anderson.85@protonmail.com>
Done. |
ghost
requested review from
AndersonTorres
and removed request for
jcumming and
AndersonTorres
|
Backport failed for Please cherry-pick the changes locally. git fetch origin release-22.11
git worktree add -d .worktree/backport-212540-to-release-22.11 origin/release-22.11
cd .worktree/backport-212540-to-release-22.11
git checkout -b backport-212540-to-release-22.11
ancref=$(git merge-base 98f981942ed81379de1febee48cd2617a3ba07a0 201148d02bd106c593d1def08d05bb410e5c669b)
git cherry-pick -x $ancref..201148d02bd106c593d1def08d05bb410e5c669b |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description of changes
libarchive 3.6.2 broke static linking, which is causing the nixStatic jobs to fail on Hydra:
This commit backports the fix (merged upstream) from libarchive 3.6.3 (unreleased).
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