Merging from trunk. I had to give away some structure to build the native

sheevaplug kernel, so the kernel does not build in the sheevaplug right now.
I will try to fix that in next commits.


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

pkgs/development/interpreters/guile/1.9.nix

@@ -7,14 +7,12 @@
  else stdenv.mkDerivation)
 
 rec {
-  name = "guile-1.9.5";  # This is an alpha release!
+  name = "guile-1.9.6";  # This is an alpha release!
   src = fetchurl {
     url = "ftp://alpha.gnu.org/gnu/guile/${name}.tar.gz";
-    sha256 = "0plzdpm22fk2n5m1pjjlckfvksy13aj7n45lx1nw4334i87d6sll";
+    sha256 = "1cfhzm9az1wbq0741v98af09v7f3094ym727qjfgj8n9jyxvpxnw";
   };
 
-  /* 1.9.5 has funny directory names, which contain "GNU Guile"!  */
-
   buildInputs = [ makeWrapper gawk readline libtool libunistring pkgconfig ];
   propagatedBuildInputs = [ gmp boehmgc ];
 

pkgs/development/interpreters/guile/disable-gc-sensitive-tests.patch

@@ -3,17 +3,6 @@ compiling with `-O0' (as is done with coverage analysis) since there may
 be many false references held on the stack, leading to the failure of
 such tests.
 
---- a/test-suite/tests/gc.test
-+++ b/test-suite/tests/gc.test
-@@ -59,6 +59,7 @@
- 
- (with-test-prefix "gc"
-   (pass-if "Unused modules are removed"
-+           (throw 'unresolved)
- 	   (let* ((guard (make-guardian))
-                   (total 1000))
- 
-
 --- a/test-suite/tests/threads.test
 +++ b/test-suite/tests/threads.test
 @@ -366,6 +366,7 @@