* Move all gcc versions to development/compilers/gcc.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32371

pkgs/development/compilers/gcc-upc-4.0/default.nix

@@ -6,14 +6,16 @@
 , texinfo ? null
 }:
 
-with import ../../../lib;
+with stdenv.lib;
 
 # GCC-UPC apparently doesn't support GCov and friends.
 assert profiledCompiler == false;
 
 stdenv.mkDerivation {
   name = "gcc-upc-4.0.3.5";
-  builder = ../gcc-4.0/builder.sh;
+  
+  builder = ../gcc/4.0/builder.sh;
+  
   src = fetchurl {
     url = "ftp://ftp.intrepid.com/pub/upc/rls/upc-4.0.3.5/upc-4.0.3.5.src.tar.gz";
     sha256 = "0afnz1bz0kknhl18205bbwncyza08983ivfaagj5yl7x3nwy7prv";
@@ -30,13 +32,13 @@ stdenv.mkDerivation {
   langF77 = false;
   langUPC = true;    # unused
 
-  buildInputs = [gmp mpfr texinfo
-
-                 # Bison is needed to build the parsers.
-                 bison
-
-		 # For some reason, `autoheader' and `m4' are needed.
-		 autoconf gnum4];
+  buildInputs =
+    [ gmp mpfr texinfo
+      # Bison is needed to build the parsers.
+      bison
+      # For some reason, `autoheader' and `m4' are needed.
+      autoconf gnum4
+    ];
 
   # Note: We use `--enable-maintainer-mode' so that `bison' is actually
   # run when needed.

pkgs/development/compilers/gcc/3.4/default.nix

@@ -5,7 +5,7 @@
 
 assert langC;
 
-with import ../../../lib;
+with stdenv.lib;
 
 stdenv.mkDerivation {
   name = "gcc-3.4.6";

pkgs/development/compilers/gcc/4.0/default.nix

@@ -8,7 +8,7 @@
 
 assert langC;
 
-with import ../../../lib;
+with stdenv.lib;
 
 stdenv.mkDerivation {
   name = "${name}-4.0.4";

pkgs/development/compilers/gcc/4.1/default.nix

@@ -10,7 +10,7 @@
 
 assert langC || langFortran;
 
-with import ../../../lib;
+with stdenv.lib;
 
 stdenv.mkDerivation {
   name = "${name}-4.1.2";