Skip to content

Revert "rsync: Work around upstream cross-compilation issue"#183779

Merged
risicle merged 2 commits intoNixOS:stagingfrom
alyssais:rsync-cross
Jul 29, 2022
Merged

Revert "rsync: Work around upstream cross-compilation issue"#183779
risicle merged 2 commits intoNixOS:stagingfrom
alyssais:rsync-cross

Conversation

@alyssais
Copy link
Member

@alyssais alyssais commented Jul 29, 2022

Description of changes

This reverts PR #101204.

Our packaged rsync version now contains the fix.

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

alyssais added 2 commits July 29, 2022 20:00
@alyssais
rsync: enable parallel building
6c93364 
Tested at -j48.
@alyssais
Revert "rsync: Work around upstream cross-compilation issue"
bf0aa68 
This reverts commit 49edde0.

Our packaged rsync version now contains the fix.
@alyssais alyssais added the 6.topic: cross-compilation Building packages on a different platform than they will be used on label Jul 29, 2022
@ofborg ofborg bot requested a review from a user July 29, 2022 20:14
@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: 501-1000 This PR causes many rebuilds on Darwin and should normally 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 Jul 29, 2022
risicle
risicle approved these changes Jul 29, 2022
View reviewed changes
Copy link
Contributor

@risicle risicle left a comment

Choose a reason for hiding this comment

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

Can successfully build pkgsCross.aarch64-multiplatform.rsync on x86_64 nixos.

@risicle risicle merged commit ee699ee into NixOS:staging Jul 29, 2022
@alyssais alyssais deleted the rsync-cross branch July 30, 2022 07:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@risicle risicle risicle approved these changes

@SuperSandro2000 SuperSandro2000 SuperSandro2000 approved these changes

@samueldr samueldr Awaiting requested review from samueldr

Assignees

No one assigned

Labels

6.topic: cross-compilation Building packages on a different platform than they will be used on 10.rebuild-darwin: 501-1000 This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally 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.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@alyssais @risicle @SuperSandro2000