Drop texinfo6_7 & texinfo6_5 (#415152)

pkgs/by-name/gn/gnulib/gnulib-longdouble-redirect.patch

···
-
-Below is the subset of gnulib commit
-776af40e09b476a41073131a90022572f448c189 which deals with long double
-redirects.  The rest of that commit has been removed.
-
-diff --git a/lib/cdefs.h b/lib/cdefs.h
-index fd72b7b..4383e70 100644
---- a/lib/cdefs.h
-+++ b/lib/cdefs.h
-@@ -483,7 +493,37 @@
- # include <bits/long-double.h>
- #endif
- 
--#if defined __LONG_DOUBLE_MATH_OPTIONAL && defined __NO_LONG_DOUBLE_MATH
-+#if __LDOUBLE_REDIRECTS_TO_FLOAT128_ABI == 1
-+# ifdef __REDIRECT
-+
-+/* Alias name defined automatically.  */
-+#  define __LDBL_REDIR(name, proto) ... unused__ldbl_redir
-+#  define __LDBL_REDIR_DECL(name) \
-+  extern __typeof (name) name __asm (__ASMNAME ("__" #name "ieee128"));
-+
-+/* Alias name defined automatically, with leading underscores.  */
-+#  define __LDBL_REDIR2_DECL(name) \
-+  extern __typeof (__##name) __##name \
-+    __asm (__ASMNAME ("__" #name "ieee128"));
-+
-+/* Alias name defined manually.  */
-+#  define __LDBL_REDIR1(name, proto, alias) ... unused__ldbl_redir1
-+#  define __LDBL_REDIR1_DECL(name, alias) \
-+  extern __typeof (name) name __asm (__ASMNAME (#alias));
-+
-+#  define __LDBL_REDIR1_NTH(name, proto, alias) \
-+  __REDIRECT_NTH (name, proto, alias)
-+#  define __REDIRECT_NTH_LDBL(name, proto, alias) \
-+  __LDBL_REDIR1_NTH (name, proto, __##alias##ieee128)
-+
-+/* Unused.  */
-+#  define __REDIRECT_LDBL(name, proto, alias) ... unused__redirect_ldbl
-+#  define __LDBL_REDIR_NTH(name, proto) ... unused__ldbl_redir_nth
-+
-+# else
-+_Static_assert (0, "IEEE 128-bits long double requires redirection on this platform");
-+# endif
-+#elif defined __LONG_DOUBLE_MATH_OPTIONAL && defined __NO_LONG_DOUBLE_MATH
- # define __LDBL_COMPAT 1
- # ifdef __REDIRECT
- #  define __LDBL_REDIR1(name, proto, alias) __REDIRECT (name, proto, alias)
-@@ -492,6 +532,8 @@
- #  define __LDBL_REDIR1_NTH(name, proto, alias) __REDIRECT_NTH (name, proto, alias)
- #  define __LDBL_REDIR_NTH(name, proto) \
-   __LDBL_REDIR1_NTH (name, proto, __nldbl_##name)
-+#  define __LDBL_REDIR2_DECL(name) \
-+  extern __typeof (__##name) __##name __asm (__ASMNAME ("__nldbl___" #name));
- #  define __LDBL_REDIR1_DECL(name, alias) \
-   extern __typeof (name) name __asm (__ASMNAME (#alias));
- #  define __LDBL_REDIR_DECL(name) \
-@@ -502,11 +544,13 @@
-   __LDBL_REDIR1_NTH (name, proto, __nldbl_##alias)
- # endif
- #endif
--#if !defined __LDBL_COMPAT || !defined __REDIRECT
-+#if (!defined __LDBL_COMPAT && __LDOUBLE_REDIRECTS_TO_FLOAT128_ABI == 0) \
-+    || !defined __REDIRECT
- # define __LDBL_REDIR1(name, proto, alias) name proto
- # define __LDBL_REDIR(name, proto) name proto
- # define __LDBL_REDIR1_NTH(name, proto, alias) name proto __THROW
- # define __LDBL_REDIR_NTH(name, proto) name proto __THROW
-+# define __LDBL_REDIR2_DECL(name)
- # define __LDBL_REDIR_DECL(name)
- # ifdef __REDIRECT
- #  define __REDIRECT_LDBL(name, proto, alias) __REDIRECT (name, proto, alias)

pkgs/by-name/gn/gnulib/package.nix

···
   # do not change headers to not update all vendored build files
   dontFixup = true;
 
-  passthru = {
-    # This patch is used by multiple other packages (currently:
-    # gnused, gettext) which contain vendored copies of gnulib.
-    # Without it, compilation will fail with error messages about
-    # "__LDBL_REDIR1_DECL" or similar on platforms with longdouble
-    # redirects (currently powerpc64).  Once all of those other
-    # packages make a release with a newer gnulib we can drop this
-    # patch.
-    longdouble-redirect-patch = ./gnulib-longdouble-redirect.patch;
-  };
-
   meta = with lib; {
     description = "Central location for code to be shared among GNU packages";
     homepage = "https://www.gnu.org/software/gnulib/";

pkgs/development/libraries/allegro/default.nix

···
   lib,
   stdenv,
   fetchurl,
-  texinfo6_5,
+  texinfo6,
   libXext,
   xorgproto,
   libX11,
···
     pkg-config
   ];
   buildInputs = [
-    texinfo6_5
+    texinfo6
     libXext
     xorgproto
     libX11

pkgs/development/libraries/iksemel/default.nix

···
     sha256 = "1xv302p344hnpxqcgs3z6wwxhrik39ckgfw5cjyrw0dkf316z9yh";
   };
 
+  patches = [
+    ./update-texinfo.diff
+  ];
+
   nativeBuildInputs = [
     pkg-config
     autoreconfHook

pkgs/development/libraries/iksemel/update-texinfo.diff

···
+diff --git a/doc/iksemel.texi b/doc/iksemel.texi
+index f57779c..2a7fb31 100644
+--- a/doc/iksemel.texi
++++ b/doc/iksemel.texi
+@@ -1,7 +1,6 @@
+ \input texinfo @c -*-texinfo-*-
+ @c %**start of header
+ @setfilename iksemel
+-@setcontentsaftertitlepage
+ @settitle Iksemel Programmers Manual
+ @set VERSION 1.2
+ @c %**end of header
+@@ -24,6 +23,8 @@ MA 02111-1307, USA.
+ 
+ @end titlepage
+ 
++@contents
++
+ @ifinfo
+ @node Top, , , (dir)
+ @top iksemel Programmers Manual
+@@ -1538,6 +1539,4 @@ Jabber Protocol Documents @url{http://www.jabber.org/protocol/}
+ @unnumbered Function Index
+ @printindex fn
+ 
+-
+-@contents
+ @bye

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

···
   libintl,
   bashNonInteractive,
   updateAutotoolsGnuConfigScriptsHook,
-  gnulib,
   gawk,
   freebsd,
   glibcLocales,
   libiconv,
-  xz,
 
   # we are a dependency of gcc, this simplifies bootstrapping
   interactive ? false,
···
 
   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 =
     {
···
 
   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

···
   libintl,
   bashNonInteractive,
   updateAutotoolsGnuConfigScriptsHook,
-  gnulib,
   gawk,
   freebsd,
   libiconv,
-  xz,
 
   # we are a dependency of gcc, this simplifies bootstrapping
   interactive ? false,
···
       updateAutotoolsGnuConfigScriptsHook
       fetchurl
       perl
-      xz
       libintl
       libiconv
       bashNonInteractive
-      gnulib
       gawk
       freebsd
       ncurses
···
   };
 in
 {
-  texinfo6_5 = buildTexinfo {
-    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/tools/security/fwknop/default.nix

···
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   autoreconfHook,
   libpcap,
   texinfo,
···
 
 stdenv.mkDerivation rec {
   pname = "fwknop";
-  version = "2.6.10";
+  version = "2.6.11";
 
   src = fetchFromGitHub {
     owner = "mrash";
-    repo = pname;
-    rev = version;
-    sha256 = "05kvqhmxj9p2y835w75f3jvhr38bb96cd58mvfd7xil9dhmhn9ra";
+    repo = "fwknop";
+    tag = version;
+    hash = "sha256-jnEBRJCt7pAmXRIBVT2OwJqT5Zr/JaRgPDqccx0W/9o=";
   };
 
-  patches = [
-    # Pull patch pending upstream inclusion for -fno-common tollchains:
-    #   https://github.com/mrash/fwknop/pull/319
-    (fetchpatch {
-      name = "fno-common.patch";
-      url = "https://github.com/mrash/fwknop/commit/a8214fd58bc46d23b64b3a55db023c7f5a5ea6af.patch";
-      sha256 = "0cp1350q66n455hpd3rdydb9anx66bcirza5gyyyy5232zgg58bi";
-    })
-
-    # Pull patch pending upstream inclusion for `autoconf-2.72` support:
-    #   https://github.com/mrash/fwknop/pull/357
-    (fetchpatch {
-      name = "autoconf-2.72.patch";
-      url = "https://github.com/mrash/fwknop/commit/bee7958532338499e35c19e75937891c8113f7de.patch";
-      hash = "sha256-lrro5dSDR0Zz9aO3bV5vFFADNJjoDR9z6P5lFYWyLW8=";
-    })
-  ];
+  nativeBuildInputs = [ autoreconfHook ];
 
-  nativeBuildInputs = [ autoreconfHook ];
   buildInputs =
     [
       libpcap
···
   # this'll probably be helpful until there's a NixOS module for that (feel free
   # to ping me (@primeos) if you want to help).
   preInstall = ''
-    substituteInPlace Makefile --replace\
+    substituteInPlace Makefile --replace-fail \
       "sysconfdir = /etc"\
       "sysconfdir = $out/etc"
-    substituteInPlace server/Makefile --replace\
+    substituteInPlace server/Makefile --replace-fail \
       "wknopddir = /etc/fwknop"\
       "wknopddir = $out/etc/fwknop"
   '';

pkgs/top-level/all-packages.nix

···
 
   fstl = callPackage ../applications/graphics/fstl { };
 
-  fwknop = callPackage ../tools/security/fwknop {
-    texinfo = texinfo6_7; # Uses @setcontentsaftertitlepage, removed in 6.8.
-  };
+  fwknop = callPackage ../tools/security/fwknop { };
 
   uniscribe = callPackage ../tools/text/uniscribe { };
 
···
 
   texinfoPackages = callPackages ../development/tools/misc/texinfo/packages.nix { };
   inherit (texinfoPackages)
-    texinfo6_5 # needed for allegro
-    texinfo6_7 # needed for gpm, iksemel and fwknop
     texinfo6
     texinfo7
     ;
···
 
   gpm = callPackage ../servers/gpm {
     withNcurses = false; # Keep curses disabled for lack of value
-
-    # latest 6.8 mysteriously fails to parse '@headings single':
-    #   https://lists.gnu.org/archive/html/bug-texinfo/2021-09/msg00011.html
-    texinfo = buildPackages.texinfo6_7;
   };
 
   gpm-ncurses = gpm.override { withNcurses = true; };
···
     subversionSupport = true;
   };
 
-  iksemel = callPackage ../development/libraries/iksemel {
-    texinfo = buildPackages.texinfo6_7; # Uses @setcontentsaftertitlepage, removed in 6.8.
-  };
+  iksemel = callPackage ../development/libraries/iksemel { };
 
   avalonia-ilspy = callPackage ../applications/misc/avalonia-ilspy {
     inherit (darwin) autoSignDarwinBinariesHook;