From 02ec5625968f93a2303efaf605844e8a3c3dd04c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 7 Apr 2004 14:16:57 +0000
Subject: [PATCH] * GHC now works again.

svn path=/nixpkgs/trunk/; revision=925
---
 pkgs/development/compilers/ghc/boot.nix    | 12 +++++-------
 pkgs/development/compilers/ghc/boot.sh     | 11 -----------
 pkgs/development/compilers/ghc/builder.sh  |  9 ---------
 pkgs/development/compilers/ghc/default.nix |  9 ++++-----
 pkgs/system/populate-cache.nix             |  4 ++--
 5 files changed, 11 insertions(+), 34 deletions(-)
 delete mode 100755 pkgs/development/compilers/ghc/boot.sh
 delete mode 100644 pkgs/development/compilers/ghc/builder.sh

diff --git a/pkgs/development/compilers/ghc/boot.nix b/pkgs/development/compilers/ghc/boot.nix
index a11f93a33fa0..956486390f2b 100644
--- a/pkgs/development/compilers/ghc/boot.nix
+++ b/pkgs/development/compilers/ghc/boot.nix
@@ -4,13 +4,11 @@ assert perl != null;
 
 assert stdenv.system == "i686-linux";
 
-derivation {
-  name = "ghc-6.2";
-  system = stdenv.system;
-  builder = ./boot.sh;
+stdenv.mkDerivation {
+  name = "ghc-6.2.1";
   src = fetchurl {
-    url = http://www.haskell.org/ghc/dist/6.2/ghc-6.2-i386-unknown-linux.tar.bz2;
-    md5 = "5b2f19ca00fd7494002047d7fb4dce3e";
+    url = http://www.haskell.org/ghc/dist/6.2.1/ghc-6.2.1-i386-unknown-linux.tar.bz2;
+    md5 = "48d9d6b9f7bf1f15d69e8bd732ee254c";
   };
-  inherit stdenv perl;
+  buildInputs = [perl];
 }
diff --git a/pkgs/development/compilers/ghc/boot.sh b/pkgs/development/compilers/ghc/boot.sh
deleted file mode 100755
index d08c31c9b310..000000000000
--- a/pkgs/development/compilers/ghc/boot.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#! /bin/sh
-
-buildinputs="$perl"
-. $stdenv/setup || exit 1
-
-tar xvfj $src || exit 1
-cd ghc-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
-strip -S $out/lib/*/*.a || exit 1
diff --git a/pkgs/development/compilers/ghc/builder.sh b/pkgs/development/compilers/ghc/builder.sh
deleted file mode 100644
index 168ca0cbab7d..000000000000
--- a/pkgs/development/compilers/ghc/builder.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-buildinputs="$perl $ghc $m4"
-. $stdenv/setup || exit 1
-
-tar xvfj $src || exit 1
-cd ghc-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
-strip -S $out/lib/*/*.a || exit 1
diff --git a/pkgs/development/compilers/ghc/default.nix b/pkgs/development/compilers/ghc/default.nix
index fafd3982aa75..c5f9ab7fb146 100644
--- a/pkgs/development/compilers/ghc/default.nix
+++ b/pkgs/development/compilers/ghc/default.nix
@@ -3,11 +3,10 @@
 assert perl != null && ghc != null && m4 != null;
 
 stdenv.mkDerivation {
-  name = "ghc-6.2";
-  builder = ./builder.sh;
+  name = "ghc-6.2.1";
   src = fetchurl {
-    url = http://www.haskell.org/ghc/dist/6.2/ghc-6.2-src.tar.bz2;
-    md5 = "cc495e263f4384e1d6b38e851bf6eca0";
+    url = http://www.haskell.org/ghc/dist/6.2.1/ghc-6.2.1-src.tar.bz2;
+    md5 = "fa9f90fd6b8852679c5fc16509e94d7a";
   };
-  inherit perl ghc m4;
+  buildInputs = [perl ghc m4];
 }
diff --git a/pkgs/system/populate-cache.nix b/pkgs/system/populate-cache.nix
index e311fc2898dd..8bbffdd35722 100644
--- a/pkgs/system/populate-cache.nix
+++ b/pkgs/system/populate-cache.nix
@@ -30,8 +30,8 @@ let {
       pkgs.flexnew
       pkgs.gcc
       pkgs.strategoxt
-#      pkgs.ghc
-#      pkgs.helium
+      pkgs.ghc
+      pkgs.helium
       pkgs.perl
       pkgs.python
       pkgs.libxml2