From 33110a9ddef624c3071a72c7d19be3a6c10bd01a Mon Sep 17 00:00:00 2001 From: Martin Bravenboer Date: Wed, 17 Aug 2005 21:40:11 +0000 Subject: [PATCH] Provide 0.14 in nixpkgs svn path=/nixpkgs/trunk/; revision=3634 --- pkgs/development/compilers/strategoxt/default.nix | 2 +- pkgs/system/all-packages-generic.nix | 12 ++++++++++-- pkgs/system/populate-cache.nix | 4 ++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/strategoxt/default.nix b/pkgs/development/compilers/strategoxt/default.nix index 4d478323013..ed713b6b3fd 100644 --- a/pkgs/development/compilers/strategoxt/default.nix +++ b/pkgs/development/compilers/strategoxt/default.nix @@ -1,2 +1,2 @@ -import ./strategoxt-0.15.nix +import ./strategoxt-0.14.nix diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index d9833e85e86..e86cf513f67 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -490,11 +490,19 @@ rec { }; strategoxt = (import ../development/compilers/strategoxt) { - inherit fetchurl pkgconfig stdenv aterm sdf; + inherit fetchurl pkgconfig stdenv sdf; + + aterm = (import ../development/libraries/aterm/aterm-2.3.1.nix) { + inherit fetchurl stdenv; + }; }; strategoxtUtils = (import ../development/compilers/strategoxt/utils) { - inherit fetchurl pkgconfig stdenv aterm sdf strategoxt; + inherit fetchurl pkgconfig stdenv sdf strategoxt; + + aterm = (import ../development/libraries/aterm/aterm-2.3.1.nix) { + inherit fetchurl stdenv; + }; }; bibtextools = (import ../tools/typesetting/bibtex-tools) { diff --git a/pkgs/system/populate-cache.nix b/pkgs/system/populate-cache.nix index 83d8dd26915..c9bf0a326bd 100644 --- a/pkgs/system/populate-cache.nix +++ b/pkgs/system/populate-cache.nix @@ -47,8 +47,8 @@ let { jakartaregexp sdf -# strategoxt -# strategoxtUtils + strategoxt + strategoxtUtils # ghc # helium