From e45e5c724d6958e5fd249a17271647d192614797 Mon Sep 17 00:00:00 2001 From: Martin Bravenboer Date: Fri, 4 Nov 2005 13:34:35 +0000 Subject: [PATCH] Upgrade of strategoxt to 0.16 svn path=/nixpkgs/trunk/; revision=4222 --- .../compilers/strategoxt/default.nix | 2 +- .../compilers/strategoxt/strategoxt-0.16.nix | 6 ++--- pkgs/system/all-packages-generic.nix | 22 ++++--------------- 3 files changed, 8 insertions(+), 22 deletions(-) diff --git a/pkgs/development/compilers/strategoxt/default.nix b/pkgs/development/compilers/strategoxt/default.nix index ed713b6b3fd..a607d30da6d 100644 --- a/pkgs/development/compilers/strategoxt/default.nix +++ b/pkgs/development/compilers/strategoxt/default.nix @@ -1,2 +1,2 @@ -import ./strategoxt-0.14.nix +import ./strategoxt-0.16.nix diff --git a/pkgs/development/compilers/strategoxt/strategoxt-0.16.nix b/pkgs/development/compilers/strategoxt/strategoxt-0.16.nix index 8fe7795b0e3..28c30e64380 100644 --- a/pkgs/development/compilers/strategoxt/strategoxt-0.16.nix +++ b/pkgs/development/compilers/strategoxt/strategoxt-0.16.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { - name = "strategoxt-0.16M2pre13214"; + name = "strategoxt-0.16"; builder = ./builder.sh; src = fetchurl { - url = http://nix.cs.uu.nl/dist/stratego/strategoxt-0.16M2pre13214/strategoxt-0.16M2pre13214.tar.gz; - md5 = "a28b34f3d527e026aab9225a9e4db03a"; + url = http://nix.cs.uu.nl/dist/stratego/strategoxt-0.16/strategoxt-0.16; + md5 = "8b8eabbd785faa84ec20134b63d4829e"; }; inherit aterm sdf; diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index f9d81db53fc..8e6e720ee79 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -548,17 +548,13 @@ rec { }; strategoxt = (import ../development/compilers/strategoxt) { - inherit fetchurl pkgconfig stdenv sdf; - - aterm = (import ../development/libraries/aterm/aterm-2.3.1.nix) { - inherit fetchurl stdenv; - }; - }; - - strategoxt_unstable = (import ../development/compilers/strategoxt/strategoxt-0.16.nix) { inherit fetchurl pkgconfig stdenv sdf aterm; }; + # Currently, there is no useful unstable release, so we default to + # strategoxt. + strategoxt_unstable = strategoxt; + strategoxtUtils = (import ../development/compilers/strategoxt/utils) { inherit fetchurl pkgconfig stdenv sdf strategoxt; @@ -572,16 +568,6 @@ rec { strategoxt = strategoxt_unstable; }; - # 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; - # sdf = sdf_22; - #}; - ghcboot = (import ../development/compilers/ghc/boot.nix) { inherit fetchurl stdenv perl ncurses; readline = readline4;