Merging from trunk. I had to do two manual merges, quite trivial I think.

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

pkgs/development/compilers/go/cgo-set-local-to-match-gcc-error-messages.patch

@@ -0,0 +1,13 @@
+diff -r 21cae7efdcc6 src/cmd/cgo/main.go
+--- a/src/cmd/cgo/main.go	Sat Nov 14 12:23:24 2009 -0800
++++ b/src/cmd/cgo/main.go	Sun Nov 15 00:00:09 2009 +0100
+@@ -52,6 +52,9 @@
+ 		fatal("unknown architecture %s", arch)
+ 	}
+ 
++	// Define the language of gcc error messages.
++	os.Setenv("LC_ALL", "C");
++
+ 	p := openProg(input);
+ 	for _, cref := range p.Crefs {
+ 		// Convert C.ulong to C.unsigned long, etc.

pkgs/development/compilers/go/default.nix

@@ -0,0 +1,76 @@
+{stdenv, fetchhg, bison, glibc, ed, which, bash, makeWrapper, ...}:
+
+let
+  version = "2009-11-12";
+  md5 = "66e5803c8dc2855b339151918b6b0de5";
+in
+
+stdenv.mkDerivation {
+  name = "Go-" + version;
+
+  # No tarball yet.
+  src = fetchhg {
+    url = https://go.googlecode.com/hg/;
+    tag = "release." + version;
+    inherit md5;
+  };
+
+  buildInputs = [ bison glibc ed which bash makeWrapper ];
+
+  patches = [
+    ./disable-system-dependent-tests.patch
+    ./cgo-set-local-to-match-gcc-error-messages.patch
+  ];
+
+  prePatch = ''
+    patchShebangs ./ # replace /bin/bash
+    # only for 386 build
+    # !!! substituteInPlace does not seems to be effective.
+    sed -i 's,/lib/ld-linux.so.2,${glibc}/lib/ld-linux.so.2,' src/cmd/8l/asm.c
+    sed -i 's,/usr/share/zoneinfo/,${glibc}/share/zoneinfo/,' src/pkg/time/zoneinfo.go
+  '';
+
+  GOOS = "linux";
+  GOARCH = "386";
+
+  installPhase = ''
+    ensureDir "$out/bin"
+    export GOROOT="$(pwd)/"
+    export GOBIN="$out/bin"
+    export PATH="$GOBIN:$PATH"
+    cd ./src
+    ./all.bash
+    cd -
+
+    # Handle Libraries and make them availabale under /share/go.
+    export GOLIB="pkg/"$GOOS"_"$GOARCH
+    ensureDir "$out/lib/go/$GOLIB"
+    cp -r ./$GOLIB $out/lib/go/pkg/
+
+    # this line set $AS $CC $GC $LD
+    source ./src/Make.$GOARCH
+
+    # Wrap the compiler and the linker to define the location of the
+    # libraries.
+    wrapProgram "$out/bin/$GC" \
+      --add-flags "-I" \
+      --add-flags "$out/lib/go/$GOLIB"
+
+    wrapProgram "$out/bin/$LD" \
+      --set "GOROOT" "$out/lib/go/" \
+      --set "GOOS" "$GOOS" \
+      --set "GOARCH" "$GOARCH"
+
+    # Copy the emacs configuration for Go files.
+    ensureDir "$out/share/emacs/site-lisp"
+    cp ./misc/emacs/* $out/share/emacs/site-lisp/ # */
+
+  '';
+
+  meta = {
+    homepage = http://golang.org/;
+    description = "The Go Programming language";
+    license = "BSD";
+    maintainers = with stdenv.lib.maintainers; [ pierron ];
+  };
+}

pkgs/development/compilers/go/disable-system-dependent-tests.patch

@@ -0,0 +1,30 @@
+diff -r cb140bac9ab0 src/pkg/Makefile
+--- a/src/pkg/Makefile	Thu Nov 12 14:55:26 2009 -0800
++++ b/src/pkg/Makefile	Mon Nov 16 11:50:34 2009 +0100
+@@ -100,12 +100,15 @@
+ 
+ NOTEST=\
+ 	debug/proc\
++	exec\
+ 	go/ast\
+ 	go/doc\
+ 	go/token\
+ 	hash\
+ 	image\
++	log\
+ 	malloc\
++	os\
+ 	rand\
+ 	runtime\
+ 	syscall\
+diff -r cb140bac9ab0 src/run.bash
+--- a/src/run.bash	Thu Nov 12 14:55:26 2009 -0800
++++ b/src/run.bash	Mon Nov 16 11:50:34 2009 +0100
+@@ -69,7 +69,3 @@
+ ./timing.sh -test
+ ) || exit $?
+ 
+-(xcd ../test
+-./run
+-) || exit $?
+-

pkgs/development/compilers/ikarus/0.0.3.nix

@@ -1,21 +0,0 @@
-
-args : with args; 
-rec {
-  src = fetchurl {
-    url = http://www.cs.indiana.edu/~aghuloum/ikarus/ikarus-0.0.3.tar.gz;
-    sha256 = "0d4vqwqfnj39l0gar2di021kcf6bfpkc6g40yapkmxm6sxpdcvjv";
-  };
-
-  buildInputs = [gmp];
-  configureFlags = [];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["doConfigure" "doMakeInstall"];
-      
-  name = "ikarus-" + version;
-  meta = {
-    description = "Ikarus - a Scheme compiler, aiming at R6RS";
-    homepage = http://www.cs.indiana.edu/~aghuloum/ikarus/;
-    license = "GPL3";
-  };
-}

pkgs/development/compilers/ikarus/default.nix

@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, gmp }:
+        
+stdenv.mkDerivation rec {
+  name = "ikarus-0.0.3";
+  
+  src = fetchurl {
+    url = "http://www.cs.indiana.edu/~aghuloum/ikarus/${name}.tar.gz";
+    sha256 = "0d4vqwqfnj39l0gar2di021kcf6bfpkc6g40yapkmxm6sxpdcvjv";
+  };
+
+  buildInputs = [ gmp ];
+      
+  meta = {
+    description = "Ikarus - a Scheme compiler, aiming at R6RS";
+    homepage = http://www.cs.indiana.edu/~aghuloum/ikarus/;
+    license = "GPL3";
+  };
+}

pkgs/development/compilers/qi/9.1.nix

@@ -27,7 +27,7 @@ let
 	") [ addInputs minInit doUnpack defEnsureDir];
 in
 stdenv.mkDerivation rec {
-	name = "Qi-"+version;
+	name = "Qi-9.1";
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs [allBuild doForceShare doPropagate]);
 	meta = {

pkgs/development/compilers/strategoxt/0.18.nix

@@ -41,11 +41,11 @@ rec {
 
   
   strategoxt = stdenv.mkDerivation rec {
-    name = "strategoxt-0.18pre20033";
+    name = "strategoxt-0.18pre20227";
 
     src = fetchurl {
-      url = "ftp://ftp.strategoxt.org/pub/stratego/StrategoXT/strategoxt-0.18pre20033.tar.gz";
-      sha256 = "070052cff1fd27b2ca4bed8b6aa0238574a18922b21feae2506e6df5d2201c1c";
+      url = "http://hydra.nixos.org/build/124117/download/1/strategoxt-0.18pre20227.tar.gz";
+      sha256 = "c2c7a68f76c6dfaf470ed9f7bad71cddebb620b709f20b01231c3a6fd93d8150";
     };
 
     buildInputs = [pkgconfig aterm sdf getopt];

pkgs/development/compilers/swi-prolog/5.6.51.nix

@@ -1,4 +0,0 @@
-args: import ./default.nix {
-  args = args;
-  sha256 = "d43862606284e659ec3acba9cddea53b772f9afb67d12aa36391d26fe1a05ad8";
-}

pkgs/development/compilers/swi-prolog/default.nix

@@ -1,16 +1,16 @@
-{args, sha256}: with args;
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation {
-  name = "swi-prolog-${version}";
+  name = "swi-prolog-5.6.51";
 
   src = fetchurl {
-    url = "http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-${version}.tar.gz";
-    inherit sha256;
+    url = "http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.6.51.tar.gz";
+    sha256 = "d43862606284e659ec3acba9cddea53b772f9afb67d12aa36391d26fe1a05ad8";
   };
 
   meta = {
     homepage = http://www.swi-prolog.org/;
-    description = "A Prolog compiler and interpreter.";
+    description = "A Prolog compiler and interpreter";
     license = "LGPL";
   };
 }