diff --git a/pkgs/development/tools/misc/automake/automake-1.15.x.nix b/pkgs/development/tools/misc/automake/automake-1.15.x.nix deleted file mode 100644 index 3defb1dd9148..000000000000 --- a/pkgs/development/tools/misc/automake/automake-1.15.x.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - perl, - autoconf, -}: - -stdenv.mkDerivation rec { - pname = "automake"; - version = "1.15.1"; - - src = fetchurl { - url = "mirror://gnu/automake/automake-${version}.tar.xz"; - sha256 = "1bzd9g32dfm4rsbw93ld9x7b5nc1y6i4m6zp032qf1i28a8s6sxg"; - }; - - nativeBuildInputs = [ - autoconf - perl - ]; - buildInputs = [ autoconf ]; - - setupHook = ./setup-hook.sh; - - patches = [ ./help2man-SOURCE_DATE_EPOCH-support.patch ]; - - doCheck = false; # takes _a lot_ of time, fails 3 out of 2698 tests, all seem to be related to paths - doInstallCheck = false; # runs the same thing, fails the same tests - - # The test suite can run in parallel. - enableParallelBuilding = true; - - # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the - # "fixed" path in generated files! - dontPatchShebangs = true; - - meta = { - branch = "1.15"; - homepage = "https://www.gnu.org/software/automake/"; - description = "GNU standard-compliant makefile generator"; - license = lib.licenses.gpl2Plus; - - longDescription = '' - GNU Automake is a tool for automatically generating - `Makefile.in' files compliant with the GNU Coding - Standards. Automake requires the use of Autoconf. - ''; - - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/development/tools/misc/automake/help2man-SOURCE_DATE_EPOCH-support.patch b/pkgs/development/tools/misc/automake/help2man-SOURCE_DATE_EPOCH-support.patch deleted file mode 100644 index 048f75e63343..000000000000 --- a/pkgs/development/tools/misc/automake/help2man-SOURCE_DATE_EPOCH-support.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 2e3357d7f0d63f1caeb40d9644c2436a5cd0da5f Mon Sep 17 00:00:00 2001 -From: David Terry -Date: Fri, 18 Oct 2019 10:23:11 +0200 -Subject: [PATCH] help2man: add support for SOURCE_DATE_EPOCH - ---- - doc/help2man | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) - -diff --git a/doc/help2man b/doc/help2man -index af4306f..4a64167 100755 ---- a/doc/help2man -+++ b/doc/help2man -@@ -213,11 +213,23 @@ sub get_option_value; - my $help_text = get_option_value $ARGV[0], $help_option; - $version_text ||= get_option_value $ARGV[0], $version_option; - -+# By default the generated manual pages will include the current date. This may -+# however be overriden by setting the environment variable $SOURCE_DATE_EPOCH -+# to an integer value of the seconds since the UNIX epoch. This is primarily -+# intended to support reproducible builds (wiki.debian.org/ReproducibleBuilds) -+# and will additionally ensure that the output date string is UTC. -+my $epoch_secs = time; -+if (exists $ENV{SOURCE_DATE_EPOCH} and $ENV{SOURCE_DATE_EPOCH} =~ /^(\d+)$/) -+{ -+ $epoch_secs = $1; -+ $ENV{TZ} = 'UTC'; -+} -+ - # Translators: the following message is a strftime(3) format string, which in - # the English version expands to the month as a word and the full year. It - # is used on the footer of the generated manual pages. If in doubt, you may - # just use %x as the value (which should be the full locale-specific date). --my $date = enc strftime _("%B %Y"), localtime; -+my $date = enc strftime _("%B %Y"), localtime $epoch_secs; - (my $program = $ARGV[0]) =~ s!.*/!!; - my $package = $program; - my $version; --- -2.23.0 - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3cf08de32ee3..17d3cb80f782 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6862,8 +6862,6 @@ with pkgs; automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix { }; - automake115x = callPackage ../development/tools/misc/automake/automake-1.15.x.nix { }; - automake116x = callPackage ../development/tools/misc/automake/automake-1.16.x.nix { }; automake117x = callPackage ../development/tools/misc/automake/automake-1.17.x.nix { };