Skip to content

texinfo: 6.5 -> 6.7; fix cross compiling #95910

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mic92 merged 2 commits into from
Sep 3, 2020
Merged

texinfo: 6.5 -> 6.7; fix cross compiling #95910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb223f6
texinfo. 6.5 -> 6.7
kampka Aug 21, 2020
765d3e1
texinfo: patch cross-build in non-interactive build mode
kampka Aug 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions pkgs/development/tools/misc/texinfo/6.5.nix
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions pkgs/development/tools/misc/texinfo/6.7.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import ./common.nix {
version = "6.7";
sha256 = "1aicn1v3czqii08wc91jw089n1x3gfchkf808q2as59dak0h714q";
}
5 changes: 2 additions & 3 deletions pkgs/development/tools/misc/texinfo/common.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# files.

let
crossBuildTools = interactive && stdenv.hostPlatform != stdenv.buildPlatform;
crossBuildTools = stdenv.hostPlatform != stdenv.buildPlatform;
in

with stdenv.lib;
Expand All @@ -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
Expand Down
43 changes: 0 additions & 43 deletions pkgs/development/tools/misc/texinfo/perl.patch
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11363,7 +11363,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; }
Expand Down