diff options
author | Yann Hodique <yann.hodique@gmail.com> | 2017-04-10 06:03:04 -0700 |
---|---|---|
committer | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-04-10 15:03:04 +0200 |
commit | a78ce1d4c6d9f39f591d420547291d5f36cc8b27 (patch) | |
tree | c34e9f4c0ba0665a4482289e28a360591f08db97 /pkgs/applications/version-management/git-and-tools/tig | |
parent | 0358bf2f9202062af8f405bfcb3d3d45133414f2 (diff) |
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.
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools/tig')
-rw-r--r-- | pkgs/applications/version-management/git-and-tools/tig/default.nix | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index f953bbad48ba1..99c1dcb281c01 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -1,20 +1,29 @@ -{ stdenv, fetchurl, ncurses, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45 -, readline, makeWrapper, git, libiconv +{ stdenv, fetchFromGitHub, ncurses, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45 +, readline, makeWrapper, git, libiconv, autoreconfHook, findXMLCatalogs }: stdenv.mkDerivation rec { - name = "tig-2.2"; - - src = fetchurl { - url = "http://jonas.nitro.dk/tig/releases/${name}.tar.gz"; - sha256 = "0k3m894vfkgkj7xbr0j6ph91351dl6id5f0hk2ksjp5lmg9i6llg"; + pname = "tig"; + version = "2.2.1"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "jonas"; + 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 ]; - preConfigure = '' - export XML_CATALOG_FILES='${docbook_xsl}/xml/xsl/docbook/catalog.xml ${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml' + # those files are inherently impure, we'll handle the corresponding dependencies. + postPatch = '' + rm -f contrib/config.make-* ''; enableParallelBuilding = true; @@ -30,7 +39,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "http://jonas.nitro.dk/tig/"; + homepage = "https://jonas.github.io/tig/"; description = "Text-mode interface for git"; maintainers = with maintainers; [ garbas bjornfor domenkozar qknight ]; license = licenses.gpl2; |