- Some recent StrategoXT distributions

- Build ocaml with x11 support 


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

pkgs/development/compilers/ocaml/builder.sh

@@ -1,13 +1,8 @@
 . $stdenv/setup
 
-
 configureFlags="-prefix $out $configureFlags"
 genericBuild
 
-#  make world
-#  make bootstrap
-#  make opt
-#  make opt.opt
-#  make install
 #cd emacs/
-#make EMACSDIR=$out/share/ocaml/emacs
+#mkdir -p $out/share/ocaml/emacs
+#make EMACSDIR=$out/share/ocaml/emacs install

pkgs/development/compilers/ocaml/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, x11}:
 
 stdenv.mkDerivation {
   name = "ocaml-3.08.0";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   };
   configureScript = ./configure;
   dontAddPrefix = "True";
-  configureFlags = "-no-tk";
+  configureFlags = ["-no-tk" "-x11lib" x11];
   makeFlags = ["world" "bootstrap" "opt"];
   checkTarget = ["opt.opt"];
 }

pkgs/development/compilers/strategoxt/default.nix

@@ -1,12 +1,2 @@
-{stdenv, fetchurl, aterm, sdf}:
+import ./strategoxt-0.11.nix
 
-stdenv.mkDerivation {
-  name = "strategoxt-0.10";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = ftp://ftp.stratego-language.org/pub/stratego/StrategoXT/strategoxt-0.10.tar.gz;
-    md5 = "526a28e84248b649bb098b22d227cd26";
-  };
-  inherit aterm sdf;
-  buildInputs = [aterm sdf];
-}

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

@@ -0,0 +1,12 @@
+{stdenv, fetchurl, aterm, sdf}:
+
+stdenv.mkDerivation {
+  name = "strategoxt-0.10";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = ftp://ftp.stratego-language.org/pub/stratego/StrategoXT/strategoxt-0.10.tar.gz;
+    md5 = "526a28e84248b649bb098b22d227cd26";
+  };
+  inherit aterm sdf;
+  buildInputs = [aterm sdf];
+}

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

@@ -0,0 +1,12 @@
+{stdenv, fetchurl, aterm, sdf}:
+
+stdenv.mkDerivation {
+  name = "strategoxt-0.11";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = ftp://ftp.stratego-language.org/pub/stratego/StrategoXT/strategoxt-0.11.tar.gz;
+    md5 = "bf6c38179f6883b01fa3e548c4f45f1c";
+  };
+  inherit aterm sdf;
+  buildInputs = [aterm sdf];
+}

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

@@ -0,0 +1,14 @@
+{stdenv, fetchurl, aterm, sdf}: derivation {
+  name = "strategoxt-0.9.4";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://catamaran.labs.cs.uu.nl/~eelco/stratego/strategoxt-0.9.4/strategoxt-0.9.4.tar.gz;
+    md5 = "4a689e753969ce653b6ea83853890529";
+  };
+  stdenv = stdenv;
+  aterm = aterm;
+  sdf = sdf;
+  tarfile = "true";
+  dir = "strategoxt";
+}

pkgs/system/all-packages-generic.nix

@@ -249,7 +249,7 @@ rec {
   };
 
   ocaml = (import ../development/compilers/ocaml) {
-    inherit fetchurl stdenv ;
+    inherit fetchurl stdenv x11;
   };
 
   strategoxt = (import ../development/compilers/strategoxt) {