Moved the sdf2 distribution 2.0 packages to a separate Nix attribute set

svn path=/nixpkgs/trunk/; revision=1021
This commit is contained in:
Martin Bravenboer 2004-05-13 18:16:56 +00:00
parent fec8c962ab
commit 1d7474bae9
4 changed files with 41 additions and 48 deletions

View File

@ -0,0 +1,32 @@
{stdenv, fetchurl, getopt, aterm}:
rec {
toolbuslib = (import ../toolbuslib/toolbuslib-0.5.1.nix) {
inherit fetchurl stdenv aterm;
};
ptsupport = (import ../pt-support/pt-support-1.0.nix) {
inherit fetchurl stdenv aterm toolbuslib;
};
asfsupport = (import ../asf-support/asf-support-1.2.nix) {
inherit fetchurl stdenv aterm ptsupport;
};
sdfsupport = (import ../sdf-support/sdf-support-2.0.nix) {
inherit fetchurl stdenv aterm toolbuslib ptsupport;
};
sglr = (import ../sglr/sglr-3.10.2.nix) {
inherit fetchurl stdenv aterm toolbuslib ptsupport;
};
ascsupport = (import ../asc-support/asc-support-1.8.nix) {
inherit fetchurl stdenv aterm toolbuslib ptsupport asfsupport;
};
pgen = (import ../pgen/pgen-2.0.nix) {
inherit fetchurl stdenv getopt aterm toolbuslib ptsupport sdfsupport asfsupport ascsupport sglr;
};
}

View File

@ -230,17 +230,17 @@ rec {
strategoxt = (import ../development/compilers/strategoxt) { strategoxt = (import ../development/compilers/strategoxt) {
inherit fetchurl stdenv aterm; inherit fetchurl stdenv aterm;
sdf = sdf2; sdf = sdf2_bundle;
}; };
strategoxtsvn = (import ../development/compilers/strategoxt/trunk.nix) { strategoxtsvn = (import ../development/compilers/strategoxt/trunk.nix) {
inherit fetchsvn stdenv autoconf automake libtool which aterm; inherit fetchsvn stdenv autoconf automake libtool which aterm;
sdf = sdf2; sdf = sdf2_bundle;
}; };
tiger = (import ../development/compilers/tiger) { tiger = (import ../development/compilers/tiger) {
inherit fetchurl stdenv aterm strategoxt; inherit fetchurl stdenv aterm strategoxt;
sdf = sdf2; sdf = sdf2_bundle;
}; };
ghcboot = (import ../development/compilers/ghc/boot.nix) { ghcboot = (import ../development/compilers/ghc/boot.nix) {
@ -287,57 +287,18 @@ rec {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
sdf = (import ../development/tools/parsing/sdf2/bundle-2.1.nix) { sdf_21 = (import ../development/tools/parsing/sdf2/bundle-2.1.nix) {
inherit fetchurl stdenv getopt aterm; inherit fetchurl stdenv getopt aterm;
}; };
sdf2 = (import ../development/tools/parsing/sdf2) { sdf_20 = (import ../development/tools/parsing/sdf2/bundle-2.0.nix) {
inherit fetchurl stdenv getopt aterm;
};
sdf2_bundle = (import ../development/tools/parsing/sdf2-bundle) {
inherit fetchurl stdenv aterm getopt; inherit fetchurl stdenv aterm getopt;
}; };
toolbuslib_0_5_1 = (import ../development/tools/parsing/toolbuslib/toolbuslib-0.5.1.nix) {
inherit fetchurl stdenv aterm;
};
ptsupport_1_0 = (import ../development/tools/parsing/pt-support/pt-support-1.0.nix) {
inherit fetchurl stdenv aterm;
toolbuslib = toolbuslib_0_5_1;
};
sdfsupport_2_0 = (import ../development/tools/parsing/sdf-support/sdf-support-2.0.nix) {
inherit fetchurl stdenv aterm;
toolbuslib = toolbuslib_0_5_1;
ptsupport = ptsupport_1_0;
};
sglr_3_10_2 = (import ../development/tools/parsing/sglr/sglr-3.10.2.nix) {
inherit fetchurl stdenv aterm;
toolbuslib = toolbuslib_0_5_1;
ptsupport = ptsupport_1_0;
};
asfsupport_1_2 = (import ../development/tools/parsing/asf-support/asf-support-1.2.nix) {
inherit fetchurl stdenv aterm;
ptsupport = ptsupport_1_0;
};
ascsupport_1_8 = (import ../development/tools/parsing/asc-support/asc-support-1.8.nix) {
inherit fetchurl stdenv aterm;
toolbuslib = toolbuslib_0_5_1;
ptsupport = ptsupport_1_0;
asfsupport = asfsupport_1_2;
};
pgen_2_0 = (import ../development/tools/parsing/pgen/pgen-2.0.nix) {
inherit fetchurl stdenv getopt aterm;
toolbuslib = toolbuslib_0_5_1;
ptsupport = ptsupport_1_0;
asfsupport = asfsupport_1_2;
ascsupport = ascsupport_1_8;
sdfsupport = sdfsupport_2_0;
sglr = sglr_3_10_2;
};
expat = (import ../development/libraries/expat) { expat = (import ../development/libraries/expat) {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };