From b23940e51467515d96c226b292d13aa21cf8ae71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 6 Sep 2020 09:43:32 +0200 Subject: [PATCH] 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) --- pkgs/development/tools/misc/texinfo/6.5.nix | 4 ++++ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/tools/misc/texinfo/6.5.nix diff --git a/pkgs/development/tools/misc/texinfo/6.5.nix b/pkgs/development/tools/misc/texinfo/6.5.nix new file mode 100644 index 00000000000..34596f30658 --- /dev/null +++ b/pkgs/development/tools/misc/texinfo/6.5.nix @@ -0,0 +1,4 @@ +import ./common.nix { + version = "6.5"; + sha256 = "0qjzvbvnv9003xdrcpi3jp7y68j4hq2ciw9frh2hghh698zlnxvp"; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 466e781f494..c69ede66dc7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11546,8 +11546,10 @@ in texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { }; texinfo4 = texinfo413; 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 { }; - texinfo = texinfo6; + # Temporarily use older version on Darwin until it works. + texinfo = if stdenv.isDarwin then texinfo6_5 else texinfo6; texinfoInteractive = appendToName "interactive" ( texinfo.override { interactive = true; } );