From 09f1f291fa5ff853d6af02d675297fb2166a48fb Mon Sep 17 00:00:00 2001
From: Martin Bravenboer <martin.bravenboer@logicblox.com>
Date: Wed, 22 Sep 2004 19:48:36 +0000
Subject: [PATCH] Added strategoxt-unstable. Hope to keep this one up-to-date.

svn path=/nixpkgs/trunk/; revision=1492
---
 .../compilers/strategoxt/dailydist.nix          | 13 -------------
 .../compilers/strategoxt/new-builder.sh         |  4 ----
 .../compilers/strategoxt/unstable.nix           | 17 +++++++++++++++++
 pkgs/system/all-packages-generic.nix            |  5 +++++
 pkgs/system/populate-cache.nix                  |  1 +
 5 files changed, 23 insertions(+), 17 deletions(-)
 delete mode 100644 pkgs/development/compilers/strategoxt/dailydist.nix
 delete mode 100644 pkgs/development/compilers/strategoxt/new-builder.sh
 create mode 100644 pkgs/development/compilers/strategoxt/unstable.nix

diff --git a/pkgs/development/compilers/strategoxt/dailydist.nix b/pkgs/development/compilers/strategoxt/dailydist.nix
deleted file mode 100644
index ba6f682684d..00000000000
--- a/pkgs/development/compilers/strategoxt/dailydist.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{stdenv, fetchurl, aterm, sdf}:
-
-stdenv.mkDerivation {
-  name = "strategoxt-0.11pre-6529";
-  builder = ./new-builder.sh;
-  src = fetchurl {
-    url = http://losser.st-lab.cs.uu.nl/~mbravenb/dailydist/strategoxt/src/strategoxt-0.11pre-6529.tar.gz;
-    md5 = "e14a548c5b871d1d99e2fcf7dc1c7754";
-  };
-  inherit aterm;
-  inherit (sdf) ptsupport asflibrary pgen sglr;
-  buildInputs = [aterm sdf.ptsupport sdf.sdfsupport sdf.pgen sdf.sglr];
-}
diff --git a/pkgs/development/compilers/strategoxt/new-builder.sh b/pkgs/development/compilers/strategoxt/new-builder.sh
deleted file mode 100644
index 1b3647a0f1d..00000000000
--- a/pkgs/development/compilers/strategoxt/new-builder.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-. $stdenv/setup
-
-configureFlags="--with-aterm=$aterm --with-asf-library=$asflibrary --with-pt-support=$ptsupport --with-pgen=$pgen --with-sglr=$sglr"
-genericBuild
diff --git a/pkgs/development/compilers/strategoxt/unstable.nix b/pkgs/development/compilers/strategoxt/unstable.nix
new file mode 100644
index 00000000000..99550a353ad
--- /dev/null
+++ b/pkgs/development/compilers/strategoxt/unstable.nix
@@ -0,0 +1,17 @@
+{stdenv, fetchurl, aterm, sdf}:
+
+stdenv.mkDerivation {
+  name = "strategoxt-unstable-7462";
+
+  builder = ./builder.sh;
+
+  src = fetchurl {
+    url = http://catamaran.labs.cs.uu.nl/dist/stratego/strategoxt-0.12pre7462/strategoxt-0.12pre7462.tar.gz;
+    md5 = "c86495e8eb1d91421a8e20a65afded3b";
+  };
+
+  inherit aterm;
+  inherit (sdf) sglr pgen ptsupport asflibrary;
+
+  buildInputs = [aterm sdf.pgen];
+}
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index f114789c6bc..5b5a01adf73 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -363,6 +363,11 @@ rec {
     sdf = sdf_22;
   };
 
+  strategoxt_unstable = (import ../development/compilers/strategoxt/unstable.nix) {
+    inherit fetchurl stdenv aterm;
+    sdf = sdf_22;
+  };
+
   bibtextools = (import ../tools/typesetting/bibtex-tools) {
     inherit fetchurl stdenv aterm strategoxt hevea;
     sdf = sdf_22;
diff --git a/pkgs/system/populate-cache.nix b/pkgs/system/populate-cache.nix
index b37755ace9e..7bf4bdf8650 100644
--- a/pkgs/system/populate-cache.nix
+++ b/pkgs/system/populate-cache.nix
@@ -32,6 +32,7 @@ let {
     gccWrapped
     aterm
     strategoxt
+    strategoxt_unstable
     xdoc
 #    ghc
 #    helium