Skip to content

rsync: 3.1.3 -> 3.2.3; add additional dependencies#99061

Merged
doronbehar merged 1 commit intoNixOS:stagingfrom
andrew-d:andrew/rsync-3.2
Oct 2, 2020
Merged

rsync: 3.1.3 -> 3.2.3; add additional dependencies#99061
doronbehar merged 1 commit intoNixOS:stagingfrom
andrew-d:andrew/rsync-3.2

Conversation

@andrew-d
Copy link
Contributor

@andrew-d andrew-d commented Sep 29, 2020

Motivation for this change

I wanted support for zstd compression in rsync; I added LZ4, OpenSSL, and xxHash support as well.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after) (33936936 ➡️ 40755760)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@andrew-d andrew-d requested review from a user and peti September 29, 2020 05:18
@ofborg ofborg bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches. labels Sep 29, 2020
@doronbehar
Copy link
Contributor

doronbehar commented Sep 29, 2020

Please target staging branch, and fix merge conflict.

@andrew-d andrew-d changed the base branch from master to staging September 29, 2020 17:29
@andrew-d andrew-d requested a review from andir as a code owner September 29, 2020 17:29
@ofborg ofborg bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 8.has: clean-up This PR removes packages or removes other cruft 8.has: package (new) This PR adds a new package labels Sep 29, 2020
@ofborg ofborg bot removed 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` labels Sep 29, 2020
@andrew-d
Copy link
Contributor Author

andrew-d commented Sep 30, 2020

@GrahamcOfBorg build rsync

@andrew-d
Copy link
Contributor Author

andrew-d commented Sep 30, 2020

@doronbehar - Done!

@doronbehar
Copy link
Contributor

doronbehar commented Sep 30, 2020

@GrahamcOfBorg build rsync

^ To test the darwin build.

It's funny - ofborg labeled the PR with "0: has cleanup" and I'm a bit surprised that aarch64 is not supported, at least now - I don't know if rsync was available to aarch64 before this change...

@ghost
Copy link

ghost commented Sep 30, 2020 •
edited by ghost
Loading

It's funny - ofborg labeled the PR with "0: has cleanup" and I'm a bit surprised that aarch64 is not supported, at least now - I don't know if rsync was available to aarch64 before this change...

I'm using rsync on aarch64 without any problems.

I'm a bit skeptical of adding an OpenSSL dependency, but otherwise it looks good to me.

@doronbehar
Copy link
Contributor

doronbehar commented Sep 30, 2020

It's funny - ofborg labeled the PR with "0: has cleanup" and I'm a bit surprised that aarch64 is not supported, at least now - I don't know if rsync was available to aarch64 before this change...

I'm using rsync on aarch64 without any problems.

@ehmry could you verify that on aarch64 you can build rsync with this PR merged? I tried to trace the new dependencies for either of them or their deps to be marked marked as broken or unsupported for aarch64 but I couldn't find any such trace. Also, you don't have by any chance allowing unsupported systems on that aarch64 machine?

@ghost
Copy link

ghost commented Oct 2, 2020

@doronbehar I don't have enough bandwith to rebuild on staging but I can evaluate the build.

@doronbehar
Copy link
Contributor

doronbehar commented Oct 2, 2020

@doronbehar I don't have enough bandwith to rebuild on staging but I can evaluate the build.

Yes please. Ofborg says it won't evaluate on aarch64, and I only wish to know why. This should do it:

git clone https://github.com/andrew-d/nixpkgs --branch andrew/rsync-3.2
cd nixpkgs
nix-build --dry-run --show-trace -A rsync

@doronbehar
Copy link
Contributor

doronbehar commented Oct 2, 2020

@ehmry forget it. The aarch64 failing ofborg evaluation is unrelated and all PRs are affected:

#99316

@andrew-d @doronbehar
rsync: 3.1.3 -> 3.2.3
79c01c8 
Add zstd, lz4, openssl and xxHash as optional dependencies, to support
more compression formats.
@doronbehar
Copy link
Contributor

doronbehar commented Oct 2, 2020

Did nothing besides changing the commit message a bit. Merging without waiting for CI, as it was green before.

@doronbehar doronbehar merged commit 820b251 into NixOS:staging Oct 2, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@peti peti Awaiting requested review from peti

@andir andir Awaiting requested review from andir

@ingenieroariel ingenieroariel Awaiting requested review from ingenieroariel

@Mic92 Mic92 Awaiting requested review from Mic92

@adisbladis adisbladis Awaiting requested review from adisbladis

1 more reviewer
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

8.has: clean-up This PR removes packages or removes other cruft 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@andrew-d @doronbehar