texinfo: revert to version 6.5 on Darwin

It's basically a partial revert of PR #95910.
I chose a temporar-ish solution, maximizing likelihood of fixing
this while minimizing rebuilds.  (20.09 process is being blocked)
This commit is contained in:
Vladimír Čunát 2020-09-06 09:43:32 +02:00
parent f0cb5c6a15
commit b23940e514
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 7 additions and 1 deletions

View File

@ -0,0 +1,4 @@
import ./common.nix {
version = "6.5";
sha256 = "0qjzvbvnv9003xdrcpi3jp7y68j4hq2ciw9frh2hghh698zlnxvp";
}

View File

@ -11546,8 +11546,10 @@ in
texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { }; texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { };
texinfo4 = texinfo413; texinfo4 = texinfo413;
texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { }; texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { };
texinfo6_5 = callPackage ../development/tools/misc/texinfo/6.5.nix { };
texinfo6 = callPackage ../development/tools/misc/texinfo/6.7.nix { }; texinfo6 = callPackage ../development/tools/misc/texinfo/6.7.nix { };
texinfo = texinfo6; # Temporarily use older version on Darwin until it works.
texinfo = if stdenv.isDarwin then texinfo6_5 else texinfo6;
texinfoInteractive = appendToName "interactive" ( texinfoInteractive = appendToName "interactive" (
texinfo.override { interactive = true; } texinfo.override { interactive = true; }
); );