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

Commits on Dec 31, 2019

  1. gitstatus: patch fewer lines 

    The sed invocation was changing all lines matching "local daemon.*".
This changed the line it was supposed to, but two other lines that also
matched that pattern were being modified, which meant that the
"daemon_pid_var" and "daemon_pid" variables were not defined when they
should have been.
    @bdesham
    bdesham committed Dec 31, 2019
    Copy the full SHA
    0542140 View commit details

Commits on Jan 1, 2020

  1. Merge pull request #76744 from bdesham/fix-gitstatus-patch 

    gitstatus: patch fewer lines
    @infinisil
    infinisil authored Jan 1, 2020
    Copy the full SHA
    59207c0 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 "s|local daemon=.*|local daemon=$out/bin/gitstatusd|" gitstatus.plugin.zsh
'';
installPhase = ''
install -Dm755 gitstatusd $out/bin/gitstatusd