gitstatus: fix zsh integration #96136
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
|
cc @mmlb too—I can’t seem to add you to the reviewers list for whatever reason. |
|
@GrahamcOfBorg build gitAndTools.gitstatus |
ofborg
bot
added
10.rebuild-darwin: 1-10
10.rebuild-darwin: 1
10.rebuild-linux: 1-10
labels
At some point the upstream changed and gitstatus.prompt.zsh stopped working. The issue was that this file expects to be able to run the "install" script in the same directory. - Install the "install" script and "build.info" file that gitstatus.prompt.zsh expects to be able to find when it runs. - Patch the install script so that it defaults to not automatically installing gitstatus. This can still be overridden by setting GITSTATUS_AUTO_INSTALL=1, although I'm not sure why anyone would do this if they've already installed gitstatus with Nix. - Add an install check phase that tests the zsh integration to prevent this derivation from breaking in the same way in the future. (This also ends up testing the binary itself.) Fixes NixOS#96135.
bdesham
force-pushed
the
fix-gitstatus-on-zsh
branch
from
94394ee
to
c278c6f
Compare
|
@GrahamcOfBorg build gitAndTools.gitstatus |
|
Tested on NixOS and this indeed fixes the zsh integration. |
mweinelt
reviewed
Sep 23, 2020
Can only add org members afair. |
|
Yep, I'm not part of the org (not sure how to get into it actually...). @bdesham I don't use the zsh integration so am not really set up to test this. The diff looks good to me, the test makes sense too. That along with @ryneeverett's input I'd give this a @mweinelt can you hit the merge button? |
.
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
At some point the upstream changed and gitstatus.prompt.zsh stopped working. The issue was that this file expects to be able to run the "install" script in the same directory.
Fixes #96135.
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)