From b99065a3d9ce4b5aa280388acc4d2707a707f383 Mon Sep 17 00:00:00 2001 From: Martin Bravenboer Date: Wed, 18 May 2005 16:50:14 +0000 Subject: [PATCH] * Upgraded Stratego/XT to Stratego/XT 0.14 * Clean up of SDF attributes in all-package-generic. There is now a single attribute, called sdf. svn path=/nixpkgs/trunk/; revision=3062 --- .../compilers/strategoxt/builder-0.14.sh | 4 ++ .../compilers/strategoxt/default.nix | 2 +- .../compilers/strategoxt/strategoxt-0.14.nix | 15 ++++++++ .../parsing/{sdf2-bundle => sdf}/builder.sh | 0 .../parsing/{sdf2-bundle => sdf}/default.nix | 0 pkgs/system/all-packages-generic.nix | 37 ++++--------------- pkgs/system/populate-cache.nix | 2 +- .../tools/typesetting/bibtex-tools/builder.sh | 3 +- .../typesetting/bibtex-tools/default.nix | 5 +-- 9 files changed, 31 insertions(+), 37 deletions(-) create mode 100644 pkgs/development/compilers/strategoxt/builder-0.14.sh create mode 100644 pkgs/development/compilers/strategoxt/strategoxt-0.14.nix rename pkgs/development/tools/parsing/{sdf2-bundle => sdf}/builder.sh (100%) rename pkgs/development/tools/parsing/{sdf2-bundle => sdf}/default.nix (100%) diff --git a/pkgs/development/compilers/strategoxt/builder-0.14.sh b/pkgs/development/compilers/strategoxt/builder-0.14.sh new file mode 100644 index 00000000000..5d3427b3a77 --- /dev/null +++ b/pkgs/development/compilers/strategoxt/builder-0.14.sh @@ -0,0 +1,4 @@ +. $stdenv/setup + +configureFlags="--with-aterm=$aterm --with-sdf=$sdf" +genericBuild diff --git a/pkgs/development/compilers/strategoxt/default.nix b/pkgs/development/compilers/strategoxt/default.nix index fe36cd7bf2d..ed713b6b3fd 100644 --- a/pkgs/development/compilers/strategoxt/default.nix +++ b/pkgs/development/compilers/strategoxt/default.nix @@ -1,2 +1,2 @@ -import ./strategoxt-0.13.nix +import ./strategoxt-0.14.nix diff --git a/pkgs/development/compilers/strategoxt/strategoxt-0.14.nix b/pkgs/development/compilers/strategoxt/strategoxt-0.14.nix new file mode 100644 index 00000000000..b992e0507d7 --- /dev/null +++ b/pkgs/development/compilers/strategoxt/strategoxt-0.14.nix @@ -0,0 +1,15 @@ +{stdenv, fetchurl, aterm, sdf, pkgconfig}: + +stdenv.mkDerivation { + + name = "strategoxt-0.14"; + builder = ./builder-0.14.sh; + + src = fetchurl { + url = ftp://ftp.stratego-language.org/pub/stratego/StrategoXT/strategoxt-0.14/strategoxt-0.14.tar.gz; + md5 = "143f01cc27231ccd5eddb695a7b79c69"; + }; + + inherit aterm sdf; + buildInputs = [pkgconfig aterm sdf]; +} diff --git a/pkgs/development/tools/parsing/sdf2-bundle/builder.sh b/pkgs/development/tools/parsing/sdf/builder.sh similarity index 100% rename from pkgs/development/tools/parsing/sdf2-bundle/builder.sh rename to pkgs/development/tools/parsing/sdf/builder.sh diff --git a/pkgs/development/tools/parsing/sdf2-bundle/default.nix b/pkgs/development/tools/parsing/sdf/default.nix similarity index 100% rename from pkgs/development/tools/parsing/sdf2-bundle/default.nix rename to pkgs/development/tools/parsing/sdf/default.nix diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index cafe75d0977..d7b3c9bc752 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -429,24 +429,17 @@ rec { }; strategoxt = (import ../development/compilers/strategoxt) { - inherit fetchurl stdenv aterm; - sdf = sdf_23; - }; - - strategoxt_012 = (import ../development/compilers/strategoxt/strategoxt-0.12.nix) { - inherit fetchurl stdenv aterm; - sdf = sdf_22; + inherit fetchurl pkgconfig stdenv aterm sdf; }; bibtextools = (import ../tools/typesetting/bibtex-tools) { - inherit fetchurl stdenv aterm strategoxt hevea; - sdf = sdf_23; + inherit fetchurl stdenv aterm strategoxt hevea sdf; }; -# xdoc = (import ../development/tools/documentation/xdoc) { -# inherit fetchurl stdenv aterm strategoxt subversion graphviz; -# sdf = sdf_23; -# }; + # xdoc = (import ../development/tools/documentation/xdoc) { + # inherit fetchurl stdenv aterm strategoxt subversion graphviz; + # sdf = sdf_23; + # }; #tiger = (import ../development/compilers/tiger) { # inherit fetchurl stdenv aterm strategoxt; @@ -560,23 +553,7 @@ rec { inherit fetchurl stdenv; }; - sdf_23 = { - errorsupport = sdf2_bundle; - toolbuslib = sdf2_bundle; - ptsupport = sdf2_bundle; - asfsupport = sdf2_bundle; - sdfsupport = sdf2_bundle; - sglr = sdf2_bundle; - ascsupport = sdf2_bundle; - pgen = sdf2_bundle; - asflibrary = sdf2_bundle; - }; - - sdf_22 = (import ../development/tools/parsing/sdf2/bundle-2.2.nix) { - inherit fetchurl stdenv getopt aterm; - }; - - sdf2_bundle = (import ../development/tools/parsing/sdf2-bundle) { + sdf = (import ../development/tools/parsing/sdf) { inherit fetchurl stdenv aterm getopt; }; diff --git a/pkgs/system/populate-cache.nix b/pkgs/system/populate-cache.nix index debe097cfa9..2f8bb2c2086 100644 --- a/pkgs/system/populate-cache.nix +++ b/pkgs/system/populate-cache.nix @@ -39,7 +39,7 @@ let { flexnew gccWrapped aterm - sdf2_bundle + sdf strategoxt # ghc # helium diff --git a/pkgs/tools/typesetting/bibtex-tools/builder.sh b/pkgs/tools/typesetting/bibtex-tools/builder.sh index de8bbaee28f..fb0e1f526ee 100644 --- a/pkgs/tools/typesetting/bibtex-tools/builder.sh +++ b/pkgs/tools/typesetting/bibtex-tools/builder.sh @@ -1,5 +1,4 @@ . $stdenv/setup -configureFlags="--with-aterm=$aterm --with-sglr=$sglr --with-pgen=$pgen - --with-pt-support=$ptsupport --with-asf-library=$asflibrary --with-strategoxt=$strategoxt --with-hevea=$hevea --with-latex=/usr" +configureFlags="--with-aterm=$aterm --with-sdf=$sdf --with-strategoxt=$strategoxt --with-hevea=$hevea --with-latex=/usr" genericBuild diff --git a/pkgs/tools/typesetting/bibtex-tools/default.nix b/pkgs/tools/typesetting/bibtex-tools/default.nix index 79180c42923..b60c25db543 100644 --- a/pkgs/tools/typesetting/bibtex-tools/default.nix +++ b/pkgs/tools/typesetting/bibtex-tools/default.nix @@ -7,7 +7,6 @@ stdenv.mkDerivation { url = http://www.cs.uu.nl/~visser/ftp/bibtex-tools-0.1.tar.gz; md5 = "8e3ce277100af6fceec23f5bed4aa9e8"; }; - inherit aterm hevea strategoxt; - inherit (sdf) sglr pgen ptsupport asflibrary; - buildInputs = [aterm sdf.pgen strategoxt hevea]; + inherit aterm hevea sdf strategoxt; + buildInputs = [aterm sdf strategoxt hevea]; }