pyrox.dev
texinfo: fix doCheck properly, cleanup (close #11527)
authored by Jan Malakhovski and committed by Vladimír Čunát daa199a9 82a21cca
+7
-4
pkgs/development/tools/misc/texinfo/5.2.nix
+7
-4
pkgs/development/tools/misc/texinfo/5.2.nix
···
1
-
{ stdenv, fetchurl, ncurses, perl, xz, interactive ? false }:
1
+
{ stdenv, fetchurl, ncurses, perl, xz, procps, interactive ? false }:
2
+
3
+
with stdenv.lib;
2
4
3
5
stdenv.mkDerivation rec {
4
6
name = "texinfo-5.2";
···
9
11
};
10
12
11
13
buildInputs = [ perl xz ]
12
-
++ stdenv.lib.optional interactive ncurses;
14
+
++ optional interactive ncurses
15
+
++ optional doCheck procps; # for tests
13
16
14
17
preInstall = ''
15
18
installFlags="TEXMF=$out/texmf-dist";
···
21
24
meta = {
22
25
homepage = "http://www.gnu.org/software/texinfo/";
23
26
description = "The GNU documentation system";
24
-
license = stdenv.lib.licenses.gpl3Plus;
25
-
platforms = stdenv.lib.platforms.all;
27
+
license = licenses.gpl3Plus;
28
+
platforms = platforms.all;
26
29
27
30
longDescription = ''
28
31
Texinfo is the official documentation format of the GNU project.
+9
-6
pkgs/development/tools/misc/texinfo/6.0.nix
+9
-6
pkgs/development/tools/misc/texinfo/6.0.nix
···
1
-
{ stdenv, fetchurl, ncurses, perl, xz, libiconv, gawk, interactive ? false }:
1
+
{ stdenv, fetchurl, ncurses, perl, xz, libiconv, gawk, procps, interactive ? false }:
2
+
3
+
with stdenv.lib;
2
4
3
5
stdenv.mkDerivation rec {
4
6
name = "texinfo-6.0";
···
9
11
};
10
12
11
13
buildInputs = [ perl xz ]
12
-
++ stdenv.lib.optionals stdenv.isSunOS [ libiconv gawk ]
13
-
++ stdenv.lib.optional interactive ncurses;
14
+
++ optionals stdenv.isSunOS [ libiconv gawk ]
15
+
++ optional interactive ncurses
16
+
++ optional doCheck procps; # for tests
14
17
15
18
configureFlags = stdenv.lib.optionalString stdenv.isSunOS "AWK=${gawk}/bin/awk";
16
19
···
19
22
installTargets="install install-tex";
20
23
'';
21
24
22
-
doCheck = !stdenv.isDarwin && !interactive && !stdenv.isSunOS/*flaky*/;
25
+
doCheck = !stdenv.isDarwin && !stdenv.isSunOS/*flaky*/;
23
26
24
27
meta = {
25
28
homepage = "http://www.gnu.org/software/texinfo/";
26
29
description = "The GNU documentation system";
27
-
license = stdenv.lib.licenses.gpl3Plus;
28
-
platforms = stdenv.lib.platforms.all;
30
+
license = licenses.gpl3Plus;
31
+
platforms = platforms.all;
29
32
30
33
longDescription = ''
31
34
Texinfo is the official documentation format of the GNU project.