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

texinfo: fix doCheck properly, cleanup (close #11527)

Browse Source
This commit is contained in:
Jan Malakhovski 2015-10-24 10:27:30 +00:00 committed by Vladimír Čunát
parent 82a21ccaf7
commit daa199a95e
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/tools/misc/texinfo/5.2.nix
View File

@ -1,4 +1,6 @@
{ stdenv, fetchurl, ncurses, perl, xz, interactive ? false }: { stdenv, fetchurl, ncurses, perl, xz, procps, interactive ? false }:
with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "texinfo-5.2"; name = "texinfo-5.2";
@ -9,7 +11,8 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ perl xz ] buildInputs = [ perl xz ]
++ stdenv.lib.optional interactive ncurses; ++ optional interactive ncurses
++ optional doCheck procps; # for tests
preInstall = '' preInstall = ''
installFlags="TEXMF=$out/texmf-dist"; installFlags="TEXMF=$out/texmf-dist";
@ -21,8 +24,8 @@ stdenv.mkDerivation rec {
meta = { meta = {
homepage = "http://www.gnu.org/software/texinfo/"; homepage = "http://www.gnu.org/software/texinfo/";
description = "The GNU documentation system"; description = "The GNU documentation system";
license = stdenv.lib.licenses.gpl3Plus; license = licenses.gpl3Plus;
platforms = stdenv.lib.platforms.all; platforms = platforms.all;
longDescription = '' longDescription = ''
Texinfo is the official documentation format of the GNU project. Texinfo is the official documentation format of the GNU project.

15
pkgs/development/tools/misc/texinfo/6.0.nix
View File

@ -1,4 +1,6 @@
{ stdenv, fetchurl, ncurses, perl, xz, libiconv, gawk, interactive ? false }: { stdenv, fetchurl, ncurses, perl, xz, libiconv, gawk, procps, interactive ? false }:
with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "texinfo-6.0"; name = "texinfo-6.0";
@ -9,8 +11,9 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ perl xz ] buildInputs = [ perl xz ]
++ stdenv.lib.optionals stdenv.isSunOS [ libiconv gawk ] ++ optionals stdenv.isSunOS [ libiconv gawk ]
++ stdenv.lib.optional interactive ncurses; ++ optional interactive ncurses
++ optional doCheck procps; # for tests
configureFlags = stdenv.lib.optionalString stdenv.isSunOS "AWK=${gawk}/bin/awk"; configureFlags = stdenv.lib.optionalString stdenv.isSunOS "AWK=${gawk}/bin/awk";
@ -19,13 +22,13 @@ stdenv.mkDerivation rec {
installTargets="install install-tex"; installTargets="install install-tex";
''; '';
doCheck = !stdenv.isDarwin && !interactive && !stdenv.isSunOS/*flaky*/; doCheck = !stdenv.isDarwin && !stdenv.isSunOS/*flaky*/;
meta = { meta = {
homepage = "http://www.gnu.org/software/texinfo/"; homepage = "http://www.gnu.org/software/texinfo/";
description = "The GNU documentation system"; description = "The GNU documentation system";
license = stdenv.lib.licenses.gpl3Plus; license = licenses.gpl3Plus;
platforms = stdenv.lib.platforms.all; platforms = platforms.all;
longDescription = '' longDescription = ''
Texinfo is the official documentation format of the GNU project. Texinfo is the official documentation format of the GNU project.