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

Merge recent staging built on Hydra

Browse Source 
http://hydra.nixos.org/eval/1231884
Only Darwin jobs seem to be queued now,
but we can't afford to wait for that single build slave.
This commit is contained in:
Vladimír Čunát
2015-12-05 11:11:51 +01:00
parent b1dca6ca88 c20b6846f2
commit 263fd55d4b
68 changed files with 621 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/tools/documentation/doxygen/default.nix
View File

@@ -20,12 +20,14 @@ stdenv.mkDerivation {
buildInputs =
[ perl python flex bison ]
++ stdenv.lib.optional (qt4 != null) qt4
++ stdenv.lib.optional stdenv.isSunOS libiconv
++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices libiconv ];
prefixKey = "--prefix ";
configureFlags =
[ "--dot dot" ]
++ stdenv.lib.optional stdenv.isSunOS "--install install"
++ stdenv.lib.optional (qt4 != null) "--with-doxywizard";
preConfigure =

4
pkgs/development/tools/misc/help2man/default.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, perl, gettext, LocaleGettext, makeWrapper }:
stdenv.mkDerivation rec {
name = "help2man-1.47.2";
name = "help2man-1.47.3";
src = fetchurl {
url = "mirror://gnu/help2man/${name}.tar.xz";
sha256 = "0z1zgw6k1fba59fii6ksfi1g2gci6i4ysa3kdfh3j475fdkn1if4";
sha256 = "0miqq77ssk5rgsc9xlv7k5n2wk2c5wv2m1kh4zhbwrggfmjaycn2";
};
buildInputs = [ makeWrapper perl gettext LocaleGettext ];

5
pkgs/development/tools/misc/pkgconfig/default.nix
View File

@@ -10,9 +10,10 @@ stdenv.mkDerivation (rec {
sha256 = "0sq09a39wj4cxf8l2jvkq067g08ywfma4v6nhprnf351s82pfl68";
};
buildInputs = stdenv.lib.optional (stdenv.isCygwin || stdenv.isDarwin) libiconv;
buildInputs = stdenv.lib.optional (stdenv.isCygwin || stdenv.isDarwin || stdenv.isSunOS) libiconv;
configureFlags = [ "--with-internal-glib" ];
configureFlags = [ "--with-internal-glib" ]
++ stdenv.lib.optional (stdenv.isSunOS) [ "--with-libiconv=gnu" "--with-system-library-path" "--with-system-include-path" "CFLAGS=-DENABLE_NLS" ];
patches = (if vanilla then [] else [
# Process Requires.private properly, see

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

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, ncurses, perl, xz, interactive ? false }:
{ stdenv, fetchurl, ncurses, perl, xz, libiconv, gawk, interactive ? false }:
stdenv.mkDerivation rec {
name = "texinfo-6.0";
@@ -9,14 +9,17 @@ stdenv.mkDerivation rec {
};
buildInputs = [ perl xz ]
++ stdenv.lib.optionals stdenv.isSunOS [ libiconv gawk ]
++ stdenv.lib.optional interactive ncurses;
configureFlags = stdenv.lib.optionalString stdenv.isSunOS "AWK=${gawk}/bin/awk";
preInstall = ''
installFlags="TEXMF=$out/texmf-dist";
installTargets="install install-tex";
'';
doCheck = !stdenv.isDarwin && !interactive;
doCheck = !stdenv.isDarwin && !interactive && !stdenv.isSunOS/*flaky*/;
meta = {
homepage = "http://www.gnu.org/software/texinfo/";

4
pkgs/development/tools/parsing/bison/3.x.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, m4, perl }:
{ stdenv, fetchurl, m4, perl, help2man }:
stdenv.mkDerivation rec {
name = "bison-3.0.4";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "b67fd2daae7a64b5ba862c66c07c1addb9e6b1b05c5f2049392cfd8a2172952e";
};
nativeBuildInputs = [ m4 perl ];
nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optional stdenv.isSunOS help2man;
propagatedBuildInputs = [ m4 ];
meta = {

8
pkgs/development/tools/parsing/flex/2.5.39.nix → pkgs/development/tools/parsing/flex/default.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, bison, m4 }:
stdenv.mkDerivation {
name = "flex-2.5.39";
stdenv.mkDerivation rec {
name = "flex-2.6.0";
src = fetchurl {
url = mirror://sourceforge/flex/flex-2.5.39.tar.bz2;
sha256 = "0zv15giw3gma03y2bzw78hjfy49vyir7vbcgnh9bb3637dgvblmd";
url = "mirror://sourceforge/flex/${name}.tar.bz2";
sha256 = "1sdqx63yadindzafrq1w31ajblf9gl1c301g068s20s7bbpi3ri4";
};
buildInputs = [ bison ];