diff options
author | Kirill Elagin <kirelagin@gmail.com> | 2015-01-04 02:28:38 +0300 |
---|---|---|
committer | Kirill Elagin <kirelagin@gmail.com> | 2015-01-04 02:28:38 +0300 |
commit | 4b84049bd3e96835e64b399731ae71cfd46ba8a8 (patch) | |
tree | 8c4de024a4efea31d1d3ca7e83598ca11ffebec2 /pkgs/applications/version-management | |
parent | 6b8b0fd544ee7b72da7c89151f5e5cff826ebc8a (diff) | |
download | nixpkgs-4b84049bd3e96835e64b399731ae71cfd46ba8a8.tar nixpkgs-4b84049bd3e96835e64b399731ae71cfd46ba8a8.tar.gz nixpkgs-4b84049bd3e96835e64b399731ae71cfd46ba8a8.tar.bz2 nixpkgs-4b84049bd3e96835e64b399731ae71cfd46ba8a8.tar.lz nixpkgs-4b84049bd3e96835e64b399731ae71cfd46ba8a8.tar.xz nixpkgs-4b84049bd3e96835e64b399731ae71cfd46ba8a8.tar.zst nixpkgs-4b84049bd3e96835e64b399731ae71cfd46ba8a8.zip |
gitAndTools.hub: Update to 2.x
Diffstat (limited to 'pkgs/applications/version-management')
-rw-r--r-- | pkgs/applications/version-management/git-and-tools/default.nix | 5 | ||||
-rw-r--r-- | pkgs/applications/version-management/git-and-tools/hub/default.nix | 50 |
2 files changed, 37 insertions, 18 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 3714df5fb6b..891c947e85b 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -73,9 +73,8 @@ rec { }; hub = import ./hub { - inherit (rubyLibs) rake; - inherit stdenv fetchurl groff makeWrapper; - git = gitBase; + inherit go; + inherit stdenv fetchgit; }; gitFastExport = import ./fast-export { diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix index 827fdb1fa8e..8f8b9fa5675 100644 --- a/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -1,28 +1,48 @@ -{ stdenv, fetchurl, git, groff, rake, makeWrapper }: +{ stdenv, fetchgit, go }: stdenv.mkDerivation rec { name = "hub-${version}"; - version = "1.12.2"; + version = "2.2.0-rc1"; - src = fetchurl { - url = "https://github.com/github/hub/archive/v${version}.tar.gz"; - sha256 = "112yfv9xklsmwv859kypv7hz0a6dj5hkrmjp7z1h40nrljc9mi79"; + src = fetchgit { + url = https://github.com/github/hub.git; + rev = "refs/tags/v${version}"; + sha256 = "1f6r8vlwnmqmr85drfv24vhqx1aacz6s83c2i804v9997n0wrwfm"; }; - buildInputs = [ rake makeWrapper ]; - installPhase = '' - rake install "prefix=$out" + buildInputs = [ go ]; + + phases = [ "unpackPhase" "buildPhase" "installPhase" ]; + + buildPhase = '' + ./script/build ''; - fixupPhase = '' - wrapProgram $out/bin/hub --prefix PATH : ${groff}/bin:${git}/bin + installPhase = '' + mkdir -p "$out/bin" + cp hub "$out/bin/" + + mkdir -p "$out/share/man/man1" + cp "man/hub.1" "$out/share/man/man1/" + + mkdir -p "$out/share/zsh/site-functions" + cp "etc/hub.zsh_completion" "$out/share/zsh/site-functions/_hub" + +# Broken: https://github.com/github/hub/issues/592 +# mkdir -p "$out/etc/bash_completion.d" +# cp "etc/hub.bash_completion.sh" "$out/etc/bash_completion.d/" + +# Should we also install provided git-hooks? +# ? ''; - meta = { - description = "A GitHub specific wrapper for git"; - homepage = "http://defunkt.io/hub/"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; + + meta = with stdenv.lib; { + description = "Command-line wrapper for git that makes you better at GitHub"; + + license = licenses.mit; + homepage = https://hub.github.com/; + maintainers = with maintainers; [ the-kenny ]; }; } |