From 99f8d729b08d0fd283b08a7288b823dd9bd512fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 10 Dec 2009 14:50:50 +0000
Subject: [PATCH] Updating nix's aterm from aterm242fixes to aterm25 (proposed
 by niksnut).

svn path=/nixpkgs/branches/stdenv-updates/; revision=18879
---
 pkgs/top-level/all-packages.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6910c5c5ce3..386b36ba29d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5739,7 +5739,7 @@ let
       inherit fetchurl stdenv perl curl bzip2 openssl bison;
       inherit libtool automake autoconf docbook5 docbook5_xsl libxslt docbook_xml_dtd_43 w3m;
 
-      aterm = aterm242fixes;
+      aterm = aterm25;
       db4 = db45;
 
       flex = flex2533;
@@ -8493,7 +8493,7 @@ let
 
   nix = makeOverridable (import ../tools/package-management/nix) {
     inherit fetchurl stdenv perl curl bzip2 openssl;
-    aterm = aterm242fixes;
+    aterm = aterm25;
     db4 = db45;
     supportOldDBs = getPkgConfig "nix" "OldDBSupport" true;
     storeDir = getPkgConfig "nix" "storeDir" "/nix/store";
@@ -8503,7 +8503,7 @@ let
   # The bleeding edge.
   nixUnstable = makeOverridable (import ../tools/package-management/nix/unstable.nix) {
     inherit fetchurl stdenv perl curl bzip2 openssl;
-    aterm = aterm242fixes;
+    aterm = aterm25;
     storeDir = getPkgConfig "nix" "storeDir" "/nix/store";
     stateDir = getPkgConfig "nix" "stateDir" "/nix/var";
   };
@@ -8513,7 +8513,7 @@ let
       inherit fetchurl stdenv perl curl bzip2 openssl src preConfigure automake
         autoconf libtool configureFlags enableScripts lib bison libxml2;
       flex = flex2533;
-      aterm = aterm242fixes;
+      aterm = aterm25;
       db4 = db45;
       inherit docbook5_xsl libxslt docbook5 docbook_xml_dtd_43 w3m;
     };