lol

Revert "Revert "texinfo: 5.2 -> 6.0""

This reverts commit dc74a811291ea5e29e47f7dcc01bdac118f492fb.

This doesn't actually break gcc.

+47 -2
+44
pkgs/development/tools/misc/texinfo/6.0.nix
··· 1 + { stdenv, fetchurl, ncurses, perl, xz, interactive ? false }: 2 + 3 + stdenv.mkDerivation rec { 4 + name = "texinfo-6.0"; 5 + 6 + src = fetchurl { 7 + url = "mirror://gnu/texinfo/${name}.tar.xz"; 8 + sha256 = "1r3i6jyynn6ab45fxw5bms8mflk9ry4qpj6gqyry72vfd5c47fhi"; 9 + }; 10 + 11 + buildInputs = [ perl xz ] 12 + ++ stdenv.lib.optional interactive ncurses; 13 + 14 + preInstall = '' 15 + installFlags="TEXMF=$out/texmf-dist"; 16 + installTargets="install install-tex"; 17 + ''; 18 + 19 + doCheck = !stdenv.isDarwin; 20 + 21 + meta = { 22 + homepage = "http://www.gnu.org/software/texinfo/"; 23 + description = "The GNU documentation system"; 24 + license = stdenv.lib.licenses.gpl3Plus; 25 + platforms = stdenv.lib.platforms.all; 26 + 27 + longDescription = '' 28 + Texinfo is the official documentation format of the GNU project. 29 + It was invented by Richard Stallman and Bob Chassell many years 30 + ago, loosely based on Brian Reid's Scribe and other formatting 31 + languages of the time. It is used by many non-GNU projects as 32 + well. 33 + 34 + Texinfo uses a single source file to produce output in a number 35 + of formats, both online and printed (dvi, html, info, pdf, xml, 36 + etc.). This means that instead of writing different documents 37 + for online information and another for a printed manual, you 38 + need write only one document. And when the work is revised, you 39 + need revise only that one document. The Texinfo system is 40 + well-integrated with GNU Emacs. 41 + ''; 42 + branch = "5.2"; 43 + }; 44 + }
+3 -2
pkgs/top-level/all-packages.nix
··· 5811 5811 teensy-loader = callPackage ../development/tools/misc/teensy { }; 5812 5812 5813 5813 texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { }; 5814 + texinfo4 = texinfo413; 5814 5815 texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { }; 5815 - texinfo4 = texinfo413; 5816 - texinfo = texinfo5; 5816 + texinfo6 = callPackage ../development/tools/misc/texinfo/6.0.nix { }; 5817 + texinfo = texinfo6; 5817 5818 texinfoInteractive = appendToName "interactive" ( 5818 5819 texinfo.override { interactive = true; } 5819 5820 );