From 7c86d10590ccc5330fed0866fe937faf3e36f7a3 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Wed, 15 Sep 2021 22:18:54 +0100
Subject: [PATCH] texinfo6_8: init at 6.8 (without switching default)

(forward-picked from commit 1165533fc3f52809ff, partially)
The point is to work around issue #139470: fetchurl on Hydra.
---
 pkgs/development/tools/misc/texinfo/6.8.nix    | 4 ++++
 pkgs/development/tools/misc/texinfo/common.nix | 6 ++++++
 pkgs/top-level/all-packages.nix                | 1 +
 3 files changed, 11 insertions(+)
 create mode 100644 pkgs/development/tools/misc/texinfo/6.8.nix

diff --git a/pkgs/development/tools/misc/texinfo/6.8.nix b/pkgs/development/tools/misc/texinfo/6.8.nix
new file mode 100644
index 000000000000..11435bf329f6
--- /dev/null
+++ b/pkgs/development/tools/misc/texinfo/6.8.nix
@@ -0,0 +1,4 @@
+import ./common.nix {
+  version = "6.8";
+  sha256 = "1i7yb7mrp3inz25zbzv2pllr4y7d58v818f1as7iz8mw53nm7dwf";
+}
diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix
index 1c5de083bc0d..d6e6bced405b 100644
--- a/pkgs/development/tools/misc/texinfo/common.nix
+++ b/pkgs/development/tools/misc/texinfo/common.nix
@@ -54,6 +54,12 @@ stdenv.mkDerivation {
     && !stdenv.isDarwin
     && !stdenv.isSunOS; # flaky
 
+  checkFlagsArray = if version == "6.8" then [
+    # Test is known to fail on various locales on texinfo-6.8:
+    #   https://lists.gnu.org/r/bug-texinfo/2021-07/msg00012.html
+    "XFAIL_TESTS=test_scripts/layout_formatting_fr_icons.sh"
+  ] else null;
+
   meta = {
     homepage = "https://www.gnu.org/software/texinfo/";
     description = "The GNU documentation system";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4f91cf812e3c..c53485f5dea4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14878,6 +14878,7 @@ with pkgs;
   texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { };
   texinfo6_5 = callPackage ../development/tools/misc/texinfo/6.5.nix { }; # needed for allegro
   texinfo6 = callPackage ../development/tools/misc/texinfo/6.7.nix { };
+  texinfo6_8 = callPackage ../development/tools/misc/texinfo/6.8.nix { };
   texinfo = texinfo6;
   texinfoInteractive = appendToName "interactive" (
     texinfo.override { interactive = true; }