public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Updated WebDSL.

Browse Source 
* Made Stratego/XT 0.18 the default.

svn path=/nixpkgs/trunk/; revision=23994
This commit is contained in:
Eelco Dolstra 2010-09-30 10:49:02 +00:00
parent 3cc7d2ed7c
commit 3cae924440
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/compilers/webdsl/default.nix
View File

@ -1,15 +1,15 @@
{ stdenv, fetchurl, pkgconfig, strategoPackages }: { stdenv, fetchurl, pkgconfig, strategoPackages }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "webdsl-9.7pre3056"; name = "webdsl-9.7pre4168";
src = fetchurl { src = fetchurl {
url = "http://hydra.nixos.org/build/71896/download/1/webdsl-9.7pre3056.tar.gz"; url = "http://hydra.nixos.org/build/654196/download/1/${name}.tar.gz";
sha256 = "3446b7e9dac27a9fd35541a57e961be5b74f2f9e3fb02dc14c86f945b47df045"; sha256 = "08bec3ba02254ec7474ce70206b7be4390fe07456cfc57d927d96a21dd6dcb33";
}; };
buildInputs = [ buildInputs =
pkgconfig strategoPackages.aterm strategoPackages.sdf [ pkgconfig strategoPackages.aterm strategoPackages.sdf
strategoPackages.strategoxt strategoPackages.javafront strategoPackages.strategoxt strategoPackages.javafront
]; ];

6
pkgs/top-level/all-packages.nix
View File

@ -1929,7 +1929,7 @@ let
stalin = callPackage ../development/compilers/stalin { }; stalin = callPackage ../development/compilers/stalin { };
strategoPackages = strategoPackages017; strategoPackages = strategoPackages018;
strategoPackages016 = callPackage ../development/compilers/strategoxt/0.16.nix { strategoPackages016 = callPackage ../development/compilers/strategoxt/0.16.nix {
stdenv = overrideInStdenv stdenv [gnumake380]; stdenv = overrideInStdenv stdenv [gnumake380];
@ -2226,8 +2226,10 @@ let
antDarwin = apacheAnt.override rec { jdk = openjdkDarwin; name = "ant-" + jdk.name; } ; antDarwin = apacheAnt.override rec { jdk = openjdkDarwin; name = "ant-" + jdk.name; } ;
ant = apacheAnt; ant = apacheAnt;
apacheAnt = callPackage ../development/tools/build-managers/apache-ant { apacheAnt = callPackage ../development/tools/build-managers/apache-ant {
name = "ant-" + jdk.name; }; name = "ant-" + jdk.name;
};
apacheAnt14 = callPackage ../development/tools/build-managers/apache-ant { apacheAnt14 = callPackage ../development/tools/build-managers/apache-ant {
jdk = j2sdk14x; jdk = j2sdk14x;