tig: 2.2 -> 2.2.1 (#24770)

* tig: 2.2 -> 2.2.1

Also move to different project URLs, as requested in
https://github.com/jonas/tig/releases/tag/tig-2.2.1

* tig: fix fetching mechanism

Rework the dependencies to allow use of fetchFromGitHub.
This commit is contained in:
Yann Hodique 2017-04-10 06:03:04 -07:00 committed by Jörg Thalheim
parent 0358bf2f92
commit a78ce1d4c6

View File

@ -1,20 +1,29 @@
{ stdenv, fetchurl, ncurses, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45 { stdenv, fetchFromGitHub, ncurses, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45
, readline, makeWrapper, git, libiconv , readline, makeWrapper, git, libiconv, autoreconfHook, findXMLCatalogs
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "tig-2.2"; pname = "tig";
version = "2.2.1";
name = "${pname}-${version}";
src = fetchurl { src = fetchFromGitHub {
url = "http://jonas.nitro.dk/tig/releases/${name}.tar.gz"; owner = "jonas";
sha256 = "0k3m894vfkgkj7xbr0j6ph91351dl6id5f0hk2ksjp5lmg9i6llg"; repo = pname;
rev = name;
sha256 = "09xiwm57df0vzk8r2hx5p1hwy5f9q8frmdf96aba2ia9837zn3av";
}; };
buildInputs = [ ncurses asciidoc xmlto docbook_xsl readline git makeWrapper ] nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs ];
autoreconfFlags = "-I tools -v";
buildInputs = [ ncurses readline git ]
++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ];
preConfigure = '' # those files are inherently impure, we'll handle the corresponding dependencies.
export XML_CATALOG_FILES='${docbook_xsl}/xml/xsl/docbook/catalog.xml ${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml' postPatch = ''
rm -f contrib/config.make-*
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;
@ -30,7 +39,7 @@ stdenv.mkDerivation rec {
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "http://jonas.nitro.dk/tig/"; homepage = "https://jonas.github.io/tig/";
description = "Text-mode interface for git"; description = "Text-mode interface for git";
maintainers = with maintainers; [ garbas bjornfor domenkozar qknight ]; maintainers = with maintainers; [ garbas bjornfor domenkozar qknight ];
license = licenses.gpl2; license = licenses.gpl2;