diff options
author | Charles Strahan <charles.c.strahan@gmail.com> | 2015-01-20 20:21:03 -0500 |
---|---|---|
committer | Charles Strahan <charles.c.strahan@gmail.com> | 2015-01-20 20:21:03 -0500 |
commit | dfc225d143142764daf2c1e933e7303a82f7b0cd (patch) | |
tree | 351925e835e82d7f7d20a7eb8567b5a2aaa658c7 /pkgs/applications/version-management/git-and-tools/hub/default.nix | |
parent | bd5374664663bbf1c2675c100eee8cfe14c6d148 (diff) | |
parent | c55b5eb245198cf3fa58e477a301c90f754f6682 (diff) | |
download | nixlib-dfc225d143142764daf2c1e933e7303a82f7b0cd.tar nixlib-dfc225d143142764daf2c1e933e7303a82f7b0cd.tar.gz nixlib-dfc225d143142764daf2c1e933e7303a82f7b0cd.tar.bz2 nixlib-dfc225d143142764daf2c1e933e7303a82f7b0cd.tar.lz nixlib-dfc225d143142764daf2c1e933e7303a82f7b0cd.tar.xz nixlib-dfc225d143142764daf2c1e933e7303a82f7b0cd.tar.zst nixlib-dfc225d143142764daf2c1e933e7303a82f7b0cd.zip |
Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby
Conflicts: pkgs/applications/version-management/git-and-tools/default.nix pkgs/applications/version-management/git-and-tools/hub/default.nix pkgs/tools/audio/mpdcron/default.nix
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools/hub/default.nix')
-rw-r--r-- | pkgs/applications/version-management/git-and-tools/hub/default.nix | 52 |
1 files changed, 33 insertions, 19 deletions
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 abb2db5f1a70..be53a429e7b9 100644 --- a/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -1,32 +1,46 @@ -{ stdenv, fetchurl, groff, buildRubyGem, makeWrapper }: +{ stdenv, fetchgit, go }: -let rake = buildRubyGem { - name = "rake-10.3.2"; - sha256 = "0nvpkjrpsk8xxnij2wd1cdn6arja9q11sxx4aq4fz18bc6fss15m"; -}; in 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 ]; + buildInputs = [ go ]; - installPhase = '' - rake install "prefix=$out" + phases = [ "unpackPhase" "buildPhase" "installPhase" ]; + + buildPhase = '' + sh script/build ''; - fixupPhase = '' - wrapProgram $out/bin/hub --prefix PATH : ${groff}/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 ]; }; } |