Author: simons Date: 2010-06-23 14:35:18 +0000 (Wed, 23 Jun 2010) New Revision: 22400
You can view the changes in this commit at: https://svn.nixos.org/viewvc/nix?rev=22400&view=rev Modified: nixpkgs/branches/stdenv-updates/pkgs/applications/version-management/git-and-tools/git/default.nix nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.3/default.nix nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.4/default.nix nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.5/default.nix nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-apple/default.nix nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-apple64/default.nix nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/perl-5.10/default.nix nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/builder.sh nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/common.nix nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.5/builder.sh nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.5/default.nix nixpkgs/branches/stdenv-updates/pkgs/development/libraries/gmp/4.3.1.nix nixpkgs/branches/stdenv-updates/pkgs/development/libraries/gmp/default.nix nixpkgs/branches/stdenv-updates/pkgs/development/libraries/mpfr/default.nix nixpkgs/branches/stdenv-updates/pkgs/development/libraries/qt-4.x/4.5/default.nix nixpkgs/branches/stdenv-updates/pkgs/development/libraries/qt-4.x/4.6/default.nix nixpkgs/branches/stdenv-updates/pkgs/development/libraries/qt-4.x/4.7/default.nix nixpkgs/branches/stdenv-updates/pkgs/tools/misc/coreutils/default.nix Log: Enable parallel building of gcc, glibc, gmp, mpfr, coreutils, perl, git, and qt4. Changes: Modified: nixpkgs/branches/stdenv-updates/pkgs/applications/version-management/git-and-tools/git/default.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/applications/version-management/git-and-tools/git/default.nix 2010-06-23 14:34:59 UTC (rev 22399) +++ nixpkgs/branches/stdenv-updates/pkgs/applications/version-management/git-and-tools/git/default.nix 2010-06-23 14:35:18 UTC (rev 22400) @@ -116,6 +116,8 @@ ''; + enableParallelBuilding = true; + meta = { license = "GPLv2"; homepage = http://git-scm.com/; Modified: nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.3/default.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.3/default.nix 2010-06-23 14:34:59 UTC (rev 22399) +++ nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.3/default.nix 2010-06-23 14:35:18 UTC (rev 22400) @@ -127,6 +127,8 @@ passthru = { inherit langC langCC langFortran langVhdl langTreelang enableMultilib; }; + enableParallelBuilding = true; + meta = { homepage = "http://gcc.gnu.org/";; license = "GPL/LGPL"; Modified: nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.4/default.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.4/default.nix 2010-06-23 14:34:59 UTC (rev 22399) +++ nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.4/default.nix 2010-06-23 14:35:18 UTC (rev 22400) @@ -247,6 +247,8 @@ passthru = { inherit langC langCC langAda langFortran langTreelang langVhdl enableMultilib version; }; + enableParallelBuilding = true; + meta = { homepage = http://gcc.gnu.org/; license = "GPLv3+"; # runtime support libraries are typically LGPLv3+ Modified: nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.5/default.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.5/default.nix 2010-06-23 14:34:59 UTC (rev 22399) +++ nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.5/default.nix 2010-06-23 14:35:18 UTC (rev 22400) @@ -279,6 +279,8 @@ passthru = { inherit langC langCC langAda langFortran langTreelang langVhdl enableMultilib version; }; + enableParallelBuilding = true; + meta = { homepage = http://gcc.gnu.org/; license = "GPLv3+"; # runtime support libraries are typically LGPLv3+ Modified: nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-apple/default.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-apple/default.nix 2010-06-23 14:34:59 UTC (rev 22399) +++ nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-apple/default.nix 2010-06-23 14:35:18 UTC (rev 22400) @@ -21,6 +21,8 @@ sha256 = "a7d8041e50e110f5a503e188a05cb217f0c99c51f248a0a1387cc07a0b6f167f"; }) ; + enableParallelBuilding = true; + sourceRoot = "gcc_42-5574/"; patches = [./pass-cxxcpp.patch ./debug_list.patch] Modified: nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-apple64/default.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-apple64/default.nix 2010-06-23 14:34:59 UTC (rev 22399) +++ nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-apple64/default.nix 2010-06-23 14:35:18 UTC (rev 22400) @@ -21,6 +21,8 @@ sha256 = "1fy6j41rhxdsm19sib9wygjl5l54g8pm13c6y5x13f40mavw1mma"; }) ; + enableParallelBuilding = true; + libstdcxx = "libstdcxx-39"; sourceRoot = "gcc-5646/"; patches = Modified: nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/perl-5.10/default.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/perl-5.10/default.nix 2010-06-23 14:34:59 UTC (rev 22399) +++ nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/perl-5.10/default.nix 2010-06-23 14:35:18 UTC (rev 22400) @@ -39,6 +39,8 @@ dontAddPrefix = true; + enableParallelBuilding = true; + preConfigure = '' configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3" Modified: nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/builder.sh =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/builder.sh 2010-06-23 14:34:59 UTC (rev 22399) +++ nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/builder.sh 2010-06-23 14:35:18 UTC (rev 22400) @@ -17,7 +17,7 @@ postInstall() { if test -n "$installLocales"; then - make localedata/install-locales + make -j${NIX_BUILD_CORES:-1} -l${NIX_BUILD_CORES:-1} localedata/install-locales fi test -f $out/etc/ld.so.cache && rm $out/etc/ld.so.cache Modified: nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/common.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/common.nix 2010-06-23 14:34:59 UTC (rev 22399) +++ nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/common.nix 2010-06-23 14:35:18 UTC (rev 22400) @@ -29,7 +29,9 @@ inherit (stdenv) is64bit; - patches = + enableParallelBuilding = true; + + patches = stdenv.lib.optional (fetchgit == null) /* Fix for NIXPKGS-79: when doing host name lookups, when nsswitch.conf contains a line like Modified: nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.5/builder.sh =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.5/builder.sh 2010-06-23 14:34:59 UTC (rev 22399) +++ nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.5/builder.sh 2010-06-23 14:35:18 UTC (rev 22400) @@ -38,7 +38,7 @@ postInstall() { if test -n "$installLocales"; then - make localedata/install-locales + make -j${NIX_BUILD_CORES:-1} -l${NIX_BUILD_CORES:-1} localedata/install-locales fi rm $out/etc/ld.so.cache (cd $out/include && ln -s $kernelHeaders/include/* .) || exit 1 Modified: nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.5/default.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.5/default.nix 2010-06-23 14:34:59 UTC (rev 22399) +++ nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.5/default.nix 2010-06-23 14:35:18 UTC (rev 22400) @@ -30,6 +30,8 @@ # the symbol __i686.get_pc_thunk.dx to be mangled. NIX_CFLAGS_COMPILE = "-U__i686"; + enableParallelBuilding = true; + meta = { homepage = http://www.gnu.org/software/libc/; description = "The GNU C Library"; Modified: nixpkgs/branches/stdenv-updates/pkgs/development/libraries/gmp/4.3.1.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/libraries/gmp/4.3.1.nix 2010-06-23 14:34:59 UTC (rev 22399) +++ nixpkgs/branches/stdenv-updates/pkgs/development/libraries/gmp/4.3.1.nix 2010-06-23 14:35:18 UTC (rev 22400) @@ -16,6 +16,8 @@ doCheck = true; + enableParallelBuilding = true; + meta = { description = "A free library for arbitrary precision arithmetic, operating on signed integers, rational numbers, and floating point numbers"; homepage = http://gmplib.org/; Modified: nixpkgs/branches/stdenv-updates/pkgs/development/libraries/gmp/default.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/libraries/gmp/default.nix 2010-06-23 14:34:59 UTC (rev 22399) +++ nixpkgs/branches/stdenv-updates/pkgs/development/libraries/gmp/default.nix 2010-06-23 14:35:18 UTC (rev 22400) @@ -18,6 +18,8 @@ doCheck = true; + enableParallelBuilding = true; + meta = { description = "GMP, the GNU multiple precision arithmetic library"; Modified: nixpkgs/branches/stdenv-updates/pkgs/development/libraries/mpfr/default.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/libraries/mpfr/default.nix 2010-06-23 14:34:59 UTC (rev 22399) +++ nixpkgs/branches/stdenv-updates/pkgs/development/libraries/mpfr/default.nix 2010-06-23 14:35:18 UTC (rev 22400) @@ -12,6 +12,8 @@ doCheck = true; + enableParallelBuilding = true; + meta = { homepage = http://www.mpfr.org/; description = "GNU MPFR, a library for multiple-precision floating-point arithmetic"; Modified: nixpkgs/branches/stdenv-updates/pkgs/development/libraries/qt-4.x/4.5/default.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/libraries/qt-4.x/4.5/default.nix 2010-06-23 14:34:59 UTC (rev 22399) +++ nixpkgs/branches/stdenv-updates/pkgs/development/libraries/qt-4.x/4.5/default.nix 2010-06-23 14:35:18 UTC (rev 22400) @@ -74,6 +74,8 @@ ${if keepDocumentation == false then "rm -rf $out/doc" else ""} ''; + enableParallelBuilding = true; + meta = { homepage = http://www.qtsoftware.com/downloads/opensource/appdev/linux-x11-cpp; description = "A cross-platform application framework for C++"; Modified: nixpkgs/branches/stdenv-updates/pkgs/development/libraries/qt-4.x/4.6/default.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/libraries/qt-4.x/4.6/default.nix 2010-06-23 14:34:59 UTC (rev 22399) +++ nixpkgs/branches/stdenv-updates/pkgs/development/libraries/qt-4.x/4.6/default.nix 2010-06-23 14:35:18 UTC (rev 22400) @@ -89,6 +89,8 @@ postInstall = if useDocs then "rm -rf $out/share/doc/${name}/{html,src}" else ""; + enableParallelBuilding = true; + meta = { homepage = http://qt.nokia.com/products; description = "A cross-platform application framework for C++"; Modified: nixpkgs/branches/stdenv-updates/pkgs/development/libraries/qt-4.x/4.7/default.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/libraries/qt-4.x/4.7/default.nix 2010-06-23 14:34:59 UTC (rev 22399) +++ nixpkgs/branches/stdenv-updates/pkgs/development/libraries/qt-4.x/4.7/default.nix 2010-06-23 14:35:18 UTC (rev 22400) @@ -96,6 +96,8 @@ postInstall = if useDocs then "rm -rf $out/share/doc/${name}/{html,src}" else ""; + enableParallelBuilding = true; + meta = { homepage = http://qt.nokia.com/products; description = "A cross-platform application framework for C++"; Modified: nixpkgs/branches/stdenv-updates/pkgs/tools/misc/coreutils/default.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/tools/misc/coreutils/default.nix 2010-06-23 14:34:59 UTC (rev 22399) +++ nixpkgs/branches/stdenv-updates/pkgs/tools/misc/coreutils/default.nix 2010-06-23 14:35:18 UTC (rev 22400) @@ -31,6 +31,8 @@ # and {Open,Free}BSD. doCheck = (stdenv ? glibc); + enableParallelBuilding = true; + meta = { homepage = http://www.gnu.org/software/coreutils/; description = "The basic file, shell and text manipulation utilities of the GNU operating system"; _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
