From 2dafd54743b5e739dc897c722c021a2c14e07a99 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Tue, 15 Jun 2010 19:00:58 +0000 Subject: [PATCH] opt-out some failing phases svn path=/nixpkgs/branches/stdenv-updates/; revision=22285 --- pkgs/applications/audio/cdparanoia/default.nix | 2 ++ pkgs/applications/version-management/subversion/default.nix | 2 ++ pkgs/desktops/gnome-2.28/desktop/gnome-doc-utils/default.nix | 2 ++ pkgs/development/compilers/haxe/default.nix | 2 ++ pkgs/development/compilers/neko/default.nix | 3 +++ pkgs/development/compilers/ocaml/3.08.0.nix | 1 + pkgs/development/compilers/ocaml/3.09.1.nix | 1 + pkgs/development/compilers/ocaml/3.10.0.nix | 2 ++ pkgs/development/compilers/ocaml/3.11.1.nix | 2 ++ pkgs/development/libraries/gobject-introspection/default.nix | 2 ++ pkgs/development/libraries/nss/default.nix | 2 ++ pkgs/development/libraries/openssl/1.x.nix | 2 ++ pkgs/development/libraries/openssl/default.nix | 2 ++ pkgs/development/libraries/pth/default.nix | 3 +++ pkgs/development/libraries/slang/default.nix | 1 + pkgs/development/tools/parsing/flex/flex-2.5.33.nix | 1 + pkgs/development/tools/parsing/flex/flex-2.5.34.nix | 1 + pkgs/development/tools/parsing/flex/flex-2.5.35.nix | 1 + pkgs/development/tools/parsing/flex/flex-2.5.4a.nix | 1 + pkgs/tools/graphics/pstoedit/default.nix | 2 ++ pkgs/top-level/perl-packages.nix | 1 + 21 files changed, 36 insertions(+) diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix index 6fa69beee20e..e4589bc48887 100644 --- a/pkgs/applications/audio/cdparanoia/default.nix +++ b/pkgs/applications/audio/cdparanoia/default.nix @@ -6,6 +6,8 @@ stdenv.mkDerivation { url = http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-alpha9.8.src.tgz; md5 = "7218e778b5970a86c958e597f952f193"; }; + + NO_PARALLEL_BUILD_buildPhase = 1; patches = [./fix.patch]; diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index da7e72669c6c..3607d9493864 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -74,4 +74,6 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.all; }; + + NO_PARALLEL_BUILD_installPhase = 1; } diff --git a/pkgs/desktops/gnome-2.28/desktop/gnome-doc-utils/default.nix b/pkgs/desktops/gnome-2.28/desktop/gnome-doc-utils/default.nix index c2e49deb009e..8b88b6f648e9 100644 --- a/pkgs/desktops/gnome-2.28/desktop/gnome-doc-utils/default.nix +++ b/pkgs/desktops/gnome-2.28/desktop/gnome-doc-utils/default.nix @@ -14,4 +14,6 @@ stdenv.mkDerivation { wrapProgram $out/bin/xml2po --prefix PYTHONPATH : $(toPythonPath $out) \ ''${PYTHONPATH:+ --prefix PYTHONPATH : $PYTHONPATH} \ ''; + + NO_PARALLEL_BUILD_buildPhase = 1; } diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index 33260cd5469a..098e82861b3f 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -55,6 +55,8 @@ let inherit zlib; + NUM_CORES = 1; + buildPhase = '' set -x mkdir -p ocaml/{swflib,extc,extlib-dev,xml-light} neko/libs diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix index ee8474947f85..505a7c3256a0 100644 --- a/pkgs/development/compilers/neko/default.nix +++ b/pkgs/development/compilers/neko/default.nix @@ -70,4 +70,7 @@ composableDerivation {} ( fixed : { # TODO make them optional and make them work patches = [ ./disable-modules.patch ]; + + NUM_CORES = 1; + }) diff --git a/pkgs/development/compilers/ocaml/3.08.0.nix b/pkgs/development/compilers/ocaml/3.08.0.nix index b2e7e131a817..1625e4c55346 100644 --- a/pkgs/development/compilers/ocaml/3.08.0.nix +++ b/pkgs/development/compilers/ocaml/3.08.0.nix @@ -7,6 +7,7 @@ stdenv.mkDerivation { 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]; diff --git a/pkgs/development/compilers/ocaml/3.09.1.nix b/pkgs/development/compilers/ocaml/3.09.1.nix index 6e9922ccc366..9c5f7b288cee 100644 --- a/pkgs/development/compilers/ocaml/3.09.1.nix +++ b/pkgs/development/compilers/ocaml/3.09.1.nix @@ -7,6 +7,7 @@ stdenv.mkDerivation { 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]; diff --git a/pkgs/development/compilers/ocaml/3.10.0.nix b/pkgs/development/compilers/ocaml/3.10.0.nix index 8a8ddd7ee975..bc92ab1b6897 100644 --- a/pkgs/development/compilers/ocaml/3.10.0.nix +++ b/pkgs/development/compilers/ocaml/3.10.0.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation (rec { sha256 = "1ihmx1civ78s7k2hfc05z1s9vbyx2qw7fg8lnbxnfd6zxkk8878d"; }; + NUM_CORES = 1; # both fail: build and install + prefixKey = "-prefix "; configureFlags = ["-no-tk" "-x11lib" x11]; buildFlags = "world bootstrap world.opt"; diff --git a/pkgs/development/compilers/ocaml/3.11.1.nix b/pkgs/development/compilers/ocaml/3.11.1.nix index c825830e43d9..901928ec125f 100644 --- a/pkgs/development/compilers/ocaml/3.11.1.nix +++ b/pkgs/development/compilers/ocaml/3.11.1.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation (rec { 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"; diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index f5fed1e16049..1c82284783a0 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -8,6 +8,8 @@ in stdenv.mkDerivation rec { name = "${baseName}-${v}"; + NO_PARALLEL_BUILD_buildPhase = 1; + buildInputs = [ flex bison glib pkgconfig python cairo ]; propagatedBuildInputs = [ libffi ]; configureFlags = "--enable-gcov"; diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index a51c355b6448..2d1c967e692e 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation { 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 diff --git a/pkgs/development/libraries/openssl/1.x.nix b/pkgs/development/libraries/openssl/1.x.nix index eae32de30e48..c64baa17431f 100644 --- a/pkgs/development/libraries/openssl/1.x.nix +++ b/pkgs/development/libraries/openssl/1.x.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation (rec { sha1 = "3f800ea9fa3da1c0f576d689be7dca3d55a4cb62"; }; + NO_PARALLEL_BUILD_buildPhase = 1; + buildNativeInputs = [ perl ]; configureScript = "./config"; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 4e567cf6577b..556b5079ea0d 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation ( rec { sha256 = "008z1h09pa6dfxs4wgbqj5i1clw4v82b1waqvwanb1kb6wlbq6mh"; }; + NO_PARALLEL_BUILD_buildPhase = 1; + buildNativeInputs = [ perl ]; configureScript = "./config"; diff --git a/pkgs/development/libraries/pth/default.nix b/pkgs/development/libraries/pth/default.nix index 631a76224062..875123a1c33f 100644 --- a/pkgs/development/libraries/pth/default.nix +++ b/pkgs/development/libraries/pth/default.nix @@ -11,4 +11,7 @@ stdenv.mkDerivation rec { description = "The GNU Portable Threads"; homepage = http://www.gnu.org/software/pth; }; + + NO_PARALLEL_BUILD_buildPhase = 1; + NO_PARALLEL_BUILD_installPhase = 1; } diff --git a/pkgs/development/libraries/slang/default.nix b/pkgs/development/libraries/slang/default.nix index a7db634dbd04..37ead3fb9eb6 100644 --- a/pkgs/development/libraries/slang/default.nix +++ b/pkgs/development/libraries/slang/default.nix @@ -14,4 +14,5 @@ stdenv.mkDerivation { ''; configureFlags = "--with-png=${libpng} --with-z=${zlib} --with-pcre=${pcre} --with-readline=${readline}"; buildInputs = [ncurses pcre libpng zlib readline]; + NO_PARALLEL_BUILD_installPhase = 1; } diff --git a/pkgs/development/tools/parsing/flex/flex-2.5.33.nix b/pkgs/development/tools/parsing/flex/flex-2.5.33.nix index 9be98689aeaa..18ae038c8cfb 100644 --- a/pkgs/development/tools/parsing/flex/flex-2.5.33.nix +++ b/pkgs/development/tools/parsing/flex/flex-2.5.33.nix @@ -17,4 +17,5 @@ stdenv.mkDerivation { meta = { description = "A fast lexical analyser generator"; }; + NO_PARALLEL_BUILD_installPhase = 1; } diff --git a/pkgs/development/tools/parsing/flex/flex-2.5.34.nix b/pkgs/development/tools/parsing/flex/flex-2.5.34.nix index d56cf0c88a2e..d5a409a062c9 100644 --- a/pkgs/development/tools/parsing/flex/flex-2.5.34.nix +++ b/pkgs/development/tools/parsing/flex/flex-2.5.34.nix @@ -16,4 +16,5 @@ stdenv.mkDerivation { meta = { description = "A fast lexical analyser generator"; }; + NO_PARALLEL_BUILD_installPhase = 1; } diff --git a/pkgs/development/tools/parsing/flex/flex-2.5.35.nix b/pkgs/development/tools/parsing/flex/flex-2.5.35.nix index c200e4e7d2f7..b9fe7e28cda0 100644 --- a/pkgs/development/tools/parsing/flex/flex-2.5.35.nix +++ b/pkgs/development/tools/parsing/flex/flex-2.5.35.nix @@ -16,4 +16,5 @@ stdenv.mkDerivation { meta = { description = "A fast lexical analyser generator"; }; + NO_PARALLEL_BUILD_installPhase = 1; } diff --git a/pkgs/development/tools/parsing/flex/flex-2.5.4a.nix b/pkgs/development/tools/parsing/flex/flex-2.5.4a.nix index 13bb68349790..bca60808600c 100644 --- a/pkgs/development/tools/parsing/flex/flex-2.5.4a.nix +++ b/pkgs/development/tools/parsing/flex/flex-2.5.4a.nix @@ -9,4 +9,5 @@ stdenv.mkDerivation { md5 = "bd8753d0b22e1f4ec87a553a73021adf"; }; buildInputs = [yacc]; + NO_PARALLEL_BUILD_installPhase = 1; } diff --git a/pkgs/tools/graphics/pstoedit/default.nix b/pkgs/tools/graphics/pstoedit/default.nix index 6f4a41d24251..703811e6bfe1 100644 --- a/pkgs/tools/graphics/pstoedit/default.nix +++ b/pkgs/tools/graphics/pstoedit/default.nix @@ -17,4 +17,6 @@ stdenv.mkDerivation { platforms = args.lib.platforms.linux; }; + NUM_CORES = 1; + } diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index dadc86907963..b3f3dbca5e61 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2858,6 +2858,7 @@ rec { }; 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;