6 files changed, 40 insertions, 27 deletions
diff --git a/pkgs/development/libraries/aterm/aterm-2.3.1.nix b/pkgs/development/libraries/aterm/aterm-2.3.1.nix
new file mode 100644
index 0000000000000..61aa07530ee97
--- /dev/null
+++ b/pkgs/development/libraries/aterm/aterm-2.3.1.nix
@@ -0,0 +1,13 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "aterm-2.3.1";
+  configureFlags = "--with-gcc";
+
+  src = fetchurl {
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/aterm-2.3.1.tar.gz;
+    md5 = "5a2d70acc45a9d301e0dba12fcaf77e7";
+  };
+
+  patches = [ ./aterm-alias-fix.patch ];
+}
diff --git a/pkgs/development/libraries/aterm/aterm-2.4.nix b/pkgs/development/libraries/aterm/aterm-2.4.nix
new file mode 100644
index 0000000000000..403525ec7b437
--- /dev/null
+++ b/pkgs/development/libraries/aterm/aterm-2.4.nix
@@ -0,0 +1,9 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "aterm-2.4";
+  src = fetchurl {
+    url = http://www.cwi.nl/projects/MetaEnv/aterm/aterm-2.4.tar.gz;
+    md5 = "baf12d71372cfaa0d39145234e262fef";
+  };
+}
diff --git a/pkgs/development/libraries/aterm/default.nix b/pkgs/development/libraries/aterm/default.nix
index 61aa07530ee97..73f1747796d3e 100644
--- a/pkgs/development/libraries/aterm/default.nix
+++ b/pkgs/development/libraries/aterm/default.nix
@@ -1,13 +1 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "aterm-2.3.1";
-  configureFlags = "--with-gcc";
-
-  src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/aterm-2.3.1.tar.gz;
-    md5 = "5a2d70acc45a9d301e0dba12fcaf77e7";
-  };
-
-  patches = [ ./aterm-alias-fix.patch ];
-}
+import ./aterm-2.4.nix
diff --git a/pkgs/development/libraries/aterm/dynamic.nix b/pkgs/development/libraries/aterm/dynamic.nix
deleted file mode 100644
index e36c906b33758..0000000000000
--- a/pkgs/development/libraries/aterm/dynamic.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "aterm-dynamic-2.3.2";
-  src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/aterm-2.3.2pre11665.tar.gz;
-    md5 = "2eb01c044d765ded55f10e05756fec98";
-  };
-}
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 8990997f8afb1..e3b14099726ef 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -400,6 +400,23 @@ rec {
     inherit stdenv;
   };
 
+/*
+  gcj = (import ../build-support/gcc-wrapper/default2.nix) {
+    name = "gcj";
+    nativeTools = false;
+    nativeGlibc = false;
+    gcc = (import ../development/compilers/gcc-4.0) {
+      inherit fetchurl stdenv noSysDirs;
+      langJava = true;
+      langCC   = false;
+      langC    = false;
+      langF77  = false;
+    };
+    inherit (stdenv.gcc) binutils glibc;
+    inherit stdenv;
+  };
+*/
+
   opencxx = (import ../development/compilers/opencxx) {
     inherit fetchurl stdenv libtool;
     gcc = gcc33;
@@ -601,10 +618,6 @@ rec {
     inherit fetchurl stdenv;
   };
 
-  atermDynamic = (import ../development/libraries/aterm/dynamic.nix) {
-    inherit fetchurl stdenv;
-  };
-
   sdf = (import ../development/tools/parsing/sdf) {
     inherit fetchurl stdenv aterm getopt;
   };
diff --git a/pkgs/system/populate-cache.nix b/pkgs/system/populate-cache.nix
index 4d748a159bd74..129b6149c8906 100644
--- a/pkgs/system/populate-cache.nix
+++ b/pkgs/system/populate-cache.nix
@@ -39,7 +39,6 @@ let {
     flexnew
     gccWrapped
     aterm
-    atermDynamic
 
 #    atermjava
 #    jjtraveler