Author: MarcWeber Date: 2010-06-15 19:00:58 +0000 (Tue, 15 Jun 2010) New Revision: 22285
You can view the changes in this commit at: https://svn.nixos.org/viewvc/nix?rev=22285&view=rev Modified: nixpkgs/branches/stdenv-updates/pkgs/applications/audio/cdparanoia/default.nix nixpkgs/branches/stdenv-updates/pkgs/applications/version-management/subversion/default.nix nixpkgs/branches/stdenv-updates/pkgs/desktops/gnome-2.28/desktop/gnome-doc-utils/default.nix nixpkgs/branches/stdenv-updates/pkgs/development/compilers/haxe/default.nix nixpkgs/branches/stdenv-updates/pkgs/development/compilers/neko/default.nix nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ocaml/3.08.0.nix nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ocaml/3.09.1.nix nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ocaml/3.10.0.nix nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ocaml/3.11.1.nix nixpkgs/branches/stdenv-updates/pkgs/development/libraries/gobject-introspection/default.nix nixpkgs/branches/stdenv-updates/pkgs/development/libraries/nss/default.nix nixpkgs/branches/stdenv-updates/pkgs/development/libraries/openssl/1.x.nix nixpkgs/branches/stdenv-updates/pkgs/development/libraries/openssl/default.nix nixpkgs/branches/stdenv-updates/pkgs/development/libraries/pth/default.nix nixpkgs/branches/stdenv-updates/pkgs/development/libraries/slang/default.nix nixpkgs/branches/stdenv-updates/pkgs/development/tools/parsing/flex/flex-2.5.33.nix nixpkgs/branches/stdenv-updates/pkgs/development/tools/parsing/flex/flex-2.5.34.nix nixpkgs/branches/stdenv-updates/pkgs/development/tools/parsing/flex/flex-2.5.35.nix nixpkgs/branches/stdenv-updates/pkgs/development/tools/parsing/flex/flex-2.5.4a.nix nixpkgs/branches/stdenv-updates/pkgs/tools/graphics/pstoedit/default.nix nixpkgs/branches/stdenv-updates/pkgs/top-level/perl-packages.nix Log: opt-out some failing phases Changes: Modified: nixpkgs/branches/stdenv-updates/pkgs/applications/audio/cdparanoia/default.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/applications/audio/cdparanoia/default.nix 2010-06-15 19:00:54 UTC (rev 22284) +++ nixpkgs/branches/stdenv-updates/pkgs/applications/audio/cdparanoia/default.nix 2010-06-15 19:00:58 UTC (rev 22285) @@ -6,6 +6,8 @@ url = http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-alpha9.8.src.tgz; md5 = "7218e778b5970a86c958e597f952f193"; }; + + NO_PARALLEL_BUILD_buildPhase = 1; patches = [./fix.patch]; Modified: nixpkgs/branches/stdenv-updates/pkgs/applications/version-management/subversion/default.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/applications/version-management/subversion/default.nix 2010-06-15 19:00:54 UTC (rev 22284) +++ nixpkgs/branches/stdenv-updates/pkgs/applications/version-management/subversion/default.nix 2010-06-15 19:00:58 UTC (rev 22285) @@ -74,4 +74,6 @@ maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.all; }; + + NO_PARALLEL_BUILD_installPhase = 1; } Modified: nixpkgs/branches/stdenv-updates/pkgs/desktops/gnome-2.28/desktop/gnome-doc-utils/default.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/desktops/gnome-2.28/desktop/gnome-doc-utils/default.nix 2010-06-15 19:00:54 UTC (rev 22284) +++ nixpkgs/branches/stdenv-updates/pkgs/desktops/gnome-2.28/desktop/gnome-doc-utils/default.nix 2010-06-15 19:00:58 UTC (rev 22285) @@ -14,4 +14,6 @@ wrapProgram $out/bin/xml2po --prefix PYTHONPATH : $(toPythonPath $out) \ ''${PYTHONPATH:+ --prefix PYTHONPATH : $PYTHONPATH} \ ''; + + NO_PARALLEL_BUILD_buildPhase = 1; } Modified: nixpkgs/branches/stdenv-updates/pkgs/development/compilers/haxe/default.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/compilers/haxe/default.nix 2010-06-15 19:00:54 UTC (rev 22284) +++ nixpkgs/branches/stdenv-updates/pkgs/development/compilers/haxe/default.nix 2010-06-15 19:00:58 UTC (rev 22285) @@ -55,6 +55,8 @@ inherit zlib; + NUM_CORES = 1; + buildPhase = '' set -x mkdir -p ocaml/{swflib,extc,extlib-dev,xml-light} neko/libs Modified: nixpkgs/branches/stdenv-updates/pkgs/development/compilers/neko/default.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/compilers/neko/default.nix 2010-06-15 19:00:54 UTC (rev 22284) +++ nixpkgs/branches/stdenv-updates/pkgs/development/compilers/neko/default.nix 2010-06-15 19:00:58 UTC (rev 22285) @@ -70,4 +70,7 @@ # TODO make them optional and make them work patches = [ ./disable-modules.patch ]; + + NUM_CORES = 1; + }) Modified: nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ocaml/3.08.0.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ocaml/3.08.0.nix 2010-06-15 19:00:54 UTC (rev 22284) +++ nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ocaml/3.08.0.nix 2010-06-15 19:00:58 UTC (rev 22285) @@ -7,6 +7,7 @@ url = http://nixos.org/tarballs/ocaml-3.08.0.tar.gz; md5 = "c6ef478362295c150101cdd2efcd38e0"; }; + NUM_CORES = 1; # both fail: build and install configureScript = ./configure-3.08.0; dontAddPrefix = "True"; configureFlags = ["-no-tk" "-x11lib" x11]; Modified: nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ocaml/3.09.1.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ocaml/3.09.1.nix 2010-06-15 19:00:54 UTC (rev 22284) +++ nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ocaml/3.09.1.nix 2010-06-15 19:00:58 UTC (rev 22285) @@ -7,6 +7,7 @@ url = http://caml.inria.fr/pub/distrib/ocaml-3.09/ocaml-3.09.1.tar.gz; md5 = "c73f4b093e27ba5bf13d62923f89befc"; }; + NUM_CORES = 1; # both fail: build and install configureScript = ./configure-3.09.1; dontAddPrefix = "True"; configureFlags = ["-no-tk" "-x11lib" x11]; Modified: nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ocaml/3.10.0.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ocaml/3.10.0.nix 2010-06-15 19:00:54 UTC (rev 22284) +++ nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ocaml/3.10.0.nix 2010-06-15 19:00:58 UTC (rev 22285) @@ -9,6 +9,8 @@ sha256 = "1ihmx1civ78s7k2hfc05z1s9vbyx2qw7fg8lnbxnfd6zxkk8878d"; }; + NUM_CORES = 1; # both fail: build and install + prefixKey = "-prefix "; configureFlags = ["-no-tk" "-x11lib" x11]; buildFlags = "world bootstrap world.opt"; Modified: nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ocaml/3.11.1.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ocaml/3.11.1.nix 2010-06-15 19:00:54 UTC (rev 22284) +++ nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ocaml/3.11.1.nix 2010-06-15 19:00:58 UTC (rev 22285) @@ -14,6 +14,8 @@ sha256 = "8c36a28106d4b683a15c547dfe4cb757a53fa9247579d1cc25bd06a22cc62e50"; }; + NUM_CORES = 1; # both fail: build and install + prefixKey = "-prefix "; configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11 ]; buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt"; Modified: nixpkgs/branches/stdenv-updates/pkgs/development/libraries/gobject-introspection/default.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/libraries/gobject-introspection/default.nix 2010-06-15 19:00:54 UTC (rev 22284) +++ nixpkgs/branches/stdenv-updates/pkgs/development/libraries/gobject-introspection/default.nix 2010-06-15 19:00:58 UTC (rev 22285) @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { name = "${baseName}-${v}"; + NO_PARALLEL_BUILD_buildPhase = 1; + buildInputs = [ flex bison glib pkgconfig python cairo ]; propagatedBuildInputs = [ libffi ]; configureFlags = "--enable-gcov"; Modified: nixpkgs/branches/stdenv-updates/pkgs/development/libraries/nss/default.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/libraries/nss/default.nix 2010-06-15 19:00:54 UTC (rev 22284) +++ nixpkgs/branches/stdenv-updates/pkgs/development/libraries/nss/default.nix 2010-06-15 19:00:58 UTC (rev 22285) @@ -19,6 +19,8 @@ buildInputs = [nspr perl zlib]; + NO_PARALLEL_BUILD_buildPhase = 1; + # Based on the build instructions at # http://www.mozilla.org/projects/security/pki/nss/nss-3.11.4/nss-3.11.4-build.html Modified: nixpkgs/branches/stdenv-updates/pkgs/development/libraries/openssl/1.x.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/libraries/openssl/1.x.nix 2010-06-15 19:00:54 UTC (rev 22284) +++ nixpkgs/branches/stdenv-updates/pkgs/development/libraries/openssl/1.x.nix 2010-06-15 19:00:58 UTC (rev 22285) @@ -14,6 +14,8 @@ sha1 = "3f800ea9fa3da1c0f576d689be7dca3d55a4cb62"; }; + NO_PARALLEL_BUILD_buildPhase = 1; + buildNativeInputs = [ perl ]; configureScript = "./config"; Modified: nixpkgs/branches/stdenv-updates/pkgs/development/libraries/openssl/default.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/libraries/openssl/default.nix 2010-06-15 19:00:54 UTC (rev 22284) +++ nixpkgs/branches/stdenv-updates/pkgs/development/libraries/openssl/default.nix 2010-06-15 19:00:58 UTC (rev 22285) @@ -14,6 +14,8 @@ sha256 = "008z1h09pa6dfxs4wgbqj5i1clw4v82b1waqvwanb1kb6wlbq6mh"; }; + NO_PARALLEL_BUILD_buildPhase = 1; + buildNativeInputs = [ perl ]; configureScript = "./config"; Modified: nixpkgs/branches/stdenv-updates/pkgs/development/libraries/pth/default.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/libraries/pth/default.nix 2010-06-15 19:00:54 UTC (rev 22284) +++ nixpkgs/branches/stdenv-updates/pkgs/development/libraries/pth/default.nix 2010-06-15 19:00:58 UTC (rev 22285) @@ -11,4 +11,7 @@ description = "The GNU Portable Threads"; homepage = http://www.gnu.org/software/pth; }; + + NO_PARALLEL_BUILD_buildPhase = 1; + NO_PARALLEL_BUILD_installPhase = 1; } Modified: nixpkgs/branches/stdenv-updates/pkgs/development/libraries/slang/default.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/libraries/slang/default.nix 2010-06-15 19:00:54 UTC (rev 22284) +++ nixpkgs/branches/stdenv-updates/pkgs/development/libraries/slang/default.nix 2010-06-15 19:00:58 UTC (rev 22285) @@ -14,4 +14,5 @@ ''; configureFlags = "--with-png=${libpng} --with-z=${zlib} --with-pcre=${pcre} --with-readline=${readline}"; buildInputs = [ncurses pcre libpng zlib readline]; + NO_PARALLEL_BUILD_installPhase = 1; } Modified: nixpkgs/branches/stdenv-updates/pkgs/development/tools/parsing/flex/flex-2.5.33.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/tools/parsing/flex/flex-2.5.33.nix 2010-06-15 19:00:54 UTC (rev 22284) +++ nixpkgs/branches/stdenv-updates/pkgs/development/tools/parsing/flex/flex-2.5.33.nix 2010-06-15 19:00:58 UTC (rev 22285) @@ -17,4 +17,5 @@ meta = { description = "A fast lexical analyser generator"; }; + NO_PARALLEL_BUILD_installPhase = 1; } Modified: nixpkgs/branches/stdenv-updates/pkgs/development/tools/parsing/flex/flex-2.5.34.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/tools/parsing/flex/flex-2.5.34.nix 2010-06-15 19:00:54 UTC (rev 22284) +++ nixpkgs/branches/stdenv-updates/pkgs/development/tools/parsing/flex/flex-2.5.34.nix 2010-06-15 19:00:58 UTC (rev 22285) @@ -16,4 +16,5 @@ meta = { description = "A fast lexical analyser generator"; }; + NO_PARALLEL_BUILD_installPhase = 1; } Modified: nixpkgs/branches/stdenv-updates/pkgs/development/tools/parsing/flex/flex-2.5.35.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/tools/parsing/flex/flex-2.5.35.nix 2010-06-15 19:00:54 UTC (rev 22284) +++ nixpkgs/branches/stdenv-updates/pkgs/development/tools/parsing/flex/flex-2.5.35.nix 2010-06-15 19:00:58 UTC (rev 22285) @@ -16,4 +16,5 @@ meta = { description = "A fast lexical analyser generator"; }; + NO_PARALLEL_BUILD_installPhase = 1; } Modified: nixpkgs/branches/stdenv-updates/pkgs/development/tools/parsing/flex/flex-2.5.4a.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/tools/parsing/flex/flex-2.5.4a.nix 2010-06-15 19:00:54 UTC (rev 22284) +++ nixpkgs/branches/stdenv-updates/pkgs/development/tools/parsing/flex/flex-2.5.4a.nix 2010-06-15 19:00:58 UTC (rev 22285) @@ -9,4 +9,5 @@ md5 = "bd8753d0b22e1f4ec87a553a73021adf"; }; buildInputs = [yacc]; + NO_PARALLEL_BUILD_installPhase = 1; } Modified: nixpkgs/branches/stdenv-updates/pkgs/tools/graphics/pstoedit/default.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/tools/graphics/pstoedit/default.nix 2010-06-15 19:00:54 UTC (rev 22284) +++ nixpkgs/branches/stdenv-updates/pkgs/tools/graphics/pstoedit/default.nix 2010-06-15 19:00:58 UTC (rev 22285) @@ -17,4 +17,6 @@ platforms = args.lib.platforms.linux; }; + NUM_CORES = 1; + } Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/perl-packages.nix =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/top-level/perl-packages.nix 2010-06-15 19:00:54 UTC (rev 22284) +++ nixpkgs/branches/stdenv-updates/pkgs/top-level/perl-packages.nix 2010-06-15 19:00:58 UTC (rev 22285) @@ -2858,6 +2858,7 @@ }; XMLSAX = buildPerlPackage { + NUM_CORES=1; name = "XML-SAX-0.96"; src = fetchurl { url = mirror://cpan/authors/id/G/GR/GRANTM/XML-SAX-0.96.tar.gz; _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
