Merge pull request #92 from dmalikov/b125ef36b67f2a0aedabc34eb4dac12e61ae9828

gitAndTools: bump tig from 0.16 to 1.0

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

@@ -69,22 +69,8 @@ rec {
     inherit stdenv fetchurl unzip;
   };
 
-  tig = stdenv.mkDerivation {
+  tig = import ./tig {
-    name = "tig-0.16";
+    inherit stdenv fetchurl ncurses asciidoc xmlto docbook_xsl;
-    src = fetchurl {
-      url = "http://jonas.nitro.dk/tig/releases/tig-0.16.tar.gz";
-      sha256 = "167kak44n66wqjj6jrv8q4ijjac07cw22rlpqjqz3brlhx4cb3ix";
-    };
-    buildInputs = [ncurses asciidoc xmlto docbook_xsl];
-    installPhase = ''
-      make install
-      make install-doc
-    '';
-    meta = {
-      description = "console git repository browser that additionally can act as a pager for output from various git commands";
-      homepage = http://jonas.nitro.dk/tig/;
-      license = "GPLv2";
-    };
   };
 
   gitFastExport = import ./fast-export {

pkgs/applications/version-management/git-and-tools/tig/default.nix

@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, ncurses, asciidoc, xmlto, docbook_xsl }:
+
+stdenv.mkDerivation {
+  name = "tig-1.0";
+  src = fetchurl {
+    url = "http://jonas.nitro.dk/tig/releases/tig-1.0.tar.gz";
+    md5 = "a2d414d1cebbc9cd4f3d545bc6f225c6";
+  };
+  buildInputs = [ncurses asciidoc xmlto docbook_xsl];
+  installPhase = ''
+    make install
+    make install-doc
+  '';
+  meta = {
+    description = "Tig is a git repository browser that additionally can act as a pager for output from various git commands";
+    homepage = "http://jonas.nitro.dk/tig/";
+    license = "GPLv2";
+  };
+}

pkgs/top-level/all-packages.nix

@@ -6901,6 +6901,7 @@ let
   git = gitAndTools.git;
   gitFull = gitAndTools.gitFull;
   gitSVN = gitAndTools.gitSVN;
+  tig = gitAndTools.tig;
 
   giv = callPackage ../applications/graphics/giv {
     pcre = pcre.override { unicodeSupport = true; };