* Merged the stdenv branch

(https://svn.nixos.org/repos/nix/nixpkgs/branches/stdenv-updates
  -r10966:12061).

svn path=/nixpkgs/trunk/; revision=12073

pkgs/development/compilers/abc/builder-binjar.sh

@@ -1,4 +1,4 @@
 source $stdenv/setup
 
-ensureDir $out/jars || fail
-cp $src $out/jars/$jarname.jar || fail
+ensureDir $out/jars
+cp $src $out/jars/$jarname.jar

pkgs/development/compilers/abc/builder.sh

@@ -1,12 +1,12 @@
 source $stdenv/setup
 
-tar zxvf $src || fail
+tar zxvf $src
 
-cd abc-*  || fail
+cd abc-*
 
 for p in $patches; do
   echo "applying patch $p"
-  patch -p1 < $p || fail
+  patch -p1 < $p
 done
 
 cat > ant.settings <<EOF

pkgs/development/compilers/abc/jasmin/builder.sh

@@ -1,7 +1,7 @@
 source $stdenv/setup
 
-tar zxvf $src  || fail
-cd jasmin-*  || fail
+tar zxvf $src
+cd jasmin-*
 
 sed -e 's/<javac/<javac source="1.4"/' build.xml > build-tmp.xml
 mv build-tmp.xml build.xml
@@ -18,7 +18,7 @@ jasmin.version=foo
 build.compiler=javac1.4
 EOF
 
-ant jasmin-jar || fail
+ant jasmin-jar
 
-ensureDir $out/jars/ || fail
-mv lib/jasminclasses-foo.jar $out/jars/jasmin.jar || fail
+ensureDir $out/jars/
+mv lib/jasminclasses-foo.jar $out/jars/jasmin.jar

pkgs/development/compilers/abc/polyglot/builder.sh

@@ -1,11 +1,11 @@
 source $stdenv/setup
 
-tar zxvf $src  || fail
-cd polyglot-*  || fail
+tar zxvf $src
+cd polyglot-*
 
-ant polyglot-jar || fail
-ant cup || fail
+ant polyglot-jar
+ant cup
 
-ensureDir $out/jars/ || fail
-mv lib/java_cup.jar $out/jars/ || fail
-mv lib/polyglot*.jar $out/jars/ || fail
+ensureDir $out/jars/
+mv lib/java_cup.jar $out/jars/
+mv lib/polyglot*.jar $out/jars/

pkgs/development/compilers/abc/soot/builder.sh

@@ -1,7 +1,7 @@
 source $stdenv/setup
 
-tar zxvf $src  || fail
-cd soot-*  || fail
+tar zxvf $src
+cd soot-*
 
 export NIX_ANT_OPTS="$ANT_OPTS -Xmx200m"
 
@@ -13,7 +13,7 @@ release.loc=lib
 javaapi.url=http://java.sun.com/j2se/1.4.2/docs/api/
 EOF
 
-ant classesjar || fail
+ant classesjar
 
-ensureDir $out/jars/ || fail
-mv lib/sootclasses-foo.jar $out/jars/soot.jar || fail
+ensureDir $out/jars/
+mv lib/sootclasses-foo.jar $out/jars/soot.jar

pkgs/development/compilers/gcc-4.2/default.nix

@@ -9,7 +9,7 @@ assert langC;
 
 with import ../../../lib;
 
-let version = "4.2.3"; in
+let version = "4.2.4"; in
 
 stdenv.mkDerivation {
   name = "gcc-${version}";
@@ -18,15 +18,15 @@ stdenv.mkDerivation {
   src =
     optional /*langC*/ true (fetchurl {
       url = "mirror://gnu/gcc/gcc-${version}/gcc-core-${version}.tar.bz2";
-      sha256 = "04y84s46wzy4h44hpacf7vyla7b5zfc1qvdq3myvrhp82cp0bv4r";
+      sha256 = "0cm5yzhqhgdfk03aayakmdj793sya42xkkqhslj7s2b697hygjfg";
     }) ++
     optional langCC (fetchurl {
       url = "mirror://gnu/gcc/gcc-${version}/gcc-g++-${version}.tar.bz2";
-      sha256 = "0spzz549fifwv02ym33azzwizl0zkq5m1fgy88ccmcyzmwpgyzfq";
+      sha256 = "0gq8ikci0qqgck71qqlhfld6zkwn9179x6z15vdd9blkdig55nxg";
     }) ++
     optional langF77 (fetchurl {
       url = "mirror://gnu/gcc/gcc-${version}/gcc-fortran-${version}.tar.bz2";
-      sha256 = "1l3ww6qymrkcfqlssb41a5fdnh6w2hqk0v2ijx56jgjbdnzawyp0";
+      sha256 = "013yqiqhdavgxzjryvylgf3lcnknmw89fx41jf2v4899srn0bhkg";
     });
     
   patches =

pkgs/development/compilers/jdk/dlj-bundle-builder.sh

@@ -5,7 +5,7 @@ unzip ${src} || true
 
 # set the dynamic linker of unpack200, necessary for construct script
 echo "patching unpack200"
-patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" --set-rpath "" */bin/unpack200 || fail
+patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" --set-rpath "" */bin/unpack200
 
 echo "constructing JDK and JRE installations"
 if test -z "$installjdk"; then

pkgs/development/compilers/qcmm/builder.sh

@@ -19,13 +19,11 @@ installPhase() {
   find $out/man -type f -exec gzip -9 {} \;
 
   find $out -name \*.a -exec echo stripping {} \; \
-            -exec strip -S {} \; || fail
+            -exec strip -S {} \;
 
   patchELF $out
 }
 
-buildPhase=buildPhase
-installPhase=installPhase
 checkPhase="mk $MKFLAGS test.opt"
 
 genericBuild