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

now imports Nix expression of specific version.

* pkgs/development/tools/parsing/sdf/sdf2-bundle-2.2.nix: added
previous version of sdf2-bundle.

* pkgs/development/tools/parsing/sdf2: obsolete.

* pkgs/development/compilers/strategoxt/strategoxt-0.12.nix: use
sdf2-bundle instead of attribute set for the individual packages.

* 


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

pkgs/development/compilers/strategoxt/builder-0.14.sh

@@ -1,4 +0,0 @@
-. $stdenv/setup
-
-configureFlags="--with-aterm=$aterm --with-sdf=$sdf"
-genericBuild

pkgs/development/compilers/strategoxt/builder.sh

@@ -1,4 +1,4 @@
 . $stdenv/setup
 
-configureFlags="--with-aterm=$aterm --with-sglr=$sglr --with-pgen=$pgen --with-pt-support=$ptsupport --with-asf-library=$asflibrary"
+configureFlags="--with-aterm=$aterm --with-sdf=$sdf"
 genericBuild

pkgs/development/compilers/strategoxt/strategoxt-0.12.nix

@@ -1,9 +1,7 @@
 {stdenv, fetchurl, aterm, sdf}:
 
 stdenv.mkDerivation {
-
   name = "strategoxt-0.12";
-
   builder = ./builder.sh;
 
   src = fetchurl {
@@ -11,8 +9,6 @@ stdenv.mkDerivation {
     md5 = "bc2b14d9b53a07fc0047c16f2c6edf0c";
   };
 
-  inherit aterm;
-  inherit (sdf) sglr pgen ptsupport asflibrary;
-
-  buildInputs = [aterm sdf.pgen];
+  inherit aterm sdf;
+  buildInputs = [aterm sdf];
 }

pkgs/development/compilers/strategoxt/strategoxt-0.14.nix

@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
 
   name = "strategoxt-0.14";
-  builder = ./builder-0.14.sh;
+  builder = ./builder.sh;
 
   src = fetchurl {
     url = ftp://ftp.stratego-language.org/pub/stratego/StrategoXT/strategoxt-0.14/strategoxt-0.14.tar.gz;