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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 55b0129a14b1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8bc64e2bbb49
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 12, 2020

  1. gitstatus: patch fewer characters 

    This is a followup to #76744.

The patch is still too aggressive because it captures additional local
variables declared in the same line. It should stop when it hits
whitespace.

See romkatv/gitstatus#92.
    @ryneeverett
    ryneeverett committed Jan 12, 2020
    Copy the full SHA
    be4efc8 View commit details

  2. gitstatus: patch in variable rather than regexing 

    Patching in the GITSTATUS_DAEMON variable seems like a more stable
solution than doing inline replacements.
    @ryneeverett
    ryneeverett committed Jan 12, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f5e446b View commit details

Commits on Jan 13, 2020

  1. gitstatus: patch fewer characters (#77580) 

    gitstatus: patch fewer characters
    @infinisil
    infinisil authored Jan 13, 2020
    Copy the full SHA
    8bc64e2 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/applications/version-management/git-and-tools/gitstatus/default.nix
2 changes: 1 addition & 1 deletion pkgs/applications/version-management/git-and-tools/gitstatus/default.nix
View file
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ stdenv.mkDerivation {

buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ];
patchPhase = ''
sed -i "s|local daemon=.*|local daemon=$out/bin/gitstatusd|" gitstatus.plugin.zsh
sed -i "1i GITSTATUS_DAEMON=$out/bin/gitstatusd" gitstatus.plugin.zsh
'';
installPhase = ''
install -Dm755 gitstatusd $out/bin/gitstatusd