From 05006879128b8d0552a4f527da4218af02841a75 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 21 Jul 2025 17:52:48 +0200 Subject: [PATCH] automake111x: drop --- .../tools/misc/automake/automake-1.11.x.nix | 61 ------------------- .../tools/misc/automake/builder.sh | 45 -------------- .../tools/misc/automake/fix-perl-5.26.patch | 10 --- .../automake/fix-test-autoconf-2.69.patch | 13 ---- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 6 files changed, 1 insertion(+), 131 deletions(-) delete mode 100644 pkgs/development/tools/misc/automake/automake-1.11.x.nix delete mode 100644 pkgs/development/tools/misc/automake/builder.sh delete mode 100644 pkgs/development/tools/misc/automake/fix-perl-5.26.patch delete mode 100644 pkgs/development/tools/misc/automake/fix-test-autoconf-2.69.patch diff --git a/pkgs/development/tools/misc/automake/automake-1.11.x.nix b/pkgs/development/tools/misc/automake/automake-1.11.x.nix deleted file mode 100644 index 20921a95de73..000000000000 --- a/pkgs/development/tools/misc/automake/automake-1.11.x.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - perl, - autoconf, -}: - -stdenv.mkDerivation rec { - pname = "automake"; - version = "1.11.6"; - - # TODO: Remove the `aclocal' wrapper when $ACLOCAL_PATH support is - # available upstream; see - # . - builder = ./builder.sh; - - setupHook = ./setup-hook.sh; - - src = fetchurl { - url = "mirror://gnu/automake/automake-${version}.tar.xz"; - sha256 = "1ffbc6cc41f0ea6c864fbe9485b981679dc5e350f6c4bc6c3512f5a4226936b5"; - }; - - patches = [ - ./fix-test-autoconf-2.69.patch - ./fix-perl-5.26.patch - ]; - - strictDeps = true; - nativeBuildInputs = [ - perl - autoconf - ]; - buildInputs = [ autoconf ]; - - doCheck = false; # takes _a lot_ of time, fails 11 of 782 tests - - # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the - # "fixed" path in generated files! - dontPatchShebangs = true; - - # Run the test suite in parallel. - enableParallelBuilding = true; - - meta = { - branch = "1.11"; - homepage = "https://www.gnu.org/software/automake/"; - description = "GNU standard-compliant makefile generator"; - - longDescription = '' - GNU Automake is a tool for automatically generating - `Makefile.in' files compliant with the GNU Coding - Standards. Automake requires the use of Autoconf. - ''; - - license = lib.licenses.gpl2Plus; - - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/development/tools/misc/automake/builder.sh b/pkgs/development/tools/misc/automake/builder.sh deleted file mode 100644 index 9c6a90965f7f..000000000000 --- a/pkgs/development/tools/misc/automake/builder.sh +++ /dev/null @@ -1,45 +0,0 @@ -# Wrap the given `aclocal' program, appending extra `-I' flags -# corresponding to the directories listed in $ACLOCAL_PATH. (Note -# that `wrapProgram' can't be used for that purpose since it can only -# prepend flags, not append them.) -wrapAclocal() { - local program="$1" - local wrapped="$(dirname $program)/.$(basename $program)-wrapped" - - mv "$program" "$wrapped" - cat > "$program"< baz.cc - - $ACLOCAL --$AUTOMAKE -+$AUTOMAKE --add-missing - - # Look for the macros at the beginning of rules. Be careful, as there - # are literal tabs at the beginning of the search strings. diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 05f666e1543b..88d47f36e789 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -315,6 +315,7 @@ mapAliases { ats = throw "'ats' has been removed as it is unmaintained for 10 years and broken"; # Added 2025-05-17 audaciousQt5 = throw "'audaciousQt5' has been removed, since audacious is built with Qt 6 now"; # Added 2024-07-06 auditBlasHook = throw "'auditBlasHook' has been removed since it never worked"; # Added 2024-04-02 + automake111x = throw "'automake111x' has been removed in favor of 'automake'"; # Added 2025-07-21 autoReconfHook = throw "You meant 'autoreconfHook', with a lowercase 'r'."; # preserve autoreconfHook264 = throw "'autoreconfHook264' has been removed in favor of 'autoreconfHook'"; # Added 2025-07-21 aumix = throw "'aumix' has been removed due to lack of maintenance upstream. Consider using 'pamixer' for CLI or 'pavucontrol' for GUI"; # Added 2024-09-14 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 47b70ec8c63c..5b645412d676 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6868,8 +6868,6 @@ with pkgs; automake = automake116x; - automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix { }; - automake116x = callPackage ../development/tools/misc/automake/automake-1.16.x.nix { }; automake118x = callPackage ../development/tools/misc/automake/automake-1.18.x.nix { };