rsync: Fix perl-substitution in rrsync #76749
Closed
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
there is no (more) perl in /usr/bin
veprbl
reviewed
Dec 31, 2019
| @@ -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 | |||
There was a problem hiding this comment.
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
There was a problem hiding this comment.
Well, if that works automatically in the fixupPhase, it would not have broken my backup processes…
There was a problem hiding this comment.
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
|
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
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.
there is no (more) perl in /usr/bin
Things done
you can use #76721 to spare you the back-porting work
Notify maintainers
cc @peti @ehmry