about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2012-07-07 10:40:53 +0200
committerLudovic Courtès <ludo@gnu.org>2012-07-07 11:27:29 +0200
commit240d2e9cfaef05fc0cb3b362723cb3b04c05cde8 (patch)
tree662bd35ce5cd317ceab9285e862ee7b2aca7c09a /pkgs
parentb98782f339b620d72e753f2bf57917d8bff8eeab (diff)
automake: remove versions 1.7 and 1.9
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/tools/misc/automake/automake-1.7.x.nix18
-rw-r--r--pkgs/development/tools/misc/automake/automake-1.9.x.nix33
-rw-r--r--pkgs/top-level/all-packages.nix4
-rw-r--r--pkgs/top-level/release-small.nix1
-rw-r--r--pkgs/top-level/release.nix1
5 files changed, 0 insertions, 57 deletions
diff --git a/pkgs/development/tools/misc/automake/automake-1.7.x.nix b/pkgs/development/tools/misc/automake/automake-1.7.x.nix
deleted file mode 100644
index e0d8e516d3b52..0000000000000
--- a/pkgs/development/tools/misc/automake/automake-1.7.x.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{stdenv, fetchurl, perl, autoconf, makeWrapper}:
-
-stdenv.mkDerivation {
-  name = "automake-1.7.9";
-  
-  builder = ./builder.sh;
-  
-  src = fetchurl {
-    url = http://nixos.org/tarballs/automake-1.7.9.tar.bz2;
-    md5 = "571fd0b0598eb2a27dcf68adcfddfacb";
-  };
-  
-  buildInputs = [perl autoconf makeWrapper];
-
-  # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the
-  # "fixed" path in generated files!
-  dontPatchShebangs = true;
-}
diff --git a/pkgs/development/tools/misc/automake/automake-1.9.x.nix b/pkgs/development/tools/misc/automake/automake-1.9.x.nix
deleted file mode 100644
index 5ca279d23adb0..0000000000000
--- a/pkgs/development/tools/misc/automake/automake-1.9.x.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{stdenv, fetchurl, perl, autoconf, makeWrapper}:
-
-stdenv.mkDerivation {
-  name = "automake-1.9.6";
-  
-  builder = ./builder.sh;
-  
-  setupHook = ./setup-hook.sh;
-  
-  src = fetchurl {
-    url = ftp://ftp.gnu.org/gnu/automake/automake-1.9.6.tar.gz;
-    md5 = "c60f77a42f103606981d456f1615f5b4";
-  };
-  
-  buildInputs = [perl autoconf makeWrapper];
-
-  # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the
-  # "fixed" path in generated files!
-  dontPatchShebangs = true;
-
-  meta = {
-    homepage = http://www.gnu.org/software/automake/;
-    description = "GNU Automake, a 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 = "GPLv2+";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b6ce5549f2bd9..c012ce86adcf5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2836,10 +2836,6 @@ let
 
   automake = automake111x;
 
-  automake17x = callPackage ../development/tools/misc/automake/automake-1.7.x.nix { };
-
-  automake19x = callPackage ../development/tools/misc/automake/automake-1.9.x.nix { };
-
   automake110x = callPackage ../development/tools/misc/automake/automake-1.10.x.nix { };
 
   automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix {
diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index 59777fe99be7a..3201afb44a059 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -24,7 +24,6 @@ with (import ./release-lib.nix);
   autoconf = all;
   automake110x = all;
   automake111x = all;
-  automake19x = all;
   avahi = allBut "i686-cygwin";  # Cygwin builds fail
   bash = all;
   bashInteractive = all;
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 18bad093294c4..5391b3a51c579 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -26,7 +26,6 @@ with (import ./release-lib.nix);
   autoconf = all;
   automake110x = all;
   automake111x = all;
-  automake19x = all;
   avahi = allBut "i686-cygwin";  # Cygwin builds fail
   bash = all;
   bashInteractive = all;