public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #41255 from dtzWill/update/hub-2.3.0 

hub: 2.2.9 -> 2.3.0
This commit is contained in:
Will Dietz 2018-05-30 21:17:16 -05:00 committed by GitHub
parent 4afe59cb36 4fc23d2de0
commit 98981ec9c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/version-management/git-and-tools/default.nix
View File

@ -109,9 +109,7 @@ rec {
inherit (darwin) Security;
};
hubUnstable = callPackage ./hub/unstable.nix {
inherit (darwin) Security;
};
hubUnstable = throw "use gitAndTools.hub instead";
qgit = qt5.callPackage ./qgit { };

26
pkgs/applications/version-management/git-and-tools/hub/default.nix
View File

@ -1,31 +1,29 @@
{ stdenv, fetchgit, go, Security }:
{ stdenv, fetchgit, go, ronn, groff, utillinux, Security }:
stdenv.mkDerivation rec {
name = "hub-${version}";
version = "2.2.9";
version = "2.3.0";
src = fetchgit {
url = https://github.com/github/hub.git;
rev = "refs/tags/v${version}";
sha256 = "195ckp1idz2azv0mm1q258yjz2n51sia9xdcjnqlprmq9aig5ldh";
sha256 = "0rx5izxgjxh4jdn991x90xvgbc7nhwx15pkmmzc8rkdzf0hnas1s";
};
buildInputs = [ go ] ++ stdenv.lib.optional stdenv.isDarwin Security;
phases = [ "unpackPhase" "buildPhase" "installPhase" ];
buildInputs = [ go ronn groff utillinux ]
++ stdenv.lib.optional stdenv.isDarwin Security;
buildPhase = ''
mkdir bin
ln -s ${ronn}/bin/ronn bin/ronn
patchShebangs .
sh script/build
make all man-pages
'';
installPhase = ''
mkdir -p "$out/bin"
cp bin/hub "$out/bin/"
mkdir -p "$out/share/man/man1"
cp "man/hub.1" "$out/share/man/man1/"
prefix=$out sh -x < script/install.sh
mkdir -p "$out/share/zsh/site-functions"
cp "etc/hub.zsh_completion" "$out/share/zsh/site-functions/_hub"
@ -33,8 +31,8 @@ stdenv.mkDerivation rec {
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?
# ?
# Should we also install provided git-hooks?
# And fish completion?
'';
meta = with stdenv.lib; {

36
pkgs/applications/version-management/git-and-tools/hub/unstable.nix
View File

@ -1,36 +0,0 @@
{ stdenv, fetchgit, go, ronn, groff, utillinux, Security }:
stdenv.mkDerivation rec {
name = "hub-${version}";
version = "2.3.0-pre10";
src = fetchgit {
url = https://github.com/github/hub.git;
rev = "refs/tags/v${version}";
sha256 = "07sz1i6zxx2g36ayhjp1vjw523ckk5b0cr8b80s1qhar2d2hkibd";
};
buildInputs = [ go ronn groff utillinux ]
++ stdenv.lib.optional stdenv.isDarwin Security;
buildPhase = ''
mkdir bin
ln -s ${ronn}/bin/ronn bin/ronn
patchShebangs .
make all man-pages
'';
installPhase = ''
prefix=$out sh -x < script/install.sh
'';
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 ];
platforms = with platforms; unix;
};
}