Revert "texinfo: 5.2 -> 6.0"

This reverts commit b1ed04ad1d56f882b6187ad75be6151535742a52. It breaks gcc:

http://hydra.nixos.org/build/24651204

2 files changed, 2 insertions, 47 deletions

diff --git a/pkgs/development/tools/misc/texinfo/6.0.nix b/pkgs/development/tools/misc/texinfo/6.0.nix
deleted file mode 100644
index ffeae17eb57..00000000000
--- a/pkgs/development/tools/misc/texinfo/6.0.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ 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 2dd01957be7..6181925a507 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5811,10 +5811,9 @@ let
   teensy-loader = callPackage ../development/tools/misc/teensy { };
 
   texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { };
-  texinfo4 = texinfo413;
   texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { };
-  texinfo6 = callPackage ../development/tools/misc/texinfo/6.0.nix { };
-  texinfo = texinfo6;
+  texinfo4 = texinfo413;
+  texinfo = texinfo5;
   texinfoInteractive = appendToName "interactive" (
     texinfo.override { interactive = true; }
   );