Finishing the update from trunk, having resolved the eclipse related directory

renaming.
I think directory renaming breaks the usual merges... because it leaves the
'to be removed' directory in the working directory still. A manual 'rm' of the
'to be removed' directory fixed the commit.

svn merge  ^/nixpkgs/trunk


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

pkgs/development/tools/misc/autoconf/default.nix

@@ -1,15 +1,13 @@
 { stdenv, fetchurl, m4, perl }:
 
 stdenv.mkDerivation rec {
-  name = "autoconf-2.64";
+  name = "autoconf-2.65";
 
   src = fetchurl {
     url = "mirror://gnu/autoconf/${name}.tar.bz2";
-    sha256 = "11damk9x09616cjdfxx9y73igd96zzylgq0l4j57qzify6nlqbw7";
+    sha256 = "0sqkh2xirg3yq7774aqmbi2nbx8rv3yf6v2xzwlz5ypkax0984fv";
   };
 
-  patches = [ ./test-suite-fix.patch ];
-
   buildInputs = [ m4 perl ];
 
   # Work around a known issue in Cygwin.  See

pkgs/development/tools/misc/autoconf/test-suite-fix.patch

@@ -1,17 +0,0 @@
-This patch by Ralf Wildenhues <Ralf.Wildenhues@gmx.de> fixes
-the "Hard fail" test case.
-
-See http://thread.gmane.org/gmane.comp.sysutils.autoconf.bugs/6814
-for details.
-
---- a/tests/autotest.at
-+++ b/tests/autotest.at
-@@ -271,7 +271,7 @@ AT_CHECK_AT_TEST([Hard fail],
-    AT_CHECK([exit 99])],
-   [], [1], [], [ignore], [],
-   [AT_CHECK([grep '2 failed unexpectedly' micro-suite.log], [], [ignore])
--   AT_CHECK([grep ok micro-suite.log], [1])])
-+   AT_CHECK([grep '^[[12]].*ok' micro-suite.log], [1])])
- 
- AT_CHECK_AT_TEST([AT@&t@_FAIL_IF],
-   [AT_FAIL_IF([:])