Merge master into staging

2 files changed, 40 insertions, 0 deletions

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 864a69323f81..cd969ff81d0b 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -106,6 +106,10 @@ rec {
     inherit (darwin) Security;
   };
 
+  hubUnstable = callPackage ./hub/unstable.nix {
+    inherit (darwin) Security;
+  };
+
   qgit = qt5.callPackage ./qgit { };
 
   stgit = callPackage ./stgit {
diff --git a/pkgs/applications/version-management/git-and-tools/hub/unstable.nix b/pkgs/applications/version-management/git-and-tools/hub/unstable.nix
new file mode 100644
index 000000000000..7e83c2cfb674
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/hub/unstable.nix
@@ -0,0 +1,36 @@
+{ 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;
+  };
+}