From da167ed64f60815701192bd6f5c93c63eaa6ace5 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 12 Jan 2010 10:34:20 +0000
Subject: [PATCH] updating haskellPackages was a bad idea. Some packages broke.
 Revert to privious default.

svn path=/nixpkgs/trunk/; revision=19368
---
 pkgs/top-level/all-packages.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8e26ef70c28..a9c2dbaafd7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1951,7 +1951,7 @@ let
   # For several compiler versions, we export a large set of Haskell-related
   # packages.
 
-  haskellPackages = haskellPackages_ghc6121;
+  haskellPackages = haskellPackages_ghc6104;
 
   /*
   haskellPackages_ghc642 = import ./haskell-packages.nix {
@@ -2027,13 +2027,14 @@ let
     };
   });
 
-  haskellPackages_ghc6121 = import ./haskell-packages.nix {
+  # make this ghc default when it's supported by the Haskell Platform
+  haskellPackages_ghc6121 = lowPrio (import ./haskell-packages.nix {
     inherit pkgs;
     ghc = import ../development/compilers/ghc/6.12.1.nix {
       inherit fetchurl stdenv perl ncurses gmp;
       ghc = ghc6101Binary;
     };
-  };
+  });
 
   haskellPackages_ghcHEAD = import ./haskell-packages.nix {
     inherit pkgs;