From 399ee394d494742b9726e5165d43cd24e009264a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 19 Mar 2009 12:21:28 +0000 Subject: [PATCH] * Cleaned up some Stratego-related stuff. svn path=/nixpkgs/trunk/; revision=14603 --- .../{strategoxt-0.16.nix => 0.16.nix} | 0 .../{strategoxt-0.17.nix => 0.17.nix} | 0 .../compilers/strategoxt/default.nix | 2 -- .../compilers/strategoxt/strategoxt-0.14.nix | 15 ------------- .../compilers/strategoxt/utils/default.nix | 2 -- .../utils/strategoxt-utils-0.14.nix | 12 ---------- .../compilers/transformers/builder.sh | 4 ---- .../compilers/transformers/default.nix | 2 -- .../transformers/transformers-0.4.nix | 14 ------------ pkgs/top-level/all-packages.nix | 22 +++++-------------- 10 files changed, 5 insertions(+), 68 deletions(-) rename pkgs/development/compilers/strategoxt/{strategoxt-0.16.nix => 0.16.nix} (100%) rename pkgs/development/compilers/strategoxt/{strategoxt-0.17.nix => 0.17.nix} (100%) delete mode 100644 pkgs/development/compilers/strategoxt/default.nix delete mode 100644 pkgs/development/compilers/strategoxt/strategoxt-0.14.nix delete mode 100644 pkgs/development/compilers/strategoxt/utils/default.nix delete mode 100644 pkgs/development/compilers/strategoxt/utils/strategoxt-utils-0.14.nix delete mode 100644 pkgs/development/compilers/transformers/builder.sh delete mode 100644 pkgs/development/compilers/transformers/default.nix delete mode 100644 pkgs/development/compilers/transformers/transformers-0.4.nix diff --git a/pkgs/development/compilers/strategoxt/strategoxt-0.16.nix b/pkgs/development/compilers/strategoxt/0.16.nix similarity index 100% rename from pkgs/development/compilers/strategoxt/strategoxt-0.16.nix rename to pkgs/development/compilers/strategoxt/0.16.nix diff --git a/pkgs/development/compilers/strategoxt/strategoxt-0.17.nix b/pkgs/development/compilers/strategoxt/0.17.nix similarity index 100% rename from pkgs/development/compilers/strategoxt/strategoxt-0.17.nix rename to pkgs/development/compilers/strategoxt/0.17.nix diff --git a/pkgs/development/compilers/strategoxt/default.nix b/pkgs/development/compilers/strategoxt/default.nix deleted file mode 100644 index a607d30da6d..00000000000 --- a/pkgs/development/compilers/strategoxt/default.nix +++ /dev/null @@ -1,2 +0,0 @@ -import ./strategoxt-0.16.nix - diff --git a/pkgs/development/compilers/strategoxt/strategoxt-0.14.nix b/pkgs/development/compilers/strategoxt/strategoxt-0.14.nix deleted file mode 100644 index 003a9ece100..00000000000 --- a/pkgs/development/compilers/strategoxt/strategoxt-0.14.nix +++ /dev/null @@ -1,15 +0,0 @@ -{stdenv, fetchurl, aterm, sdf, pkgconfig}: - -stdenv.mkDerivation { - - name = "strategoxt-0.14"; - builder = ./builder.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/compilers/strategoxt/utils/default.nix b/pkgs/development/compilers/strategoxt/utils/default.nix deleted file mode 100644 index fabe0de9cb9..00000000000 --- a/pkgs/development/compilers/strategoxt/utils/default.nix +++ /dev/null @@ -1,2 +0,0 @@ -import ./strategoxt-utils-0.16.nix - diff --git a/pkgs/development/compilers/strategoxt/utils/strategoxt-utils-0.14.nix b/pkgs/development/compilers/strategoxt/utils/strategoxt-utils-0.14.nix deleted file mode 100644 index 7de074f0a12..00000000000 --- a/pkgs/development/compilers/strategoxt/utils/strategoxt-utils-0.14.nix +++ /dev/null @@ -1,12 +0,0 @@ -{stdenv, fetchurl, aterm, sdf, strategoxt, pkgconfig}: - -stdenv.mkDerivation { - name = "strategoxt-utils-0.14"; - src = fetchurl { - url = ftp://ftp.stratego-language.org/pub/stratego/StrategoXT/strategoxt-0.14/strategoxt-utils-0.14.tar.gz; - md5 = "d9aab7fbda5b93fb7c49434131393324"; - }; - - inherit aterm sdf; - buildInputs = [pkgconfig aterm sdf strategoxt]; -} diff --git a/pkgs/development/compilers/transformers/builder.sh b/pkgs/development/compilers/transformers/builder.sh deleted file mode 100644 index e8d0fc149e6..00000000000 --- a/pkgs/development/compilers/transformers/builder.sh +++ /dev/null @@ -1,4 +0,0 @@ -. $stdenv/setup - -configureFlags="--with-stlport=$stlport/include" -genericBuild \ No newline at end of file diff --git a/pkgs/development/compilers/transformers/default.nix b/pkgs/development/compilers/transformers/default.nix deleted file mode 100644 index 1b08d2935c2..00000000000 --- a/pkgs/development/compilers/transformers/default.nix +++ /dev/null @@ -1,2 +0,0 @@ -import ./transformers-0.4.nix - diff --git a/pkgs/development/compilers/transformers/transformers-0.4.nix b/pkgs/development/compilers/transformers/transformers-0.4.nix deleted file mode 100644 index 557406cadca..00000000000 --- a/pkgs/development/compilers/transformers/transformers-0.4.nix +++ /dev/null @@ -1,14 +0,0 @@ -{stdenv, fetchurl, aterm, sdf, strategoxt, stlport, pkgconfig}: - -stdenv.mkDerivation { - builder = ./builder.sh; - name = "transformers-0.4"; - - src = fetchurl { - url = http://www.lrde.epita.fr/dload/transformers/transformers-0.4.tar.bz2; - md5 = "19f5b752aec5f4d09cf45cc199fd5bfb"; - }; - - inherit stlport; - buildInputs = [pkgconfig aterm sdf strategoxt stlport]; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 680e692acc9..00d9f506c64 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1969,16 +1969,17 @@ let inherit stdenv fetchurl pkgconfig aterm; }; - strategoxt = import ../development/compilers/strategoxt { + strategoxt = strategoxt017; + + strategoxt016 = import ../development/compilers/strategoxt/0.16.nix { inherit fetchurl pkgconfig sdf aterm; stdenv = overrideInStdenv stdenv [gnumake380]; }; - strategoxt017 = import ../development/compilers/strategoxt/strategoxt-0.17.nix { - inherit fetchurl pkgconfig; + strategoxt017 = import ../development/compilers/strategoxt/0.17.nix { + inherit fetchurl stdenv pkgconfig; sdf = sdf24; aterm = aterm25; - stdenv = overrideInStdenv stdenv [gnumake380]; }; strategoxtUtils = import ../development/compilers/strategoxt/utils { @@ -1993,19 +1994,6 @@ let inherit fetchurl stdenv perl texinfo; }; - transformers = import ../development/compilers/transformers { - inherit fetchurl pkgconfig sdf stlport; - aterm = aterm23; - - stdenv = overrideGCC (overrideInStdenv stdenv [gnumake380]) gcc34; - - strategoxt = import ../development/compilers/strategoxt/strategoxt-0.14.nix { - inherit fetchurl pkgconfig sdf; - aterm = aterm23; - stdenv = overrideGCC (overrideInStdenv stdenv [gnumake380]) gcc34; - }; - }; - visualcpp = import ../development/compilers/visual-c++ { inherit fetchurl stdenv cabextract; };