* Fixed Stratego.

* Added Zoom, an interpreter for Z-Code.

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

9 files changed, 27 insertions, 59 deletions

diff --git a/pkgs/README b/pkgs/README
index 85a09408aabbe..ff29a6013ca34 100644
--- a/pkgs/README
+++ b/pkgs/README
@@ -104,6 +104,10 @@ ELSE IF it's DATA (i.e., doe not have a straight-forward executable semantics):
     ELSE IF it's an XSLT stylesheet (okay, these are executable...):
       ./data/sgml+xml/stylesheets/xslt
 
+ELSE IF it's a GAME:
+
+  ./games
+
 ELSE:
 
   ./misc
diff --git a/pkgs/development/compilers/strategoxt/default.nix b/pkgs/development/compilers/strategoxt/default.nix
index b4207a3bb9924..2d748fd336685 100644
--- a/pkgs/development/compilers/strategoxt/default.nix
+++ b/pkgs/development/compilers/strategoxt/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, aterm, sdf}:
 
 stdenv.mkDerivation {
-  name = "strategoxt-0.9.4";
+  name = "strategoxt-0.9.5";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.stratego-language.org/pub/stratego/StrategoXT/strategoxt-0.9.4.tar.gz;
-    md5 = "b61aee784cebac6cce0d96383bdb1b37";
+    url = ftp://ftp.stratego-language.org/pub/stratego/StrategoXT/strategoxt-0.9.5.tar.gz;
+    md5 = "c3caea5c05f8d8439450866b6d5664df";
   };
   inherit aterm sdf;
 }
diff --git a/pkgs/development/compilers/strategoxt/strategoxt-0.9.3.nix b/pkgs/development/compilers/strategoxt/strategoxt-0.9.3.nix
deleted file mode 100644
index 1773241cbd44c..0000000000000
--- a/pkgs/development/compilers/strategoxt/strategoxt-0.9.3.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{stdenv, fetchurl, aterm, sdf}: derivation {
-  name = "strategoxt-0.9.3";
-  system = stdenv.system;
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = ftp://ftp.stratego-language.org/pub/stratego/StrategoXT/strategoxt-0.9.3.tar.gz;
-    md5 = "3425e7ae896426481bd258817737e3d6";
-  };
-  stdenv = stdenv;
-  aterm = aterm;
-  sdf = sdf;
-  tarfile = "true";
-  dir = "strategoxt";
-}
diff --git a/pkgs/development/compilers/strategoxt/strategoxt-0.9.5.nix b/pkgs/development/compilers/strategoxt/strategoxt-0.9.5.nix
deleted file mode 100644
index f608cb47c5cf2..0000000000000
--- a/pkgs/development/compilers/strategoxt/strategoxt-0.9.5.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{stdenv, fetchurl, aterm, sdf}: derivation {
-  name = "strategoxt-0.9.5";
-  system = stdenv.system;
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = ftp://ftp.stratego-language.org/pub/stratego/StrategoXT/strategoxt-0.9.5.tar.gz;
-    md5 = "c3caea5c05f8d8439450866b6d5664df";
-  };
-  inherit stdenv aterm sdf;
-  tarfile = "true";
-  dir = "strategoxt";
-}
diff --git a/pkgs/development/libraries/freedesktop/libXft/default.nix b/pkgs/development/libraries/freedesktop/libXft/default.nix
index c352494131a5e..faaabc32a2bad 100644
--- a/pkgs/development/libraries/freedesktop/libXft/default.nix
+++ b/pkgs/development/libraries/freedesktop/libXft/default.nix
@@ -9,5 +9,6 @@ stdenv.mkDerivation {
     url = http://freedesktop.org/~xlibs/release/libXft-2.1.6.tar.bz2;
     md5 = "ba10c9c3f4758f304f04f8d48e2f81a4";
   };
-  buildInputs = [pkgconfig libX11 libXrender freetype fontconfig];
+  buildInputs = [pkgconfig];
+  propagatedBuildInputs = [libX11 libXrender freetype fontconfig];
 }
diff --git a/pkgs/development/libraries/freedesktop/libXrender/default.nix b/pkgs/development/libraries/freedesktop/libXrender/default.nix
index c3040c3e352b0..28d8ae6a5aaba 100644
--- a/pkgs/development/libraries/freedesktop/libXrender/default.nix
+++ b/pkgs/development/libraries/freedesktop/libXrender/default.nix
@@ -6,6 +6,6 @@ stdenv.mkDerivation {
     url = http://freedesktop.org/~xlibs/release/xlibs-1.0/libXrender-0.8.4.tar.bz2;
     md5 = "c745339dbe5f05cff8950b71a739e34c";
   };
-  buildInputs = [pkgconfig libX11 renderext];
-  propagatedBuildInputs = [];
+  buildInputs = [pkgconfig];
+  propagatedBuildInputs = [libX11 renderext];
 }
diff --git a/pkgs/development/tools/parsing/sdf2/builder.sh b/pkgs/development/tools/parsing/sdf2/builder.sh
index ccba62988381b..0aa0befcb3728 100644
--- a/pkgs/development/tools/parsing/sdf2/builder.sh
+++ b/pkgs/development/tools/parsing/sdf2/builder.sh
@@ -1,10 +1,5 @@
-buildinputs="$aterm $getopt"
 . $stdenv/setup
 
-tar zxf $src
-cd sdf2-bundle-*
-./configure --prefix=$out --with-aterm=$aterm
-make install
+configureFlags="--with-aterm=$aterm"
 
-mkdir $out/nix-support
-echo "$getopt" > $out/nix-support/propagated-build-inputs
+genericBuild
\ No newline at end of file
diff --git a/pkgs/development/tools/parsing/sdf2/default.nix b/pkgs/development/tools/parsing/sdf2/default.nix
index 93f5944f97d86..40720978c963f 100644
--- a/pkgs/development/tools/parsing/sdf2/default.nix
+++ b/pkgs/development/tools/parsing/sdf2/default.nix
@@ -1,11 +1,13 @@
 {stdenv, fetchurl, aterm, getopt}:
+
 stdenv.mkDerivation {
-  name = "sdf2-1.6";
+  name = "sdf2-2.0.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.stratego-language.org/pub/stratego/sdf2/sdf2-bundle-1.6.tar.gz;
-    md5 = "283be0b4c7c9575c1b5cc735316e6192";
+    url = ftp://ftp.stratego-language.org/pub/stratego/sdf2/sdf2-bundle-2.0.1.tar.gz;
+    md5 = "ceba34dc8e53fba04ad3be73627f0a20";
   };
-  aterm = aterm;
-  getopt = getopt;
+  buildInputs = [aterm];
+  propagatedBuildInputs = [getopt];
+  inherit aterm;
 }
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 34eee1d7cf7a3..2e6ef412c85c2 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -233,21 +233,6 @@ rec {
     sdf = sdf2;
   };
 
-  strategoxt093 = (import ../development/compilers/strategoxt/strategoxt-0.9.3.nix) {
-    inherit fetchurl stdenv aterm;
-    sdf = sdf2;
-  };
-
-  strategoxt094 = (import ../development/compilers/strategoxt/strategoxt-0.9.4.nix) {
-    inherit fetchurl stdenv aterm;
-    sdf = sdf2;
-  };
-
-  strategoxt095 = (import ../development/compilers/strategoxt/strategoxt-0.9.5.nix) {
-    inherit fetchurl stdenv aterm;
-    sdf = sdf2;
-  };
-
   tiger = (import ../development/compilers/tiger) {
     inherit fetchurl stdenv aterm strategoxt;
     sdf = sdf2;
@@ -747,6 +732,13 @@ rec {
   };
 
 
+  ### GAMES
+
+  zoom = (import ../games/zoom) {
+    inherit fetchurl stdenv perl expat xlibs freetype;
+  };
+
+
   ### MISC
 
   uml = (import ../misc/uml) {