svn merge ^/nixpkgs/trunk, one simple conflict in jruby

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

pkgs/development/compilers/gwt/2.4.0.nix

@@ -0,0 +1,21 @@
+{stdenv, fetchurl, unzip}:
+
+stdenv.mkDerivation {
+  name = "gwt-java-2.4.0";
+  src = fetchurl { 
+    url=http://google-web-toolkit.googlecode.com/files/gwt-2.4.0.zip; 
+    sha1 = "a91ac20db0ddd5994ac3cbfb0e8061d5bbf66f88"; 
+  };
+  buildInputs = [unzip]; 
+
+  installPhase = ''
+    ensureDir $out
+    unzip $src
+    mv gwt-2.4.0 $out/bin
+  '';
+
+  meta = {
+    homepage = http://code.google.com/webtoolkit/;
+    description = "Google Web Toolkit (GWT) is a development toolkit for building and optimizing complex browser-based applications.";
+  };
+ }

pkgs/development/compilers/uhc/default.nix

@@ -3,7 +3,7 @@
 }:
 
 let
-  revision = "2381";
+  revision = "2399";
 in
 stdenv.mkDerivation {
   name = "uhc-svn-${revision}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   src = fetchsvn {
      url = "https://subversion.cs.uu.nl/repos/project.UHC.pub/trunk/EHC";
      rev = revision;
-     sha256 = "37598f49cda8ff67b0b4d1c75b0bf50bfcd29a92b08ea427c5071080e368c4bc";
+     sha256 = "f4e87dbf95f90b021994b0840f27e042dd4e785df7efedcf567f3e2c7ce32621";
   };
 
   propagatedBuildInputs = [mtl network binary fgl syb];