texinfo6_7: drop

pkgs/development/tools/misc/texinfo/common.nix

@@ -7,12 +7,10 @@
   libintl,
   bashNonInteractive,
   updateAutotoolsGnuConfigScriptsHook,
-  gnulib,
   gawk,
   freebsd,
   glibcLocales,
   libiconv,
-  xz,
 
   # we are a dependency of gcc, this simplifies bootstrapping
   interactive ? false,
@@ -56,16 +54,9 @@ stdenv.mkDerivation {
 
   patches = patches ++ optional crossBuildTools ./cross-tools-flags.patch;
 
-  postPatch =
-    ''
-      patchShebangs tp/maintain/regenerate_commands_perl_info.pl
-    ''
-    # This patch is needed for IEEE-standard long doubles on
-    # powerpc64; it does not apply cleanly to texinfo 5.x or
-    # earlier.  It is merged upstream in texinfo 6.8.
-    + optionalString (version == "6.7") ''
-      patch -p1 -d gnulib < ${gnulib.passthru.longdouble-redirect-patch}
-    '';
+  postPatch = ''
+    patchShebangs tp/maintain/regenerate_commands_perl_info.pl
+  '';
 
   env =
     {
@@ -147,7 +138,5 @@ stdenv.mkDerivation {
 
   meta = meta // {
     branch = version;
-    # see comment above in patches section
-    broken = stdenv.hostPlatform.isPower64 && versionOlder version "6.0";
   };
 }

pkgs/development/tools/misc/texinfo/packages.nix

@@ -8,11 +8,9 @@
   libintl,
   bashNonInteractive,
   updateAutotoolsGnuConfigScriptsHook,
-  gnulib,
   gawk,
   freebsd,
   libiconv,
-  xz,
 
   # we are a dependency of gcc, this simplifies bootstrapping
   interactive ? false,
@@ -54,11 +52,9 @@ let
       updateAutotoolsGnuConfigScriptsHook
       fetchurl
       perl
-      xz
       libintl
       libiconv
       bashNonInteractive
-      gnulib
       gawk
       freebsd
       ncurses
@@ -73,10 +69,6 @@ in
     version = "6.5";
     hash = "sha256-d3dLP0oGwgcFzC7xyASGRCLjz5UjXpZbHwCkbffaX2I=";
   };
-  texinfo6_7 = buildTexinfo {
-    version = "6.7";
-    hash = "sha256-mIQDwVQtFa0ERgC5CZl7owebEOAyJMYRiBF/NnawLKo=";
-  };
   texinfo6 = buildTexinfo {
     version = "6.8";
     hash = "sha256-jrdT7Si8oh+PVsGhgDYq7XiSKb1i//WL+DaOm+tZ/sQ=";

pkgs/top-level/all-packages.nix

@@ -7688,7 +7688,6 @@ with pkgs;
   texinfoPackages = callPackages ../development/tools/misc/texinfo/packages.nix { };
   inherit (texinfoPackages)
     texinfo6_5 # needed for allegro
-    texinfo6_7 # needed for fwknop
     texinfo6
     texinfo7
     ;