Added aterm 2.1

svn path=/nixpkgs/branches/martin2/; revision=1008

pkgs/development/compilers/j2sdk/builder.sh

@@ -1,8 +1,7 @@
 #!/bin/sh
 
 . $stdenv/setup || exit 1
-version=j2sdk1.4.2_03
-src=$version.bin
+src=$filename.bin
 
 cp $pathname $src || exit 1
 
@@ -19,4 +18,4 @@ alias more=cat
 yes yes | ./$src || exit 1
 
 mkdir $out || exit 1
-mv $version/* $out/ || exit 1
+mv $dirname/* $out/ || exit 1

pkgs/development/compilers/j2sdk/default-1.5.nix

@@ -0,0 +1,10 @@
+{stdenv, fetchurl}: 
+
+if stdenv.system == "i686-linux"
+  then
+    (import ./j2sdk1.5-sun-linux.nix) {
+      stdenv   = stdenv;
+      fetchurl = fetchurl;
+    }
+  else
+    false

pkgs/development/compilers/j2sdk/j2sdk-sun-linux.nix

@@ -14,6 +14,8 @@ assert stdenv.system == "i686-linux";
 
 derivation {
   name = "j2sdk-1.4.2";
+  filename = "j2sdk-1.4.2_03";
+  dirname = "j2sdk1.4.2_03";
   system = stdenv.system;
   builder = ./builder.sh;
   pathname = "/tmp/j2sdk-1_4_2_03-linux-i586.bin";

pkgs/development/compilers/j2sdk/j2sdk1.5-sun-linux.nix

@@ -0,0 +1,24 @@
+/**
+ * This Nix expression requires the user to download the j2sdk
+ * distribution to /tmp. Please obtain j2sdk-1_5_0-beta-linux-i586.bin
+ * from java.sun.com by hand and place it in /tmp. Blame Sun, not me.
+ *
+ * Note that this is not necessary if someone has already pushed a
+ * binary.
+ *
+ * @author Martin Bravenboer <martin@cs.uu.nl>
+ */
+{stdenv, fetchurl}: 
+
+assert stdenv.system == "i686-linux";
+
+derivation {
+  name = "j2sdk-1.5.0-beta";
+  filename = "j2sdk-1_5_0-beta";
+  dirname = "j2sdk1.5.0";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  pathname = "/tmp/j2sdk-1_5_0-beta-linux-i586.bin";
+  md5 = "1e6af0d64563b085ffadec97db365b19";
+  stdenv = stdenv;
+}

pkgs/development/libraries/aterm/aterm-2.1.nix

@@ -0,0 +1,10 @@
+{stdenv, fetchurl}: derivation {
+  name = "aterm-2.1";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://www.cwi.nl/projects/MetaEnv/aterm/aterm-2.1.tar.gz;
+    md5 = "b9d541da35b6d287af1cd8460963a7a8";
+  };
+  stdenv = stdenv;
+}

pkgs/system/all-packages-generic.nix

@@ -196,6 +196,10 @@
     inherit fetchurl stdenv;
   };
 
+  j2sdk15 = (import ../development/compilers/j2sdk/default-1.5.nix) {
+    inherit fetchurl stdenv;
+  };
+
   strategoxt = (import ../development/compilers/strategoxt) {
     inherit fetchurl stdenv aterm;
     sdf = sdf2;
@@ -262,6 +266,10 @@
     inherit fetchurl stdenv;
   };
 
+  aterm_2_1 = (import ../development/libraries/aterm/aterm-2.1.nix) {
+    inherit fetchurl stdenv;
+  };
+
   sdf2 = (import ../development/tools/parsing/sdf2) {
     inherit fetchurl stdenv aterm getopt;
   };