git: add missing deps for filter-branch etc #27221
Merged
+20
−6
Conversation
This file contains hidden or 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
|
Patch of the differences in the shell scripts. |
aschmolck
force-pushed
the
fix-git-deps
branch
4 times, most recently
from
eefd0f4 to
736ef3a
Compare
Several git commands are implemented as shell scripts that run awk, sed, grep and perl. There is some existing patching in the postinstall for perl to rewrite it to an absolute reference to pkgs.perl, but several other packages are both missing as a dependency and have no rewrite logic. In particular git filter-branch depends on sed and grep. Additionally, the perl logic also seds git-am, which is now a binary not a shell script anymore (see <github.com/git/git/blob/master/builtin/am.c>), so this part was obsolete. I tested this by grepping all shell scripts for the relevant commands and then comparing the diffs of the new version to what is produced in master. All changes in the scripts seem good to me.
copumpkin
reviewed
Jul 10, 2017
| # Fix references to the perl, sed, awk and various coreutil binaries used by | ||
| # shell scripts that git calls (e.g. filter-branch) | ||
| perl -0777 -i -pe \ | ||
| "BEGIN{@a=('${perl}/bin/perl', '${gnugrep}/bin/grep', '${gnused}/bin/sed', '${gawk}/bin/awk',"\ |
There was a problem hiding this comment.
Odd indentation here. Is there a reason for that?
There was a problem hiding this comment.
@aschmolck nix strips the prefix on multi-line strings.
I pushed a change to make it a bit more readable in c6322fa. Needs testing
|
@zimbatm: thanks for cleaning up the formatting! |
|
@aschmolck cheers :) can you build and test the changes on linux to confirm that it's still working? |
|
@zimbatm broke something, debugging (must be trivial though). |
|
@zimbatm 2 hours of my life gone, but I found the problem and it was trivial: |
|
oh no, sorry for pushing that onto you. |
|
Thank you both for your work on this! Very much appreciated :) |
|
@zimbatm haha -- not your fault :) Was just tricky to debug because it looked OK, pasting it into the shell prompt (correcting for nix-double-single-quote-escapes) seemingly worked OK, but somehow it still blew up. |
NeQuissimus
pushed a commit
that referenced
this pull request
Aug 11, 2017
Several git commands are implemented as shell scripts that run awk, sed, grep and perl. There is some existing patching in the postinstall for perl to rewrite it to an absolute reference to pkgs.perl, but several other packages are both missing as a dependency and have no rewrite logic. In particular git filter-branch depends on sed and grep. Additionally, the perl logic also seds git-am, which is now a binary not a shell script anymore (see <github.com/git/git/blob/master/builtin/am.c>), so this part was obsolete. I tested this by grepping all shell scripts for the relevant commands and then comparing the diffs of the new version to what is produced in master. All changes in the scripts seem good to me. (cherry picked from commit 2c1097a)
Janik-Haag
added
the
12. first-time contribution
adrianpk
added a commit
to adrianpk/nixpkgs
that referenced
this pull request
May 31, 2024
Several git commands are implemented as shell scripts that run awk, sed, grep and perl. There is some existing patching in the postinstall for perl to rewrite it to an absolute reference to pkgs.perl, but several other packages are both missing as a dependency and have no rewrite logic. In particular git filter-branch depends on sed and grep. Additionally, the perl logic also seds git-am, which is now a binary not a shell script anymore (see <github.com/git/git/blob/master/builtin/am.c>), so this part was obsolete. I tested this by grepping all shell scripts for the relevant commands and then comparing the diffs of the new version to what is produced in master. All changes in the scripts seem good to me. (cherry picked from commit 2c1097a)
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.
Motivation for this change
Several git commands are implemented as shell scripts that run awk, sed, grep
and perl as well as coreutils such as cut, wc, basedir and dirname. There is some existing patching in the postinstall for perl to rewrite
it to an absolute reference to pkgs.perl, but several other packages are both
missing as a dependency and have no rewrite logic.
In particular git filter-branch depends on sed and grep.
Additionally, the perl logic also seds git-am, which is now a binary not a shell
script anymore (see <github.com/git/git/blob/master/builtin/am.c>), so this part
was obsolete.
I tested this by grepping all shell scripts for the relevant commands and then
comparing the diffs of the new version to what is produced in master. All
changes in the scripts seem good to me. I'll attach the patch in a comment. I als
Things done
(nix.useSandbox on NixOS,
or option
build-use-sandboxinnix.confon non-NixOS)
nix-shell -p nox --run "nox-review wip"(tried to but I got fatal: reference is not a tree: 3d89df6)./result/bin/)