From bbf6b461786498b2a1f9e846e6e64f2127754cc2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 19 Mar 2009 16:04:32 +0000
Subject: [PATCH] * Updated WebDSL.

svn path=/nixpkgs/trunk/; revision=14614
---
 pkgs/development/compilers/webdsl/builder.sh  |  8 -------
 pkgs/development/compilers/webdsl/default.nix | 22 ++++++++++++-------
 pkgs/top-level/all-packages.nix               |  3 +--
 3 files changed, 15 insertions(+), 18 deletions(-)
 delete mode 100644 pkgs/development/compilers/webdsl/builder.sh

diff --git a/pkgs/development/compilers/webdsl/builder.sh b/pkgs/development/compilers/webdsl/builder.sh
deleted file mode 100644
index d77094a91b0..00000000000
--- a/pkgs/development/compilers/webdsl/builder.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-source $stdenv/setup
-
-configureFlags="--with-aterm=$aterm --with-sdf=$sdf --with-strategoxt=$strategoxt"
-genericBuild
-
-# Replace /bin/bash in WebDSL script (maybe there is a better solution?)
-
-sed -i -e "s|#!/bin/bash|#!/bin/sh|" $out/bin/webdsl
diff --git a/pkgs/development/compilers/webdsl/default.nix b/pkgs/development/compilers/webdsl/default.nix
index e99456b5d2f..096a7164f9e 100644
--- a/pkgs/development/compilers/webdsl/default.nix
+++ b/pkgs/development/compilers/webdsl/default.nix
@@ -1,14 +1,20 @@
-{stdenv, fetchurl, aterm, sdf, strategoxt, pkgconfig, javafront}:
+{stdenv, fetchurl, pkgconfig, strategoPackages}:
 
-stdenv.mkDerivation {
-  name = "webdsl-8.2pre1006";
-  builder = ./builder.sh;
+stdenv.mkDerivation rec {
+  name = "webdsl-8.8pre25482548";
 
   src = fetchurl {
-    url = http://buildfarm.st.ewi.tudelft.nl/releases/strategoxt/webdsl-8.2pre1006-c8h623yn/webdsl-8.2.tar.gz;
-    md5 = "07c2471c961acc6467c55594e49da7c1";
+    url = "http://releases.strategoxt.org/webdsl/${name}-chm695sm/webdsl-8.8pre2548.tar.gz";
+    sha256 = "cc4bcc9ef98d35e96b9874d48e061c5bc18cb26300a031becc227a1cd5a1deac";
   };
 
-  inherit aterm sdf strategoxt javafront;
-  buildInputs = [pkgconfig aterm sdf strategoxt javafront];
+  buildInputs = [
+    pkgconfig strategoPackages.aterm strategoPackages.sdf
+    strategoPackages.strategoxt strategoPackages.javafront
+  ];
+
+  meta = {
+    homepage = http://webdsl.org/;
+    description = "A domain-specific language for developing dynamic web applications with a rich data model";
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 32e10969832..49e85b8551e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1983,8 +1983,7 @@ let
   };
 
   webdsl = import ../development/compilers/webdsl {
-    inherit stdenv fetchurl pkgconfig;
-    strategoPackages = strategoPackages017;
+    inherit stdenv fetchurl pkgconfig strategoPackages;
   };
 
   win32hello = import ../development/compilers/visual-c++/test {