JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #95910 from kampka/texinfo

Browse Source
This commit is contained in:
Jörg Thalheim 2020-09-03 07:42:28 +01:00 committed by GitHub
commit 7a0a9a59d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/misc/texinfo/6.5.nix
View File

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

4
pkgs/development/tools/misc/texinfo/6.7.nix Normal file
View File

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

5
pkgs/development/tools/misc/texinfo/common.nix
View File

@ -12,7 +12,7 @@
# files.
let
crossBuildTools = interactive && stdenv.hostPlatform != stdenv.buildPlatform;
crossBuildTools = stdenv.hostPlatform != stdenv.buildPlatform;
in
with stdenv.lib;
@ -26,8 +26,7 @@ stdenv.mkDerivation {
inherit sha256;
};
patches = optional (version == "6.5") ./perl.patch
++ optional crossBuildTools ./cross-tools-flags.patch;
patches = optional crossBuildTools ./cross-tools-flags.patch;
# ncurses is required to build `makedoc'
# this feature is introduced by the ./cross-tools-flags.patch

43
pkgs/development/tools/misc/texinfo/perl.patch
View File

@ -1,43 +0,0 @@
Adapted from http://svn.savannah.gnu.org/viewvc/texinfo/
Author: gavin
--- trunk/tp/Texinfo/Parser.pm 2018-06-04 19:51:36 UTC (rev 8006)
+++ trunk/tp/Texinfo/Parser.pm 2018-07-13 15:31:28 UTC (rev 8007)
@@ -5531,11 +5531,11 @@
}
} elsif ($command eq 'clickstyle') {
# REMACRO
- if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*/) {
+ if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)(\{\})?\s*/) {
$args = ['@'.$1];
$self->{'clickstyle'} = $1;
$remaining = $line;
- $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*(\@(c|comment)((\@|\s+).*)?)?//;
+ $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)(\{\})?\s*(\@(c|comment)((\@|\s+).*)?)?//;
$has_comment = 1 if (defined($4));
} else {
$self->line_error (sprintf($self->__(
--- trunk/tp/Texinfo/Convert/XSParagraph/xspara.c 2018-07-13 15:31:28 UTC (rev 8007)
+++ trunk/tp/Texinfo/Convert/XSParagraph/xspara.c 2018-07-13 15:39:29 UTC (rev 8008)
@@ -248,6 +248,11 @@
dTHX;
+#if PERL_VERSION > 27 || (PERL_VERSION == 27 && PERL_SUBVERSION > 8)
+ /* needed due to thread-safe locale handling in newer perls */
+ switch_to_global_locale();
+#endif
+
if (setlocale (LC_CTYPE, "en_US.UTF-8")
|| setlocale (LC_CTYPE, "en_US.utf8"))
goto success;
@@ -320,6 +325,10 @@
{
success: ;
free (utf8_locale);
+#if PERL_VERSION > 27 || (PERL_VERSION == 27 && PERL_SUBVERSION > 8)
+ /* needed due to thread-safe locale handling in newer perls */
+ sync_locale();
+#endif
/*
fprintf (stderr, "tried to set LC_CTYPE to UTF-8.\n");
fprintf (stderr, "character encoding is: %s\n",

2
pkgs/top-level/all-packages.nix
View File

@ -11522,7 +11522,7 @@ in
texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { };
texinfo4 = texinfo413;
texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { };
texinfo6 = callPackage ../development/tools/misc/texinfo/6.5.nix { };
texinfo6 = callPackage ../development/tools/misc/texinfo/6.7.nix { };
texinfo = texinfo6;
texinfoInteractive = appendToName "interactive" (
texinfo.override { interactive = true; }