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

Merge branch 'master' into closure-size

Browse Source 
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
This commit is contained in:
Vladimír Čunát
2015-12-31 09:53:02 +01:00
parent bbcf127c7c 468f698f60
commit f9f6f41bff
951 changed files with 117997 additions and 19014 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/misc/texinfo/5.2.nix
+7 -4
View File
@@ -1,4 +1,6 @@
{ stdenv, fetchurl, xz, ncurses, perl, interactive ? false }:
{ stdenv, fetchurl, ncurses, perl, xz, procps, interactive ? false }:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "texinfo-5.2";
@@ -9,7 +11,8 @@ stdenv.mkDerivation rec {
};
buildInputs = [ perl xz.bin ]
++ stdenv.lib.optional interactive ncurses;
++ optional interactive ncurses
++ optional doCheck procps; # for tests
preInstall = ''
installFlags="TEXMF=$out/texmf-dist";
@@ -21,8 +24,8 @@ stdenv.mkDerivation rec {
meta = {
homepage = "http://www.gnu.org/software/texinfo/";
description = "The GNU documentation system";
license = stdenv.lib.licenses.gpl3Plus;
platforms = stdenv.lib.platforms.all;
license = licenses.gpl3Plus;
platforms = platforms.all;
longDescription = ''
Texinfo is the official documentation format of the GNU project.
pkgs/development/tools/misc/texinfo/6.0.nix
+12 -9
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 {
name = "texinfo-6.0";
@@ -9,23 +11,25 @@ stdenv.mkDerivation rec {
};
buildInputs = [ perl xz ]
++ stdenv.lib.optionals stdenv.isSunOS [ libiconv gawk ]
++ stdenv.lib.optional interactive ncurses;
++ optionals stdenv.isSunOS [ libiconv gawk ]
++ optional interactive ncurses
++ optional doCheck procps; # for tests
configureFlags = stdenv.lib.optionalString stdenv.isSunOS "AWK=${gawk}/bin/awk";
configureFlags = stdenv.lib.optional stdenv.isSunOS "AWK=${gawk}/bin/awk";
preInstall = ''
installFlags="TEXMF=$out/texmf-dist";
installTargets="install install-tex";
'';
doCheck = !stdenv.isDarwin && !interactive && !stdenv.isSunOS/*flaky*/;
doCheck = interactive # simplify bootstrapping
&& !stdenv.isDarwin && !stdenv.isSunOS/*flaky*/;
meta = {
meta = with stdenv.lib; {
homepage = "http://www.gnu.org/software/texinfo/";
description = "The GNU documentation system";
license = stdenv.lib.licenses.gpl3Plus;
platforms = stdenv.lib.platforms.all;
license = licenses.gpl3Plus;
platforms = platforms.all;
longDescription = ''
Texinfo is the official documentation format of the GNU project.
@@ -42,6 +46,5 @@ stdenv.mkDerivation rec {
need revise only that one document. The Texinfo system is
well-integrated with GNU Emacs.
'';
branch = "5.2";
};
}