Skip to content

Comments

pkgsi686Linux.libarchive: pull upstream fix for 32-bit systems#257080

Merged
LeSuisse merged 1 commit intoNixOS:stagingfrom
trofi:libarchive-fix-32-bit-tests
Sep 24, 2023
Merged

pkgsi686Linux.libarchive: pull upstream fix for 32-bit systems#257080
LeSuisse merged 1 commit intoNixOS:stagingfrom
trofi:libarchive-fix-32-bit-tests

Conversation

@trofi
Copy link
Contributor

@trofi trofi commented Sep 24, 2023 •
edited
Loading

Without the change pkgsi686Linux.libarchive tests fail as described in libarchive/libarchive#1968

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.11 Release Notes (or backporting 23.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.

@trofi
pkgsi686Linux.libarchive: pull upstream fix for 32-bit systems
81e8caa 
Without the change `pkgsi686Linux.libarchive` tests fail as described in
libarchive/libarchive#1968
@trofi trofi mentioned this pull request Sep 24, 2023
Merged
12 tasks
@ofborg ofborg bot requested review from AndersonTorres and jcumming September 24, 2023 14:19
@ofborg ofborg bot added 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. labels Sep 24, 2023
@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one person. label Sep 24, 2023
LeSuisse
LeSuisse approved these changes Sep 24, 2023
View reviewed changes
Copy link
Member

@LeSuisse LeSuisse left a comment

Choose a reason for hiding this comment

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

Thanks!

@LeSuisse LeSuisse merged commit cb03289 into NixOS:staging Sep 24, 2023
@trofi trofi deleted the libarchive-fix-32-bit-tests branch September 24, 2023 22:16
@vcunat vcunat mentioned this pull request Sep 27, 2023
Merged
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@LeSuisse LeSuisse LeSuisse approved these changes

@jcumming jcumming Awaiting requested review from jcumming

@AndersonTorres AndersonTorres Awaiting requested review from AndersonTorres

+1 more reviewer

@chkno chkno chkno approved these changes

Reviewers whose approvals may not affect merge requirements

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-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. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@trofi @LeSuisse @chkno @delroth