* Added GHC and Helium. Note that GHC is built using a pre-built GHC

  for Linux/x86, which is not pure and doesn't work on other
  platforms!

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

1 files changed, 40 insertions, 26 deletions

diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 41559900e6537..878f5f2eee196 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -180,27 +180,61 @@
     inherit fetchurl stdenv binutils;
   };
 
-  perl = (import ../development/interpreters/perl) {
+  jikes = (import ../development/compilers/jikes) {
     inherit fetchurl stdenv;
   };
 
-  python = (import ../development/interpreters/python) {
+  j2sdk = (import ../development/compilers/j2sdk) {
     inherit fetchurl stdenv;
   };
 
-  python = (import ../development/interpreters/python) {
+  strategoxt = (import ../development/compilers/strategoxt) {
+    inherit fetchurl stdenv aterm;
+    sdf = sdf2;
+  };
+
+  strategoxtsvn = (import ../development/compilers/strategoxt/trunk.nix) {
+    inherit fetchsvn stdenv autotools which aterm;
+    sdf = sdf2;
+  };
+
+  strategoxt093 = (import ../development/compilers/strategoxt/strategoxt-0.9.3.nix) {
+    inherit fetchurl stdenv aterm;
+    sdf = sdf2;
+  };
+
+  tiger = (import ../development/compilers/tiger) {
+    inherit fetchurl stdenv aterm strategoxt;
+    sdf = sdf2;
+  };
+
+  ghcboot = (import ../development/compilers/ghc/boot.nix) {
+    inherit fetchurl stdenv perl;
+  };
+
+  ghc = (import ../development/compilers/ghc) {
+    inherit fetchurl stdenv perl;
+    ghc = ghcboot;
+    m4 = gnum4;
+  };
+
+  helium = (import ../development/compilers/helium) {
+    inherit fetchurl stdenv ghc;
+  };
+
+  perl = (import ../development/interpreters/perl) {
     inherit fetchurl stdenv;
   };
 
-  j2re = (import ../development/interpreters/j2re) {
+  python = (import ../development/interpreters/python) {
     inherit fetchurl stdenv;
   };
 
-  jikes = (import ../development/compilers/jikes) {
+  python = (import ../development/interpreters/python) {
     inherit fetchurl stdenv;
   };
 
-  j2sdk = (import ../development/compilers/j2sdk) {
+  j2re = (import ../development/interpreters/j2re) {
     inherit fetchurl stdenv;
   };
 
@@ -278,26 +312,6 @@
     sglr = sglr_3_10_2;
   };
 
-  strategoxt = (import ../development/compilers/strategoxt) {
-    inherit fetchurl stdenv aterm;
-    sdf = sdf2;
-  };
-
-  strategoxtsvn = (import ../development/compilers/strategoxt/trunk.nix) {
-    inherit fetchsvn stdenv autotools which aterm;
-    sdf = sdf2;
-  };
-
-  strategoxt093 = (import ../development/compilers/strategoxt/strategoxt-0.9.3.nix) {
-    inherit fetchurl stdenv aterm;
-    sdf = sdf2;
-  };
-
-  tiger = (import ../development/compilers/tiger) {
-    inherit fetchurl stdenv aterm strategoxt;
-    sdf = sdf2;
-  };
-
   expat = (import ../development/libraries/expat) {
     inherit fetchurl stdenv;
   };