Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rsync: Fix perl-substitution in rrsync #76749

Conversation

@kampfschlaefer
Copy link
Contributor

@kampfschlaefer kampfschlaefer commented Dec 31, 2019

there is no (more) perl in /usr/bin

Things done
  • working with this on my server since 6 months

you can use #76721 to spare you the back-porting work

Notify maintainers

cc @peti @ehmry

there is no (more) perl in /usr/bin
@@ -17,6 +17,7 @@ stdenv.mkDerivation {

postPatch = ''
substituteInPlace support/rrsync --replace /usr/bin/rsync ${rsync}/bin/rsync
substituteInPlace support/rrsync --replace /usr/bin/perl ${perl}/bin/perl

This comment has been minimized.

@veprbl

veprbl Dec 31, 2019
Member

perl is only used in the shebang, which are automatically patched in the Fixup phase. This is not needed?

# grep perl /nix/store/mlqrgi2rly20c1v2vnnf2glax4v334lq-rrsync-3.1.3/bin/rrsync 
#!/nix/store/ihgwxaqh6c80kh581vhw8lkgljd4mdnv-perl-5.30.1/bin/perl

This comment has been minimized.

@kampfschlaefer

kampfschlaefer Jan 1, 2020
Author Contributor

Well, if that works automatically in the fixupPhase, it would not have broken my backup processes…

This comment has been minimized.

@veprbl

veprbl Jan 1, 2020
Member

The proposed change is a no-op:

# nix-build -E '(import (builtins.fetchTarball "https://github.com/NixOS/nixpkgs/archive/7efeca1721994573434eda026eabd57435092c74.tar.gz") {}).rrsync' -o original
/nix/store/mlqrgi2rly20c1v2vnnf2glax4v334lq-rrsync-3.1.3
# nix-build -E '(import (builtins.fetchTarball "https://github.com/NixOS/nixpkgs/archive/c8527a8c2a48ac9b0ee5023179c1c0bf617bef4a.tar.gz") {}).rrsync' -o pr76749 
/nix/store/fwn97zk7li1yv2bynvwlaq23mxfcg713-rrsync-3.1.3
# diff -rs original/ pr76749/           
Files original/bin/rrsync and pr76749/bin/rrsync are identical
@kampfschlaefer
Copy link
Contributor Author

@kampfschlaefer kampfschlaefer commented Jan 11, 2020

hey, turns out the patch I had is no longer necessary. Sorry for the noise…

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.