Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 028e05d8a43e
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 2be541ff7ce6
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Aug 24, 2020

  1. gitstatus: fix zsh integration 

    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 #96135.
    @bdesham
    bdesham committed Aug 24, 2020
    Copy the full SHA
    c278c6f View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2020

  1. Merge pull request #96136 from bdesham/fix-gitstatus-on-zsh 

    gitstatus: fix zsh integration
    @mweinelt
    mweinelt committed Sep 24, 2020
    Copy the full SHA
    2be541f View commit details
    Browse the repository at this point in the history