From f1b459adfd4687f59bb395f27188b8ca646dfabd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 27 Mar 2004 15:49:59 +0000
Subject: [PATCH] * `aterm_2_0_5' is gone.

svn path=/nixpkgs/trunk/; revision=856
---
 pkgs/system/all-packages-generic.nix | 26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index db0f0325b31..edabc1799b3 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -295,56 +295,45 @@ rec {
     inherit fetchurl stdenv;
   };
 
-  aterm_2_0_5 = (import ../development/libraries/aterm/aterm-2.0.5.nix) {
-    inherit fetchurl stdenv;
-  };
-
   sdf2 = (import ../development/tools/parsing/sdf2) {
     inherit fetchurl stdenv aterm getopt;
   };
 
   toolbuslib_0_5_1 = (import ../development/tools/parsing/toolbuslib/toolbuslib-0.5.1.nix) {
-    inherit fetchurl stdenv;
-    aterm = aterm_2_0_5;
+    inherit fetchurl stdenv aterm;
   };
 
   ptsupport_1_0 = (import ../development/tools/parsing/pt-support/pt-support-1.0.nix) {
-    inherit fetchurl stdenv;
-    aterm = aterm_2_0_5;
+    inherit fetchurl stdenv aterm;
     toolbuslib = toolbuslib_0_5_1;
   };
 
   sdfsupport_2_0 = (import ../development/tools/parsing/sdf-support/sdf-support-2.0.nix) {
-    inherit fetchurl stdenv;
-    aterm = aterm_2_0_5;
+    inherit fetchurl stdenv aterm;
     toolbuslib = toolbuslib_0_5_1;
     ptsupport = ptsupport_1_0;
   };
 
   sglr_3_10_2 = (import ../development/tools/parsing/sglr/sglr-3.10.2.nix) {
-    inherit fetchurl stdenv;
-    aterm = aterm_2_0_5;
+    inherit fetchurl stdenv aterm;
     toolbuslib = toolbuslib_0_5_1;
     ptsupport = ptsupport_1_0;
   };
 
   asfsupport_1_2 = (import ../development/tools/parsing/asf-support/asf-support-1.2.nix) {
-    inherit fetchurl stdenv;
-    aterm = aterm_2_0_5;
+    inherit fetchurl stdenv aterm;
     ptsupport = ptsupport_1_0;
   };
 
   ascsupport_1_8 = (import ../development/tools/parsing/asc-support/asc-support-1.8.nix) {
-    inherit fetchurl stdenv;
-    aterm = aterm_2_0_5;
+    inherit fetchurl stdenv aterm;
     toolbuslib = toolbuslib_0_5_1;
     ptsupport = ptsupport_1_0;
     asfsupport	= asfsupport_1_2;
   };
 
   pgen_2_0 = (import ../development/tools/parsing/pgen/pgen-2.0.nix) {
-    inherit fetchurl stdenv getopt;
-    aterm = aterm_2_0_5;
+    inherit fetchurl stdenv getopt aterm;
     toolbuslib = toolbuslib_0_5_1;
     ptsupport = ptsupport_1_0;
     asfsupport = asfsupport_1_2;
@@ -716,7 +705,6 @@ rec {
 
   nix = (import ../misc/nix) {
     inherit fetchurl stdenv aterm;
-    aterm = aterm_2_0_5;
     bdb = db4;
   };