summary refs log tree commit diff
diff options
context:
space:
mode:
authorRenaud <c0bw3b@users.noreply.github.com>2019-11-12 20:30:44 +0100
committerGitHub <noreply@github.com>2019-11-12 20:30:44 +0100
commit9d0c1c1e8441d3c8d31f590c08d38857abb5c8b5 (patch)
treee5e81e88fefb32967bc62493439d64dfaf1f75a9
parent354e872ad8a060f1df066e0a483ca92d4ff0fe01 (diff)
parent6d9280ea0f7183b51224cf0143a8fbfc2c3d7d07 (diff)
downloadnixpkgs-9d0c1c1e8441d3c8d31f590c08d38857abb5c8b5.tar
nixpkgs-9d0c1c1e8441d3c8d31f590c08d38857abb5c8b5.tar.gz
nixpkgs-9d0c1c1e8441d3c8d31f590c08d38857abb5c8b5.tar.bz2
nixpkgs-9d0c1c1e8441d3c8d31f590c08d38857abb5c8b5.tar.lz
nixpkgs-9d0c1c1e8441d3c8d31f590c08d38857abb5c8b5.tar.xz
nixpkgs-9d0c1c1e8441d3c8d31f590c08d38857abb5c8b5.tar.zst
nixpkgs-9d0c1c1e8441d3c8d31f590c08d38857abb5c8b5.zip
Merge pull request #70210 from cko/git-extras
gitAndTools.git-extras: 4.7.0 -> 5.0.0
-rw-r--r--pkgs/applications/version-management/git-and-tools/git-extras/default.nix17
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 09c9169e434..64ef6db980b 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
   '';