From 769dec7238cb0dee87d721a5ab44e8542f87c82e Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Thu, 9 Jul 2009 22:23:59 +0000
Subject: haskellPackages: fix monadlab and Crypto with most recent ghc

svn path=/nixpkgs/trunk/; revision=16295
---
 pkgs/development/libraries/haskell/Crypto/default.nix   | 3 ++-
 pkgs/development/libraries/haskell/monadlab/default.nix | 4 ++--
 pkgs/top-level/haskell-packages.nix                     | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/haskell/Crypto/default.nix b/pkgs/development/libraries/haskell/Crypto/default.nix
index 9cb465e50b38b..1a43ebd40f78a 100644
--- a/pkgs/development/libraries/haskell/Crypto/default.nix
+++ b/pkgs/development/libraries/haskell/Crypto/default.nix
@@ -1,9 +1,10 @@
-{cabal}:
+{cabal, HUnit, QuickCheck}:
 
 cabal.mkDerivation (self : {
   pname = "Crypto";
   version = "4.1.0";
   sha256 = "0984c833c5dfa6f4d56fd6fb284db7b7cef6676dc7999a1436aa856becba2b8f";
+  propagatedBuildInputs = [HUnit QuickCheck];
   meta = {
     description = "Several encryption algorithms for Haskell";
   };
diff --git a/pkgs/development/libraries/haskell/monadlab/default.nix b/pkgs/development/libraries/haskell/monadlab/default.nix
index 94044e4d5852e..b391e3a749fd2 100644
--- a/pkgs/development/libraries/haskell/monadlab/default.nix
+++ b/pkgs/development/libraries/haskell/monadlab/default.nix
@@ -1,4 +1,4 @@
-{cabal}:
+{cabal, parsec}:
 
 cabal.mkDerivation (self : {
   pname = "MonadLab";
@@ -7,5 +7,5 @@ cabal.mkDerivation (self : {
   meta = {
     description = "Automatically generate layered monads.";
   };
-  propagatedBuildInputs = [];
+  propagatedBuildInputs = [parsec];
 })
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index b71a174f34892..f14aa24bed63e 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -48,7 +48,7 @@ rec {
   };
 
   Crypto = import ../development/libraries/haskell/Crypto {
-    inherit cabal;
+    inherit cabal HUnit QuickCheck;
   };
 
   dataenc = import ../development/libraries/haskell/dataenc {
@@ -184,7 +184,7 @@ rec {
   };
 
   monadlab = import ../development/libraries/haskell/monadlab {
-    inherit cabal;
+    inherit cabal parsec;
   };
 
   MonadRandom = import ../development/libraries/haskell/MonadRandom {
-- 
cgit 1.4.1