Revert "Revert "texinfo: revert to version 6.5 on Darwin""

This reverts commit 578b2b92de

(cherry picked from commit 93e135517a)
This commit is contained in:
Jonathan Ringer 2020-10-07 22:18:41 -07:00
parent 692d219a93
commit a64d7d8445
No known key found for this signature in database
GPG Key ID: 5C841D3CFDFEC4E0
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

@ -11687,8 +11687,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; }
); );