git: fix bad patch and fix run-time dependency on gcc #64395
Merged
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
Reduces gitMinimal closure size from 329.6M to 174.8M. Fixes the issue NixOS#64350. In git 2.22.0 git-stash is no longer a shell script and now it is just a symlink to git. `postInstall` assumed that it was a shell script, tried to patch it and ended up corrupting the file and made `strip` refuse stripping it.
|
I'm uncertain about second commit which adds a sanity check |
|
Might be a good idea to add this to avoid similar issues like this in the future. disallowedReferences = [ stdenv.cc ]; |
gloaming
reviewed
Jul 6, 2019
| perl -0777 -i -pe "$SCRIPT" \ | ||
| $out/libexec/git-core/git-{sh-setup,filter-branch,merge-octopus,mergetool,quiltimport,request-pull,submodule,subtree,web--browse} | ||
|
|
||
| perl -0777 -i -pe "$SCRIPT" $out/libexec/git-core/git-sh-setup |
There was a problem hiding this comment.
How come git-sh-setup is handled separately now?
gloaming
reviewed
Jul 8, 2019
|
|
||
| perl -0777 -i -pe "$SCRIPT" $out/libexec/git-core/git-sh-setup | ||
| for git_script in $out/libexec/git-core/git-{filter-branch,merge-octopus,mergetool,quiltimport,request-pull,submodule,subtree,web--browse}; do | ||
| isScript $git_script || (echo "$git_script is not a script. Can't patch it."; exit 1) |
There was a problem hiding this comment.
Suggested change
| isScript $git_script || (echo "$git_script is not a script. Can't patch it."; exit 1) | |
| isScript $git_script || (echo "$git_script is not a script. Can't patch it." >&2; exit 1) |
demin-dmitriy
force-pushed
the
fix-git-runtime-dependency-on-gcc
branch
from
3b73121
to
ae2082a
Compare
|
@GrahamcOfBorg build git |
lheckemann
approved these changes
Jul 16, 2019
gloaming
suggested changes
Jul 16, 2019
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
Fixes the issue #64350 .
Problem was that in previous version of git git-stash was a shell script, but now it's a symlink to git.
postInstalltried to patch it (in-place) as if it was a script, but instead replaced symlink with a corrupted git copy.striprefused to strip symbols from it, so debug information with references to gcc was left in the resulting package.Things done
sandboxinnix.confon non-NixOS)nix-shell -p nix-review --run "nix-review wip"./result/bin/)nix path-info -Sbefore and after)@gloaming might want to take a look at it.