From 1c9690ab2fb910259b5975a81a14261b5548b448 Mon Sep 17 00:00:00 2001 From: Martin Bravenboer Date: Thu, 19 May 2005 11:23:56 +0000 Subject: [PATCH] * pkgs/development/tools/parsing/sdf/default.nix: default.nix now imports Nix expression of specific version. * pkgs/development/tools/parsing/sdf/sdf2-bundle-2.2.nix: added previous version of sdf2-bundle. * pkgs/development/tools/parsing/sdf2: obsolete. * pkgs/development/compilers/strategoxt/strategoxt-0.12.nix: use sdf2-bundle instead of attribute set for the individual packages. * svn path=/nixpkgs/trunk/; revision=3081 --- .../compilers/strategoxt/builder-0.14.sh | 4 -- .../compilers/strategoxt/builder.sh | 2 +- .../compilers/strategoxt/strategoxt-0.12.nix | 8 +--- .../compilers/strategoxt/strategoxt-0.14.nix | 2 +- .../development/tools/parsing/sdf/default.nix | 15 +------ .../tools/parsing/sdf/sdf2-bundle-2.2.nix | 14 +++++++ .../tools/parsing/sdf/sdf2-bundle-2.3.nix | 14 +++++++ .../tools/parsing/sdf2/bundle-2.0.nix | 32 --------------- .../tools/parsing/sdf2/bundle-2.1.nix | 40 ------------------- .../tools/parsing/sdf2/bundle-2.2.nix | 40 ------------------- 10 files changed, 33 insertions(+), 138 deletions(-) delete mode 100644 pkgs/development/compilers/strategoxt/builder-0.14.sh create mode 100644 pkgs/development/tools/parsing/sdf/sdf2-bundle-2.2.nix create mode 100644 pkgs/development/tools/parsing/sdf/sdf2-bundle-2.3.nix delete mode 100644 pkgs/development/tools/parsing/sdf2/bundle-2.0.nix delete mode 100644 pkgs/development/tools/parsing/sdf2/bundle-2.1.nix delete mode 100644 pkgs/development/tools/parsing/sdf2/bundle-2.2.nix diff --git a/pkgs/development/compilers/strategoxt/builder-0.14.sh b/pkgs/development/compilers/strategoxt/builder-0.14.sh deleted file mode 100644 index 5d3427b3a77..00000000000 --- a/pkgs/development/compilers/strategoxt/builder-0.14.sh +++ /dev/null @@ -1,4 +0,0 @@ -. $stdenv/setup - -configureFlags="--with-aterm=$aterm --with-sdf=$sdf" -genericBuild diff --git a/pkgs/development/compilers/strategoxt/builder.sh b/pkgs/development/compilers/strategoxt/builder.sh index 9cc20687197..5d3427b3a77 100644 --- a/pkgs/development/compilers/strategoxt/builder.sh +++ b/pkgs/development/compilers/strategoxt/builder.sh @@ -1,4 +1,4 @@ . $stdenv/setup -configureFlags="--with-aterm=$aterm --with-sglr=$sglr --with-pgen=$pgen --with-pt-support=$ptsupport --with-asf-library=$asflibrary" +configureFlags="--with-aterm=$aterm --with-sdf=$sdf" genericBuild diff --git a/pkgs/development/compilers/strategoxt/strategoxt-0.12.nix b/pkgs/development/compilers/strategoxt/strategoxt-0.12.nix index 350b8909d16..2672fca17d8 100644 --- a/pkgs/development/compilers/strategoxt/strategoxt-0.12.nix +++ b/pkgs/development/compilers/strategoxt/strategoxt-0.12.nix @@ -1,9 +1,7 @@ {stdenv, fetchurl, aterm, sdf}: stdenv.mkDerivation { - name = "strategoxt-0.12"; - builder = ./builder.sh; src = fetchurl { @@ -11,8 +9,6 @@ stdenv.mkDerivation { md5 = "bc2b14d9b53a07fc0047c16f2c6edf0c"; }; - inherit aterm; - inherit (sdf) sglr pgen ptsupport asflibrary; - - buildInputs = [aterm sdf.pgen]; + inherit aterm sdf; + buildInputs = [aterm sdf]; } diff --git a/pkgs/development/compilers/strategoxt/strategoxt-0.14.nix b/pkgs/development/compilers/strategoxt/strategoxt-0.14.nix index b992e0507d7..003a9ece100 100644 --- a/pkgs/development/compilers/strategoxt/strategoxt-0.14.nix +++ b/pkgs/development/compilers/strategoxt/strategoxt-0.14.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "strategoxt-0.14"; - builder = ./builder-0.14.sh; + builder = ./builder.sh; src = fetchurl { url = ftp://ftp.stratego-language.org/pub/stratego/StrategoXT/strategoxt-0.14/strategoxt-0.14.tar.gz; diff --git a/pkgs/development/tools/parsing/sdf/default.nix b/pkgs/development/tools/parsing/sdf/default.nix index f33c50a394a..f884830711a 100644 --- a/pkgs/development/tools/parsing/sdf/default.nix +++ b/pkgs/development/tools/parsing/sdf/default.nix @@ -1,14 +1 @@ -{stdenv, fetchurl, aterm, getopt}: - -stdenv.mkDerivation { - name = "sdf2-bundle-2.3"; - builder = ./builder.sh; - src = fetchurl { - url = ftp://ftp.stratego-language.org/pub/stratego/sdf2/sdf2-bundle-2.3/sdf2-bundle-2.3.tar.gz; - md5 = "79e305c2bdb2a5627719c890fb050bfa"; - }; - - buildInputs = [aterm]; - propagatedBuildInputs = [getopt]; - inherit aterm; -} +import sdf2-bundle-2.3.nix \ No newline at end of file diff --git a/pkgs/development/tools/parsing/sdf/sdf2-bundle-2.2.nix b/pkgs/development/tools/parsing/sdf/sdf2-bundle-2.2.nix new file mode 100644 index 00000000000..46dcefd0eaa --- /dev/null +++ b/pkgs/development/tools/parsing/sdf/sdf2-bundle-2.2.nix @@ -0,0 +1,14 @@ +{stdenv, fetchurl, aterm, getopt}: + +stdenv.mkDerivation { + name = "sdf2-bundle-2.2"; + builder = ./builder.sh; + src = fetchurl { + url = ftp://ftp.stratego-language.org/pub/stratego/sdf2/sdf2-bundle-2.2.tar.gz; + md5 = "995a1739134615b60b1fe796d6c9d0e6"; + }; + + buildInputs = [aterm]; + propagatedBuildInputs = [getopt]; + inherit aterm; +} diff --git a/pkgs/development/tools/parsing/sdf/sdf2-bundle-2.3.nix b/pkgs/development/tools/parsing/sdf/sdf2-bundle-2.3.nix new file mode 100644 index 00000000000..f33c50a394a --- /dev/null +++ b/pkgs/development/tools/parsing/sdf/sdf2-bundle-2.3.nix @@ -0,0 +1,14 @@ +{stdenv, fetchurl, aterm, getopt}: + +stdenv.mkDerivation { + name = "sdf2-bundle-2.3"; + builder = ./builder.sh; + src = fetchurl { + url = ftp://ftp.stratego-language.org/pub/stratego/sdf2/sdf2-bundle-2.3/sdf2-bundle-2.3.tar.gz; + md5 = "79e305c2bdb2a5627719c890fb050bfa"; + }; + + buildInputs = [aterm]; + propagatedBuildInputs = [getopt]; + inherit aterm; +} diff --git a/pkgs/development/tools/parsing/sdf2/bundle-2.0.nix b/pkgs/development/tools/parsing/sdf2/bundle-2.0.nix deleted file mode 100644 index c718d072790..00000000000 --- a/pkgs/development/tools/parsing/sdf2/bundle-2.0.nix +++ /dev/null @@ -1,32 +0,0 @@ -{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; - }; -} diff --git a/pkgs/development/tools/parsing/sdf2/bundle-2.1.nix b/pkgs/development/tools/parsing/sdf2/bundle-2.1.nix deleted file mode 100644 index f53665d7d08..00000000000 --- a/pkgs/development/tools/parsing/sdf2/bundle-2.1.nix +++ /dev/null @@ -1,40 +0,0 @@ -{stdenv, fetchurl, getopt, aterm}: - -rec { - - errorsupport = (import ../error-support/error-support-0.1.nix) { - inherit fetchurl stdenv aterm toolbuslib; - }; - - toolbuslib = (import ../toolbuslib/toolbuslib-0.6.nix) { - inherit fetchurl stdenv aterm; - }; - - ptsupport = (import ../pt-support/pt-support-1.1.nix) { - inherit fetchurl stdenv aterm toolbuslib errorsupport; - }; - - asfsupport = (import ../asf-support/asf-support-1.3.nix) { - inherit fetchurl stdenv aterm ptsupport errorsupport; - }; - - sdfsupport = (import ../sdf-support/sdf-support-2.1.nix) { - inherit fetchurl stdenv aterm toolbuslib ptsupport errorsupport; - }; - - sglr = (import ../sglr/sglr-3.11.nix) { - inherit fetchurl stdenv aterm toolbuslib ptsupport errorsupport; - }; - - ascsupport = (import ../asc-support/asc-support-1.9.nix) { - inherit fetchurl stdenv aterm toolbuslib ptsupport asfsupport errorsupport sglr; - }; - - pgen = (import ../pgen/pgen-2.1.nix) { - inherit fetchurl stdenv getopt aterm toolbuslib ptsupport sdfsupport asfsupport ascsupport errorsupport sglr; - }; - - asflibrary = (import ../asf-library/asf-library-1.0.nix) { - inherit fetchurl stdenv; - }; -} diff --git a/pkgs/development/tools/parsing/sdf2/bundle-2.2.nix b/pkgs/development/tools/parsing/sdf2/bundle-2.2.nix deleted file mode 100644 index 29ac033a4e5..00000000000 --- a/pkgs/development/tools/parsing/sdf2/bundle-2.2.nix +++ /dev/null @@ -1,40 +0,0 @@ -{stdenv, fetchurl, getopt, aterm}: - -rec { - - errorsupport = (import ../error-support/error-support-0.1.1.nix) { - inherit fetchurl stdenv aterm toolbuslib; - }; - - toolbuslib = (import ../toolbuslib/toolbuslib-0.6.nix) { - inherit fetchurl stdenv aterm; - }; - - ptsupport = (import ../pt-support/pt-support-1.2.nix) { - inherit fetchurl stdenv aterm toolbuslib errorsupport; - }; - - asfsupport = (import ../asf-support/asf-support-1.4.nix) { - inherit fetchurl stdenv aterm ptsupport errorsupport; - }; - - sdfsupport = (import ../sdf-support/sdf-support-2.1.1.nix) { - inherit fetchurl stdenv aterm toolbuslib ptsupport errorsupport; - }; - - sglr = (import ../sglr/sglr-3.12.nix) { - inherit fetchurl stdenv aterm toolbuslib ptsupport errorsupport; - }; - - ascsupport = (import ../asc-support/asc-support-2.0.nix) { - inherit fetchurl stdenv aterm toolbuslib ptsupport asfsupport errorsupport sglr; - }; - - pgen = (import ../pgen/pgen-2.2.nix) { - inherit fetchurl stdenv getopt aterm toolbuslib ptsupport sdfsupport asfsupport ascsupport errorsupport sglr; - }; - - asflibrary = (import ../asf-library/asf-library-1.1.nix) { - inherit fetchurl stdenv; - }; -}