Regenerated all Haskell packages with the latest version of cabal2nix.

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

11 files changed, 22 insertions, 17 deletions

diff --git a/pkgs/development/tools/parsing/Ebnf2ps/default.nix b/pkgs/development/tools/parsing/Ebnf2ps/default.nix
index 81815500c618..2e8bea4360d4 100644
--- a/pkgs/development/tools/parsing/Ebnf2ps/default.nix
+++ b/pkgs/development/tools/parsing/Ebnf2ps/default.nix
@@ -1,4 +1,4 @@
-{ cabal, happy }:
+{ cabal, Cabal, happy }:
 
 cabal.mkDerivation (self: {
   pname = "Ebnf2ps";
@@ -6,6 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "0xim32bnfapfs53lvmdz2af08rqd15lp5b0rh6yjqm7n1g2061zs";
   isLibrary = false;
   isExecutable = true;
+  buildDepends = [ Cabal ];
   buildTools = [ happy ];
   meta = {
     homepage = "http://www.informatik.uni-freiburg.de/~thiemann/haskell/ebnf2ps/";
diff --git a/pkgs/development/tools/parsing/alex/2.3.1.nix b/pkgs/development/tools/parsing/alex/2.3.1.nix
index fd239d580bf3..c47c502611db 100644
--- a/pkgs/development/tools/parsing/alex/2.3.1.nix
+++ b/pkgs/development/tools/parsing/alex/2.3.1.nix
@@ -1,4 +1,4 @@
-{ cabal, perl }:
+{ cabal, Cabal, perl }:
 
 cabal.mkDerivation (self: {
   pname = "alex";
@@ -6,6 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "cdd42fd992a72fedeff1f38debc21aa315d90dc070f0945d7819c0bccd549a44";
   isLibrary = false;
   isExecutable = true;
+  buildDepends = [ Cabal ];
   buildTools = [ perl ];
   meta = {
     homepage = "http://www.haskell.org/alex/";
diff --git a/pkgs/development/tools/parsing/alex/2.3.2.nix b/pkgs/development/tools/parsing/alex/2.3.2.nix
index d3a4778f3f32..e00ec723151f 100644
--- a/pkgs/development/tools/parsing/alex/2.3.2.nix
+++ b/pkgs/development/tools/parsing/alex/2.3.2.nix
@@ -1,4 +1,4 @@
-{ cabal, perl }:
+{ cabal, Cabal, perl }:
 
 cabal.mkDerivation (self: {
   pname = "alex";
@@ -6,6 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "6715a4c27b15a74d8f31cbb6a7d654b9cb6766d74980c75b65dee7c627049f43";
   isLibrary = false;
   isExecutable = true;
+  buildDepends = [ Cabal ];
   buildTools = [ perl ];
   meta = {
     homepage = "http://www.haskell.org/alex/";
diff --git a/pkgs/development/tools/parsing/alex/2.3.3.nix b/pkgs/development/tools/parsing/alex/2.3.3.nix
index c9e7671c9447..f275255fcb0d 100644
--- a/pkgs/development/tools/parsing/alex/2.3.3.nix
+++ b/pkgs/development/tools/parsing/alex/2.3.3.nix
@@ -1,4 +1,4 @@
-{ cabal, perl }:
+{ cabal, Cabal, perl }:
 
 cabal.mkDerivation (self: {
   pname = "alex";
@@ -6,6 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "338fc492a1fddd6c528d0eb89857cadab211cb42680aeee1f9702bbfa7c5e1c8";
   isLibrary = false;
   isExecutable = true;
+  buildDepends = [ Cabal ];
   buildTools = [ perl ];
   meta = {
     homepage = "http://www.haskell.org/alex/";
diff --git a/pkgs/development/tools/parsing/alex/2.3.5.nix b/pkgs/development/tools/parsing/alex/2.3.5.nix
index db676a906849..50b04c64dec2 100644
--- a/pkgs/development/tools/parsing/alex/2.3.5.nix
+++ b/pkgs/development/tools/parsing/alex/2.3.5.nix
@@ -1,4 +1,4 @@
-{ cabal, perl }:
+{ cabal, Cabal, perl }:
 
 cabal.mkDerivation (self: {
   pname = "alex";
@@ -6,6 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "0lyjiq4lmii2syk6838ln32qvn8c0ljf1ypsggahy748k05x79if";
   isLibrary = false;
   isExecutable = true;
+  buildDepends = [ Cabal ];
   buildTools = [ perl ];
   meta = {
     homepage = "http://www.haskell.org/alex/";
diff --git a/pkgs/development/tools/parsing/alex/3.0.1.nix b/pkgs/development/tools/parsing/alex/3.0.1.nix
index 6725fed52797..418385551331 100644
--- a/pkgs/development/tools/parsing/alex/3.0.1.nix
+++ b/pkgs/development/tools/parsing/alex/3.0.1.nix
@@ -1,4 +1,4 @@
-{ cabal, perl, QuickCheck }:
+{ cabal, Cabal, perl, QuickCheck }:
 
 cabal.mkDerivation (self: {
   pname = "alex";
@@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "1w7s9kzgr4kfh6cyhb4qkvxwy9gcw3xa1d2k5dy575k3wk73awkj";
   isLibrary = false;
   isExecutable = true;
-  buildDepends = [ QuickCheck ];
+  buildDepends = [ Cabal QuickCheck ];
   buildTools = [ perl ];
   meta = {
     homepage = "http://www.haskell.org/alex/";
diff --git a/pkgs/development/tools/parsing/happy/1.18.4.nix b/pkgs/development/tools/parsing/happy/1.18.4.nix
index cc5c60a3d43b..4f8b3024ea5e 100644
--- a/pkgs/development/tools/parsing/happy/1.18.4.nix
+++ b/pkgs/development/tools/parsing/happy/1.18.4.nix
@@ -1,4 +1,4 @@
-{ cabal, mtl, perl }:
+{ cabal, Cabal, mtl, perl }:
 
 cabal.mkDerivation (self: {
   pname = "happy";
@@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "909bec4541a92d3765e74756f752514d2d03ec7a5d3e74c18268a57fe7ffa832";
   isLibrary = false;
   isExecutable = true;
-  buildDepends = [ mtl ];
+  buildDepends = [ Cabal mtl ];
   buildTools = [ perl ];
   meta = {
     homepage = "http://www.haskell.org/happy/";
diff --git a/pkgs/development/tools/parsing/happy/1.18.5.nix b/pkgs/development/tools/parsing/happy/1.18.5.nix
index 41532651c995..9b0b2721f671 100644
--- a/pkgs/development/tools/parsing/happy/1.18.5.nix
+++ b/pkgs/development/tools/parsing/happy/1.18.5.nix
@@ -1,4 +1,4 @@
-{ cabal, mtl, perl }:
+{ cabal, Cabal, mtl, perl }:
 
 cabal.mkDerivation (self: {
   pname = "happy";
@@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "91e1c29ac42bc5cabcac2c2e28e693fc59fbdf30636e5c52cb51b779a74d755e";
   isLibrary = false;
   isExecutable = true;
-  buildDepends = [ mtl ];
+  buildDepends = [ Cabal mtl ];
   buildTools = [ perl ];
   meta = {
     homepage = "http://www.haskell.org/happy/";
diff --git a/pkgs/development/tools/parsing/happy/1.18.6.nix b/pkgs/development/tools/parsing/happy/1.18.6.nix
index 60b8d253659e..161c87e2d1db 100644
--- a/pkgs/development/tools/parsing/happy/1.18.6.nix
+++ b/pkgs/development/tools/parsing/happy/1.18.6.nix
@@ -1,4 +1,4 @@
-{ cabal, mtl, perl }:
+{ cabal, Cabal, mtl, perl }:
 
 cabal.mkDerivation (self: {
   pname = "happy";
@@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "0q6dnwihi1q761qdq0hhi733nh5d53xz6frwmr7slpvrp6v8y344";
   isLibrary = false;
   isExecutable = true;
-  buildDepends = [ mtl ];
+  buildDepends = [ Cabal mtl ];
   buildTools = [ perl ];
   meta = {
     homepage = "http://www.haskell.org/happy/";
diff --git a/pkgs/development/tools/parsing/happy/1.18.8.nix b/pkgs/development/tools/parsing/happy/1.18.8.nix
index b1ba0b165dd7..282967a55b26 100644
--- a/pkgs/development/tools/parsing/happy/1.18.8.nix
+++ b/pkgs/development/tools/parsing/happy/1.18.8.nix
@@ -1,4 +1,4 @@
-{ cabal, mtl, perl }:
+{ cabal, Cabal, mtl, perl }:
 
 cabal.mkDerivation (self: {
   pname = "happy";
@@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "1mqdawxszmdk71fbl8ljxz7jyhai00sflaw0gahp039n44mrspam";
   isLibrary = false;
   isExecutable = true;
-  buildDepends = [ mtl ];
+  buildDepends = [ Cabal mtl ];
   buildTools = [ perl ];
   meta = {
     homepage = "http://www.haskell.org/happy/";
diff --git a/pkgs/development/tools/parsing/happy/1.18.9.nix b/pkgs/development/tools/parsing/happy/1.18.9.nix
index cb47eaa8bdb2..13f04fa33457 100644
--- a/pkgs/development/tools/parsing/happy/1.18.9.nix
+++ b/pkgs/development/tools/parsing/happy/1.18.9.nix
@@ -1,4 +1,4 @@
-{ cabal, mtl, perl }:
+{ cabal, Cabal, mtl, perl }:
 
 cabal.mkDerivation (self: {
   pname = "happy";
@@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "12k1rg7dqa02az9d1zasdnp51zs4h30kpi5lyqsw3jxfp09cad3x";
   isLibrary = false;
   isExecutable = true;
-  buildDepends = [ mtl ];
+  buildDepends = [ Cabal mtl ];
   buildTools = [ perl ];
   meta = {
     homepage = "http://www.haskell.org/happy/";