swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-10-01 09:30:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #138063 from trofi/update-texinfo

Browse source 
texinfo: 6.7 -> 6.8
This commit is contained in:
Sandro 2021-09-21 20:09:35 +02:00 committed by GitHub
parent 5752e84b6c 1165533fc3
commit 4e25d90548
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

6
pkgs/development/tools/misc/texinfo/common.nix
View file

@ -54,6 +54,12 @@ stdenv.mkDerivation {
&& !stdenv.isDarwin
&& !stdenv.isSunOS; # flaky
checkFlagsArray = [
# 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"
];
meta = {
homepage = "https://www.gnu.org/software/texinfo/";
description = "The GNU documentation system";

15
pkgs/top-level/all-packages.nix
View file

@ -5176,7 +5176,9 @@ with pkgs;
fverb = callPackage ../applications/audio/fverb { };
fwknop = callPackage ../tools/security/fwknop { };
fwknop = callPackage ../tools/security/fwknop {
texinfo = texinfo6_7; # Uses @setcontentsaftertitlepage, removed in 6.8.
};
exfat = callPackage ../tools/filesystems/exfat { };
@ -14825,7 +14827,8 @@ with pkgs;
texinfo4 = texinfo413;
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_7 = callPackage ../development/tools/misc/texinfo/6.7.nix { }; # needed for gpm, iksemel and fwknop
texinfo6 = callPackage ../development/tools/misc/texinfo/6.8.nix { };
texinfo = texinfo6;
texinfoInteractive = appendToName "interactive" (
texinfo.override { interactive = true; }
@ -21283,6 +21286,10 @@ with pkgs;
gpm = callPackage ../servers/gpm {
ncurses = null; # Keep curses disabled for lack of value
# latest 6.8 mysteriously fails to parse '@headings single':
# https://lists.gnu.org/archive/html/bug-texinfo/2021-09/msg00011.html
texinfo = texinfo6_7;
};
gpm-ncurses = gpm.override { inherit ncurses; };
@ -25154,7 +25161,9 @@ with pkgs;
inherit (perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig;}; }) ImageMagick;
};
iksemel = callPackage ../development/libraries/iksemel { };
iksemel = callPackage ../development/libraries/iksemel {
texinfo = texinfo6_7; # Uses @setcontentsaftertitlepage, removed in 6.8.
};
imag = callPackage ../applications/misc/imag {
inherit (darwin.apple_sdk.frameworks) Security;