From 3cae924440957b055093b2e024b9b27c00065903 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 30 Sep 2010 10:49:02 +0000
Subject: [PATCH] * Updated WebDSL. * Made Stratego/XT 0.18 the default.

svn path=/nixpkgs/trunk/; revision=23994
---
 pkgs/development/compilers/webdsl/default.nix | 16 ++++++++--------
 pkgs/top-level/all-packages.nix               |  8 +++++---
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/compilers/webdsl/default.nix b/pkgs/development/compilers/webdsl/default.nix
index 6c878717220e..ba667e17c511 100644
--- a/pkgs/development/compilers/webdsl/default.nix
+++ b/pkgs/development/compilers/webdsl/default.nix
@@ -1,17 +1,17 @@
-{stdenv, fetchurl, pkgconfig, strategoPackages}:
+{ stdenv, fetchurl, pkgconfig, strategoPackages }:
 
 stdenv.mkDerivation rec {
-  name = "webdsl-9.7pre3056";
+  name = "webdsl-9.7pre4168";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/71896/download/1/webdsl-9.7pre3056.tar.gz";
-    sha256 = "3446b7e9dac27a9fd35541a57e961be5b74f2f9e3fb02dc14c86f945b47df045";
+    url = "http://hydra.nixos.org/build/654196/download/1/${name}.tar.gz";
+    sha256 = "08bec3ba02254ec7474ce70206b7be4390fe07456cfc57d927d96a21dd6dcb33";
   };
 
-  buildInputs = [
-    pkgconfig strategoPackages.aterm strategoPackages.sdf
-    strategoPackages.strategoxt strategoPackages.javafront
-  ];
+  buildInputs =
+    [ pkgconfig strategoPackages.aterm strategoPackages.sdf
+      strategoPackages.strategoxt strategoPackages.javafront
+    ];
 
   meta = {
     homepage = http://webdsl.org/;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4c2810c6d315..44077caee26c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1929,7 +1929,7 @@ let
 
   stalin = callPackage ../development/compilers/stalin { };
 
-  strategoPackages = strategoPackages017;
+  strategoPackages = strategoPackages018;
 
   strategoPackages016 = callPackage ../development/compilers/strategoxt/0.16.nix {
     stdenv = overrideInStdenv stdenv [gnumake380];
@@ -2223,11 +2223,13 @@ let
 
   antlr3 = callPackage ../development/tools/parsing/antlr { };
 
-  antDarwin = apacheAnt.override rec { jdk = openjdkDarwin ; name = "ant-" + jdk.name ; } ;
+  antDarwin = apacheAnt.override rec { jdk = openjdkDarwin; name = "ant-" + jdk.name; } ;
 
   ant = apacheAnt;
+  
   apacheAnt = callPackage ../development/tools/build-managers/apache-ant {
-    name = "ant-" + jdk.name;  };
+    name = "ant-" + jdk.name;
+  };
 
   apacheAnt14 = callPackage ../development/tools/build-managers/apache-ant {
     jdk = j2sdk14x;