From 257db17ee950d2865529603d1388cf7fbb8a0a89 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 12 Aug 2015 17:18:58 -0700
Subject: [PATCH] Revert "Revert "texinfo: 5.2 -> 6.0""

This reverts commit dc74a811291ea5e29e47f7dcc01bdac118f492fb.

This doesn't actually break gcc.
---
 pkgs/development/tools/misc/texinfo/6.0.nix | 44 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  5 ++-
 2 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/tools/misc/texinfo/6.0.nix

diff --git a/pkgs/development/tools/misc/texinfo/6.0.nix b/pkgs/development/tools/misc/texinfo/6.0.nix
new file mode 100644
index 000000000000..ffeae17eb57d
--- /dev/null
+++ b/pkgs/development/tools/misc/texinfo/6.0.nix
@@ -0,0 +1,44 @@
+{ stdenv, fetchurl, ncurses, perl, xz, interactive ? false }:
+
+stdenv.mkDerivation rec {
+  name = "texinfo-6.0";
+
+  src = fetchurl {
+    url = "mirror://gnu/texinfo/${name}.tar.xz";
+    sha256 = "1r3i6jyynn6ab45fxw5bms8mflk9ry4qpj6gqyry72vfd5c47fhi";
+  };
+
+  buildInputs = [ perl xz ]
+    ++ stdenv.lib.optional interactive ncurses;
+
+  preInstall = ''
+    installFlags="TEXMF=$out/texmf-dist";
+    installTargets="install install-tex";
+  '';
+
+  doCheck = !stdenv.isDarwin;
+
+  meta = {
+    homepage = "http://www.gnu.org/software/texinfo/";
+    description = "The GNU documentation system";
+    license = stdenv.lib.licenses.gpl3Plus;
+    platforms = stdenv.lib.platforms.all;
+
+    longDescription = ''
+      Texinfo is the official documentation format of the GNU project.
+      It was invented by Richard Stallman and Bob Chassell many years
+      ago, loosely based on Brian Reid's Scribe and other formatting
+      languages of the time.  It is used by many non-GNU projects as
+      well.
+
+      Texinfo uses a single source file to produce output in a number
+      of formats, both online and printed (dvi, html, info, pdf, xml,
+      etc.).  This means that instead of writing different documents
+      for online information and another for a printed manual, you
+      need write only one document.  And when the work is revised, you
+      need revise only that one document.  The Texinfo system is
+      well-integrated with GNU Emacs.
+    '';
+    branch = "5.2";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6181925a5074..2dd01957be74 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5811,9 +5811,10 @@ let
   teensy-loader = callPackage ../development/tools/misc/teensy { };
 
   texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { };
-  texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { };
   texinfo4 = texinfo413;
-  texinfo = texinfo5;
+  texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { };
+  texinfo6 = callPackage ../development/tools/misc/texinfo/6.0.nix { };
+  texinfo = texinfo6;
   texinfoInteractive = appendToName "interactive" (
     texinfo.override { interactive = true; }
   );