From 4fc23d2de09d3ae357088bcf35bb9915acd08e82 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Thu, 31 May 2018 00:35:20 +0100 Subject: hubUnstable: remove in favor of hub --- .../version-management/git-and-tools/default.nix | 4 +-- .../git-and-tools/hub/unstable.nix | 36 ---------------------- 2 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 pkgs/applications/version-management/git-and-tools/hub/unstable.nix diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 99b6b5313709..9a4ef524dde9 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -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 { }; diff --git a/pkgs/applications/version-management/git-and-tools/hub/unstable.nix b/pkgs/applications/version-management/git-and-tools/hub/unstable.nix deleted file mode 100644 index 7e83c2cfb674..000000000000 --- a/pkgs/applications/version-management/git-and-tools/hub/unstable.nix +++ /dev/null @@ -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; - }; -} -- cgit 1.4.1