diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2009-11-21 23:18:23 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2009-11-21 23:18:23 +0000 |
| commit | 0d041d909b40b065021263a3541488c9f1df0558 (patch) | |
| tree | 201a27c882083c84ddf6e372ec1c5e2b15a5f912 /pkgs/development/tools/misc/autoconf | |
| parent | 96d3032ea0781ec6584b4fda05dab3f463e3c221 (diff) | |
GNU Autoconf 2.65.
svn path=/nixpkgs/trunk/; revision=18511
Diffstat (limited to 'pkgs/development/tools/misc/autoconf')
| -rw-r--r-- | pkgs/development/tools/misc/autoconf/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/autoconf/test-suite-fix.patch | 17 |
2 files changed, 2 insertions, 21 deletions
diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix index b7850565d5c..b6d48a8c681 100644 --- a/pkgs/development/tools/misc/autoconf/default.nix +++ b/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 diff --git a/pkgs/development/tools/misc/autoconf/test-suite-fix.patch b/pkgs/development/tools/misc/autoconf/test-suite-fix.patch deleted file mode 100644 index 3d5d20b8562..00000000000 --- a/pkgs/development/tools/misc/autoconf/test-suite-fix.patch +++ /dev/null @@ -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([:]) |