Upgraded sdf2-bundle to 2.3.1

svn path=/nixpkgs/trunk/; revision=3627

pkgs/development/tools/parsing/sdf/default.nix

@@ -1 +1 @@
-import ./sdf2-bundle-2.3.nix
+import ./sdf2-bundle-2.3.1.nix

pkgs/development/tools/parsing/sdf/sdf2-bundle-2.3.1.nix

@@ -0,0 +1,12 @@
+{stdenv, fetchurl, aterm, getopt}:
+
+stdenv.mkDerivation {
+  name = "sdf2-bundle-2.3";
+  src = fetchurl {
+    url = ftp://ftp.stratego-language.org/pub/stratego/sdf2/sdf2-bundle-2.3.1/sdf2-bundle-2.3.1.tar.gz;
+    md5 = "4576b0b5315dccae8b038c53305c6979";
+  };
+
+  buildInputs = [aterm];
+  propagatedBuildInputs = [getopt];
+}

pkgs/system/all-packages-generic.nix

@@ -619,10 +619,7 @@ rec {
   };
 
   sdf = (import ../development/tools/parsing/sdf) {
-    inherit fetchurl stdenv getopt;
+    inherit fetchurl stdenv aterm getopt;
-    aterm =  (import ../development/libraries/aterm/aterm-2.3.1.nix) {
-      inherit fetchurl stdenv;
-    };
   };
 
   expat = (import ../development/libraries/expat) {