diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-14 13:31:39 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-14 13:31:39 +0100 |
commit | c6e31d0767dcf41b91bbbc151c265872f9394c55 (patch) | |
tree | 6e54af47c9452c76b53b4cffa3a81284444b6030 /pkgs/applications/version-management/git-and-tools | |
parent | f7993885500f927f2f22eb7b3249568dce6a0bac (diff) | |
parent | c747894638a08b7a6dc096d6ef09a1094f1c260f (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools')
-rw-r--r-- | pkgs/applications/version-management/git-and-tools/git-extras/default.nix | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix index 09c9169e434e..64ef6db980b2 100644 --- a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix @@ -1,19 +1,26 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchzip, unixtools, which }: stdenv.mkDerivation rec { pname = "git-extras"; - version = "4.7.0"; + version = "5.0.0"; - src = fetchurl { + src = fetchzip { url = "https://github.com/tj/git-extras/archive/${version}.tar.gz"; - sha256 = "0pab4f5kmmcn333aswkgndf1fgilc41h8h0rk3lviz0yi8j59vaq"; + sha256 = "0c839kc5mhi1iqhc696p4dj67i5hm2gi4d8cvdpskaapb124mj2f"; }; + nativeBuildInputs = [ unixtools.column which ]; + dontBuild = true; - installFlags = [ "DESTDIR=${placeholder "out"}" "PREFIX=" ]; + preInstall = '' + patchShebangs . + ''; + + installFlags = [ "PREFIX=${placeholder "out"}" ]; postInstall = '' + # bash completion is already handled by make install install -D etc/git-extras-completion.zsh $out/share/zsh/site-functions/_git_extras ''; |