From b9cc20e0fd79b7b970598d8ec8bc26afb3e94176 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Sat, 30 Jan 2021 22:36:55 +0100
Subject: [PATCH] autoconf: use autoconf 2.71 by default

---
 pkgs/development/tools/misc/autoconf/2.71.nix | 54 -------------------
 .../tools/misc/autoconf/default.nix           |  4 +-
 pkgs/top-level/all-packages.nix               |  9 +---
 3 files changed, 4 insertions(+), 63 deletions(-)
 delete mode 100644 pkgs/development/tools/misc/autoconf/2.71.nix

diff --git a/pkgs/development/tools/misc/autoconf/2.71.nix b/pkgs/development/tools/misc/autoconf/2.71.nix
deleted file mode 100644
index 3b70e819c899..000000000000
--- a/pkgs/development/tools/misc/autoconf/2.71.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{ lib, stdenv, fetchurl, m4, perl }:
-
-# Note: this package is used for bootstrapping fetchurl, and thus
-# cannot use fetchpatch! All mutable patches (generated by GitHub or
-# cgit) that are needed here should be included directly in Nixpkgs as
-# files.
-
-stdenv.mkDerivation rec {
-  name = "autoconf-2.71";
-
-  src = fetchurl {
-    url = "mirror://gnu/autoconf/${name}.tar.xz";
-    sha256 = "197sl23irn6s9pd54rxj5vcp5y8dv65jb9yfqgr2g56cxg7q6k7i";
-  };
-
-  nativeBuildInputs = [ m4 perl ];
-  buildInputs = [ m4 ];
-
-  # Work around a known issue in Cygwin.  See
-  # http://thread.gmane.org/gmane.comp.sysutils.autoconf.bugs/6822 for
-  # details.
-  # There are many test failures on `i386-pc-solaris2.11'.
-  doCheck = ((!stdenv.isCygwin) && (!stdenv.isSunOS));
-
-  # Don't fixup "#! /bin/sh" in Autoconf, otherwise it will use the
-  # "fixed" path in generated files!
-  dontPatchShebangs = true;
-
-  enableParallelBuilding = true;
-
-  # Make the Autotest test suite run in parallel.
-  preCheck =''
-    export TESTSUITEFLAGS="-j$NIX_BUILD_CORES"
-  '';
-
-  meta = {
-    homepage = "https://www.gnu.org/software/autoconf/";
-    description = "Part of the GNU Build System";
-
-    longDescription = ''
-      GNU Autoconf is an extensible package of M4 macros that produce
-      shell scripts to automatically configure software source code
-      packages.  These scripts can adapt the packages to many kinds of
-      UNIX-like systems without manual user intervention.  Autoconf
-      creates a configuration script for a package from a template
-      file that lists the operating system features that the package
-      can use, in the form of M4 macro calls.
-    '';
-
-    license = lib.licenses.gpl3Plus;
-
-    platforms = lib.platforms.all;
-  };
-}
diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix
index ae8fc2d90619..3b70e819c899 100644
--- a/pkgs/development/tools/misc/autoconf/default.nix
+++ b/pkgs/development/tools/misc/autoconf/default.nix
@@ -6,11 +6,11 @@
 # files.
 
 stdenv.mkDerivation rec {
-  name = "autoconf-2.70";
+  name = "autoconf-2.71";
 
   src = fetchurl {
     url = "mirror://gnu/autoconf/${name}.tar.xz";
-    sha256 = "1ipckz0wr2mvhj9n3ys54fmf2aksin6bhqvzl304bn6rc1w257ps";
+    sha256 = "197sl23irn6s9pd54rxj5vcp5y8dv65jb9yfqgr2g56cxg7q6k7i";
   };
 
   nativeBuildInputs = [ m4 perl ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e65beb79f420..c73e817889e8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -124,10 +124,6 @@ in
     { deps = [ autoconf269 automake gettext libtool ]; }
     ../build-support/setup-hooks/autoreconf.sh;
 
-  autoreconfHook271 = makeSetupHook
-    { deps = [ autoconf271 automake gettext libtool ]; }
-    ../build-support/setup-hooks/autoreconf.sh;
-
   autoPatchelfHook = makeSetupHook { name = "auto-patchelf-hook"; }
     ../build-support/setup-hooks/auto-patchelf.sh;
 
@@ -11620,15 +11616,14 @@ in
 
   autobuild = callPackage ../development/tools/misc/autobuild { };
 
-  autoconf = autoconf270;
+  autoconf = autoconf271;
 
   autoconf-archive = callPackage ../development/tools/misc/autoconf-archive { };
 
   autoconf213 = callPackage ../development/tools/misc/autoconf/2.13.nix { };
   autoconf264 = callPackage ../development/tools/misc/autoconf/2.64.nix { };
   autoconf269 = callPackage ../development/tools/misc/autoconf/2.69.nix { };
-  autoconf270 = callPackage ../development/tools/misc/autoconf { };
-  autoconf271 = callPackage ../development/tools/misc/autoconf/2.71.nix { };
+  autoconf271 = callPackage ../development/tools/misc/autoconf { };
 
   autocutsel = callPackage ../tools/X11/autocutsel{ };