diff options
| author | Martin Bravenboer <martin.bravenboer@logicblox.com> | 2005-05-19 11:23:56 +0000 |
|---|---|---|
| committer | Martin Bravenboer <martin.bravenboer@logicblox.com> | 2005-05-19 11:23:56 +0000 |
| commit | 1c9690ab2fb910259b5975a81a14261b5548b448 (patch) | |
| tree | 4ea625392a6b11511e3ce3c632254d32f0b7f199 /pkgs/development/compilers | |
| parent | 2176134a07771e583090648cf38670d9ade9be7c (diff) | |
| download | nixlib-1c9690ab2fb910259b5975a81a14261b5548b448.tar nixlib-1c9690ab2fb910259b5975a81a14261b5548b448.tar.gz nixlib-1c9690ab2fb910259b5975a81a14261b5548b448.tar.bz2 nixlib-1c9690ab2fb910259b5975a81a14261b5548b448.tar.lz nixlib-1c9690ab2fb910259b5975a81a14261b5548b448.tar.xz nixlib-1c9690ab2fb910259b5975a81a14261b5548b448.tar.zst nixlib-1c9690ab2fb910259b5975a81a14261b5548b448.zip | |
* 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
Diffstat (limited to 'pkgs/development/compilers')
4 files changed, 4 insertions, 12 deletions
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 5d3427b3a77f..000000000000 --- 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 9cc206871975..5d3427b3a77f 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 350b8909d16e..2672fca17d82 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 b992e0507d7b..003a9ece1004 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; |