change uulib to store all dependencies to package.conf

added ghc-wrapper to use a generated global package.conf
added uuagc

svn path=/nixpkgs/trunk/; revision=4608

1 files changed, 10 insertions, 0 deletions

diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 7c957ed69fa..2e4028c1e55 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -682,6 +682,16 @@ rec {
     m4 = gnum4;
   };
 
+  ghcWrapper = assert uulib.ghc == ghc;
+               (import ../development/compilers/ghc-wrapper) {
+                   inherit stdenv ghc;
+                   libraries = [ uulib ];
+  };
+
+  uuagc = (import ../development/tools/haskell/uuagc) {
+    inherit fetchurl stdenv ghc uulib;
+  };
+
   helium = (import ../development/compilers/helium) {
     inherit fetchurl stdenv ghc;
   };