svn merge ^/nixpkgs/trunk

svn path=/nixpkgs/branches/libpng15/; revision=32335

pkgs/applications/misc/xmobar/default.nix

@@ -1,5 +1,5 @@
-{ cabal, Cabal, filepath, libXrandr, mtl, parsec, stm, time
+{ cabal, filepath, libXrandr, mtl, parsec, stm, time, utf8String
-, utf8String, X11, X11Xft
+, X11, X11Xft
 }:
 
 cabal.mkDerivation (self: {
@@ -9,7 +9,7 @@ cabal.mkDerivation (self: {
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
-    Cabal filepath mtl parsec stm time utf8String X11 X11Xft
+    filepath mtl parsec stm time utf8String X11 X11Xft
   ];
   extraLibraries = [ libXrandr ];
   configureFlags = "-fwith_xft";

pkgs/applications/version-management/darcs/default.nix

@@ -1,4 +1,4 @@
-{ cabal, Cabal, curl, extensibleExceptions, filepath, hashedStorage
+{ cabal, curl, extensibleExceptions, filepath, hashedStorage
 , haskeline, html, HTTP, mmap, mtl, network, parsec, random
 , regexCompat, tar, terminfo, text, zlib
 }:
@@ -10,9 +10,8 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    Cabal extensibleExceptions filepath hashedStorage haskeline html
+    extensibleExceptions filepath hashedStorage haskeline html HTTP
-    HTTP mmap mtl network parsec random regexCompat tar terminfo text
+    mmap mtl network parsec random regexCompat tar terminfo text zlib
-    zlib
   ];
   extraLibraries = [ curl ];
   meta = {

pkgs/applications/window-managers/xmonad/xmonad-contrib.nix

@@ -1,5 +1,5 @@
-{ cabal, Cabal, extensibleExceptions, mtl, random, utf8String, X11
+{ cabal, extensibleExceptions, mtl, random, utf8String, X11, X11Xft
-, X11Xft, xmonad
+, xmonad
 }:
 
 cabal.mkDerivation (self: {
@@ -7,7 +7,7 @@ cabal.mkDerivation (self: {
   version = "0.10";
   sha256 = "0lp7qr69rpjy4s3knhdgh2bp6zs81xp0az1lisv4a2i7i1ys7hfq";
   buildDepends = [
-    Cabal extensibleExceptions mtl random utf8String X11 X11Xft xmonad
+    extensibleExceptions mtl random utf8String X11 X11Xft xmonad
   ];
   meta = {
     homepage = "http://xmonad.org/";

pkgs/applications/window-managers/xmonad/xmonad-extras.nix

@@ -1,4 +1,4 @@
-{ cabal, Cabal, hint, HList, libmpd, mtl, network, parsec, random
+{ cabal, hint, HList, libmpd, mtl, network, parsec, random
 , regexPosix, split, X11, xmonad, xmonadContrib
 }:
 
@@ -7,8 +7,8 @@ cabal.mkDerivation (self: {
   version = "0.10.1";
   sha256 = "17rac0xjw1zw1jlc1rpq54vg50xscb3b98knk4gkb8bv1khpgz27";
   buildDepends = [
-    Cabal hint HList libmpd mtl network parsec random regexPosix split
+    hint HList libmpd mtl network parsec random regexPosix split X11
-    X11 xmonad xmonadContrib
+    xmonad xmonadContrib
   ];
   noHaddock = true;
   meta = {

pkgs/development/compilers/Agda-executable/default.nix

@@ -1,4 +1,4 @@
-{ cabal, Agda, Cabal }:
+{ cabal, Agda }:
 
 cabal.mkDerivation (self: {
   pname = "Agda-executable";
@@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "1n1ak6z2vh356k9mk0zkiv6dqp9dvx97a7r21b0xnhwkmh3f8p5p";
   isLibrary = false;
   isExecutable = true;
-  buildDepends = [ Agda Cabal ];
+  buildDepends = [ Agda ];
   meta = {
     homepage = "http://wiki.portal.chalmers.se/agda/";
     description = "Command-line program for type-checking and compiling Agda programs";

pkgs/development/libraries/haskell/AC-Vector/default.nix

@@ -1,10 +1,9 @@
-{ cabal, Cabal }:
+{ cabal }:
 
 cabal.mkDerivation (self: {
   pname = "AC-Vector";
   version = "2.3.2";
   sha256 = "04ahf6ldfhvzbml9xd6yplygn8ih7b8zz7cw03hkr053g5kzylay";
-  buildDepends = [ Cabal ];
   meta = {
     description = "Efficient geometric vectors and transformations";
     license = self.stdenv.lib.licenses.bsd3;

pkgs/development/libraries/haskell/Agda/default.nix

@@ -1,4 +1,4 @@
-{ cabal, alex, binary, Cabal, filepath, happy, hashable, hashtables
+{ cabal, alex, binary, filepath, happy, hashable, hashtables
 , haskeline, haskellSrcExts, mtl, QuickCheck, syb, xhtml, zlib
 }:
 
@@ -9,8 +9,8 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    binary Cabal filepath hashable hashtables haskeline haskellSrcExts
+    binary filepath hashable hashtables haskeline haskellSrcExts mtl
-    mtl QuickCheck syb xhtml zlib
+    QuickCheck syb xhtml zlib
   ];
   buildTools = [ alex happy ];
   meta = {

pkgs/development/libraries/haskell/AspectAG/default.nix

@@ -1,10 +1,10 @@
-{ cabal, Cabal, HList, mtl }:
+{ cabal, HList, mtl }:
 
 cabal.mkDerivation (self: {
   pname = "AspectAG";
   version = "0.3.4.1";
   sha256 = "12iaf27crynwnnd7qm1zvvaj6zw6i6c05mb4dsq55dnhph2l356g";
-  buildDepends = [ Cabal HList mtl ];
+  buildDepends = [ HList mtl ];
   meta = {
     homepage = "http://www.cs.uu.nl/wiki/bin/view/Center/AspectAG";
     description = "Attribute Grammars in the form of an EDSL";

pkgs/development/libraries/haskell/Boolean/default.nix

@@ -1,10 +1,9 @@
-{ cabal, Cabal }:
+{ cabal }:
 
 cabal.mkDerivation (self: {
   pname = "Boolean";
   version = "0.0.1";
   sha256 = "dafcfb2e9d7f7aa24a3d3ceb385424176297cdf6f6044028d42d0fea1cae7765";
-  buildDepends = [ Cabal ];
   meta = {
     description = "Generalized booleans";
     license = self.stdenv.lib.licenses.bsd3;

pkgs/development/libraries/haskell/Chart/default.nix

@@ -1,5 +1,5 @@
-{ cabal, Cabal, cairo, colour, dataAccessor, dataAccessorTemplate
+{ cabal, cairo, colour, dataAccessor, dataAccessorTemplate, mtl
-, mtl, time
+, time
 }:
 
 cabal.mkDerivation (self: {
@@ -7,7 +7,7 @@ cabal.mkDerivation (self: {
   version = "0.15";
   sha256 = "1357gqn2ifalknl85n2z9ysf195dnaxm175rp0kmmzbf4vik9gc4";
   buildDepends = [
-    Cabal cairo colour dataAccessor dataAccessorTemplate mtl time
+    cairo colour dataAccessor dataAccessorTemplate mtl time
   ];
   meta = {
     homepage = "http://www.dockerz.net/software/chart.html";

pkgs/development/libraries/haskell/ConfigFile/default.nix

@@ -1,4 +1,4 @@
-{ cabal, Cabal, MissingH, mtl, parsec }:
+{ cabal, MissingH, mtl, parsec }:
 
 cabal.mkDerivation (self: {
   pname = "ConfigFile";
@@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "0w2yhbnqldhmj3d98j720l4lj4d08abqcff751p2slszdm5pw1jm";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ Cabal MissingH mtl parsec ];
+  buildDepends = [ MissingH mtl parsec ];
   noHaddock = true;
   meta = {
     homepage = "http://software.complete.org/configfile";

pkgs/development/libraries/haskell/CouchDB/default.nix

@@ -1,10 +1,10 @@
-{ cabal, Cabal, HTTP, json, mtl, network }:
+{ cabal, HTTP, json, mtl, network }:
 
 cabal.mkDerivation (self: {
   pname = "CouchDB";
   version = "0.10.1";
   sha256 = "1ny62ab0sjrkh7mpxj0ahqrv7c8dh0n5s1g8xl0mq3yiwlrjdsim";
-  buildDepends = [ Cabal HTTP json mtl network ];
+  buildDepends = [ HTTP json mtl network ];
   meta = {
     homepage = "http://github.com/arjunguha/haskell-couchdb/";
     description = "CouchDB interface";

pkgs/development/libraries/haskell/Crypto/default.nix

@@ -1,4 +1,4 @@
-{ cabal, Cabal, HUnit, QuickCheck, random }:
+{ cabal, HUnit, QuickCheck, random }:
 
 cabal.mkDerivation (self: {
   pname = "Crypto";
@@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "05wafv8flrh1893rh208azzig5k5pa022s2fg3f8lrqb23c6v63p";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ Cabal HUnit QuickCheck random ];
+  buildDepends = [ HUnit QuickCheck random ];
   meta = {
     description = "Collects together existing Haskell cryptographic functions into a package";
     license = "unknown";

pkgs/development/libraries/haskell/DSH/default.nix

@@ -1,4 +1,4 @@
-{ cabal, Cabal, convertible, csv, FerryCore, HaXml, HDBC, json, mtl
+{ cabal, convertible, csv, FerryCore, HaXml, HDBC, json, mtl
 , Pathfinder, syb, text, xhtml
 }:
 
@@ -7,8 +7,8 @@ cabal.mkDerivation (self: {
   version = "0.7.8";
   sha256 = "1mlym2hs7sr78lih8c0yi5y5h14vxy3zpl3gfnidh9wiw5cai9lg";
   buildDepends = [
-    Cabal convertible csv FerryCore HaXml HDBC json mtl Pathfinder syb
+    convertible csv FerryCore HaXml HDBC json mtl Pathfinder syb text
-    text xhtml
+    xhtml
   ];
   meta = {
     description = "Database Supported Haskell";

pkgs/development/libraries/haskell/Diff/default.nix

@@ -1,10 +1,9 @@
-{ cabal, Cabal }:
+{ cabal }:
 
 cabal.mkDerivation (self: {
   pname = "Diff";
   version = "0.1.3";
   sha256 = "02dhy4rp3mkzm5x3h1rkdin2h8qcb7h7nhn14gl2gvl6wdykfh5w";
-  buildDepends = [ Cabal ];
   meta = {
     description = "O(ND) diff algorithm in haskell";
     license = self.stdenv.lib.licenses.bsd3;

pkgs/development/libraries/haskell/FerryCore/default.nix

@@ -1,10 +1,10 @@
-{ cabal, Cabal, HaXml, mtl, parsec, TableAlgebra }:
+{ cabal, HaXml, mtl, parsec, TableAlgebra }:
 
 cabal.mkDerivation (self: {
   pname = "FerryCore";
   version = "0.4.6.4";
   sha256 = "1dxhbrmcl36dg14lyihpy8fd8sdsmawh70fykllcjk3fh7a11wgp";
-  buildDepends = [ Cabal HaXml mtl parsec TableAlgebra ];
+  buildDepends = [ HaXml mtl parsec TableAlgebra ];
   meta = {
     description = "Ferry Core Components";
     license = self.stdenv.lib.licenses.bsd3;

pkgs/development/libraries/haskell/GLFW/default.nix

@@ -1,10 +1,10 @@
-{ cabal, Cabal, libX11, mesa, OpenGL }:
+{ cabal, libX11, mesa, OpenGL }:
 
 cabal.mkDerivation (self: {
   pname = "GLFW";
   version = "0.5.0.1";
   sha256 = "1zjxw0fn1am9n4bwqn8jwp14cdgyg1cv5v8rrg2bisggw7wdc4c6";
-  buildDepends = [ Cabal OpenGL ];
+  buildDepends = [ OpenGL ];
   extraLibraries = [ libX11 mesa ];
   meta = {
     homepage = "http://haskell.org/haskellwiki/GLFW";

pkgs/development/libraries/haskell/GLURaw/default.nix

@@ -1,10 +1,10 @@
-{ cabal, Cabal, freeglut, mesa, OpenGLRaw }:
+{ cabal, freeglut, mesa, OpenGLRaw }:
 
 cabal.mkDerivation (self: {
   pname = "GLURaw";
   version = "1.2.0.0";
   sha256 = "06dsazj3zadjahwy926gnjngqg8cb1mhdxh8bg5f3axf3hsvxqp1";
-  buildDepends = [ Cabal OpenGLRaw ];
+  buildDepends = [ OpenGLRaw ];
   extraLibraries = [ freeglut mesa ];
   meta = {
     homepage = "http://www.haskell.org/haskellwiki/Opengl";

pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix

@@ -1,12 +1,10 @@
-{ cabal, Cabal, freeglut, libICE, libSM, libXi, libXmu, mesa
+{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL }:
-, OpenGL
-}:
 
 cabal.mkDerivation (self: {
   pname = "GLUT";
   version = "2.1.1.2";
   sha256 = "d5ecf4b6bacc5e68ade00710df04fa158c6ed322c74362954716a0baba6bd3fb";
-  buildDepends = [ Cabal OpenGL ];
+  buildDepends = [ OpenGL ];
   extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ];
   meta = {
     homepage = "http://www.haskell.org/HOpenGL/";

pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix

@@ -1,12 +1,10 @@
-{ cabal, Cabal, freeglut, libICE, libSM, libXi, libXmu, mesa
+{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL }:
-, OpenGL
-}:
 
 cabal.mkDerivation (self: {
   pname = "GLUT";
   version = "2.1.2.1";
   sha256 = "0r3js5i468lqlsnvb04iw6gdl81gs3cgqids3xpi4p5qpynbyc02";
-  buildDepends = [ Cabal OpenGL ];
+  buildDepends = [ OpenGL ];
   extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ];
   meta = {
     homepage = "http://www.haskell.org/HOpenGL/";

pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix

@@ -1,12 +1,12 @@
-{ cabal, Cabal, freeglut, libICE, libSM, libXi, libXmu, mesa
+{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL
-, OpenGL, StateVar, Tensor
+, StateVar, Tensor
 }:
 
 cabal.mkDerivation (self: {
   pname = "GLUT";
   version = "2.2.2.1";
   sha256 = "09qpkrwpc3w173mvqwda7vi0ncpzzzrnlfa14ja7jba489a8l1mw";
-  buildDepends = [ Cabal OpenGL StateVar Tensor ];
+  buildDepends = [ OpenGL StateVar Tensor ];
   extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ];
   meta = {
     homepage = "http://www.haskell.org/haskellwiki/Opengl";

pkgs/development/libraries/haskell/GLUT/2.3.0.0.nix

@@ -1,12 +1,12 @@
-{ cabal, Cabal, freeglut, libICE, libSM, libXi, libXmu, mesa
+{ cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL
-, OpenGL, OpenGLRaw, StateVar, Tensor
+, OpenGLRaw, StateVar, Tensor
 }:
 
 cabal.mkDerivation (self: {
   pname = "GLUT";
   version = "2.3.0.0";
   sha256 = "10rh57w3lx8fs0xy24lqilv5a5sgq57kshydja41r6fq9wdvwp99";
-  buildDepends = [ Cabal OpenGL OpenGLRaw StateVar Tensor ];
+  buildDepends = [ OpenGL OpenGLRaw StateVar Tensor ];
   extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ];
   meta = {
     homepage = "http://www.haskell.org/haskellwiki/Opengl";

pkgs/development/libraries/haskell/GlomeVec/default.nix

@@ -1,10 +1,9 @@
-{ cabal, Cabal }:
+{ cabal }:
 
 cabal.mkDerivation (self: {
   pname = "GlomeVec";
   version = "0.1.2";
   sha256 = "6023c11977bf16baf487235087e94f5a2f465e8403b8e40ab513e7879dd52639";
-  buildDepends = [ Cabal ];
   meta = {
     homepage = "http://www.haskell.org/haskellwiki/Glome";
     description = "Simple 3D vector library";

pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix

@@ -1,4 +1,4 @@
-{ cabal, Cabal, HDBC, mtl, odbc, time, utf8String }:
+{ cabal, HDBC, mtl, odbc, time, utf8String }:
 
 cabal.mkDerivation (self: {
   pname = "HDBC-odbc";
@@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "0vza38ggs863wjh25xnwslwlin68166ywws72bs766rl0rq7fkf4";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ Cabal HDBC mtl time utf8String ];
+  buildDepends = [ HDBC mtl time utf8String ];
   extraLibraries = [ odbc ];
   noHaddock = true;
   meta = {

pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix

@@ -1,4 +1,4 @@
-{ cabal, Cabal, HDBC, mtl, parsec, postgresql, time, utf8String }:
+{ cabal, HDBC, mtl, parsec, postgresql, time, utf8String }:
 
 cabal.mkDerivation (self: {
   pname = "HDBC-postgresql";
@@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "0fwza9h2ghl70x44c4snfybnnfsj1mwlf5a1x12ddl1fbj6fx6gs";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ Cabal HDBC mtl parsec time utf8String ];
+  buildDepends = [ HDBC mtl parsec time utf8String ];
   extraLibraries = [ postgresql ];
   meta = {
     homepage = "http://software.complete.org/hdbc-postgresql";

pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix

@@ -1,4 +1,4 @@
-{ cabal, Cabal, HDBC, mtl, sqlite, utf8String }:
+{ cabal, HDBC, mtl, sqlite, utf8String }:
 
 cabal.mkDerivation (self: {
   pname = "HDBC-sqlite3";
@@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "11765nsncgyv9j6r5wpziqyhy0lxrmqbhgricbdx0c788ky75y92";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ Cabal HDBC mtl utf8String ];
+  buildDepends = [ HDBC mtl utf8String ];
   extraLibraries = [ sqlite ];
   meta = {
     homepage = "http://software.complete.org/hdbc-sqlite3";

pkgs/development/libraries/haskell/HDBC/HDBC.nix

@@ -1,4 +1,4 @@
-{ cabal, Cabal, convertible, mtl, text, time, utf8String }:
+{ cabal, convertible, mtl, text, time, utf8String }:
 
 cabal.mkDerivation (self: {
   pname = "HDBC";
@@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "1gqihvsf5w7j8xbn1xy93mdrsh77qwxbhfmyjivbm6i95w1i0kb7";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ Cabal convertible mtl text time utf8String ];
+  buildDepends = [ convertible mtl text time utf8String ];
   meta = {
     homepage = "https://github.com/hdbc/hdbc";
     description = "Haskell Database Connectivity";

pkgs/development/libraries/haskell/HGL/default.nix

@@ -1,10 +1,10 @@
-{ cabal, Cabal, X11 }:
+{ cabal, X11 }:
 
 cabal.mkDerivation (self: {
   pname = "HGL";
   version = "3.2.0.2";
   sha256 = "13wcvf6bfii9pihr8m08b81fyslf5n587ds4zzgizbd8m38k81vz";
-  buildDepends = [ Cabal X11 ];
+  buildDepends = [ X11 ];
   meta = {
     description = "A simple graphics library based on X11 or Win32";
     license = self.stdenv.lib.licenses.bsd3;

pkgs/development/libraries/haskell/HList/default.nix

@@ -1,10 +1,9 @@
-{ cabal, Cabal }:
+{ cabal }:
 
 cabal.mkDerivation (self: {
   pname = "HList";
   version = "0.2.3";
   sha256 = "1efbe0c2cb361ab0a9d864a09f9c58075132cb50094207260cb1363fe73c2908";
-  buildDepends = [ Cabal ];
   meta = {
     description = "Heterogeneous lists";
     license = self.stdenv.lib.licenses.mit;

pkgs/development/libraries/haskell/HStringTemplate/default.nix

@@ -1,5 +1,5 @@
-{ cabal, Cabal, deepseq, filepath, mtl, parsec, syb, sybWithClass
+{ cabal, deepseq, filepath, mtl, parsec, syb, sybWithClass, text
-, text, time, utf8String
+, time, utf8String
 }:
 
 cabal.mkDerivation (self: {
@@ -7,8 +7,7 @@ cabal.mkDerivation (self: {
   version = "0.6.8";
   sha256 = "1fybvb3v2b786n1hfzcvyanj3yfm5j8z4fm48vaskcggawh6rlkr";
   buildDepends = [
-    Cabal deepseq filepath mtl parsec syb sybWithClass text time
+    deepseq filepath mtl parsec syb sybWithClass text time utf8String
-    utf8String
   ];
   meta = {
     description = "StringTemplate implementation in Haskell";

pkgs/development/libraries/haskell/HTTP/4000.0.6.nix

@@ -1,10 +1,10 @@
-{ cabal, Cabal, mtl, network, parsec }:
+{ cabal, mtl, network, parsec }:
 
 cabal.mkDerivation (self: {
   pname = "HTTP";
   version = "4000.0.6";
   sha256 = "75af1ac4dc21b10c8a1a54a33179ea822e591887bab7278360a3d6b38304d39b";
-  buildDepends = [ Cabal mtl network parsec ];
+  buildDepends = [ mtl network parsec ];
   meta = {
     homepage = "http://projects.haskell.org/http/";
     description = "A library for client-side HTTP";

pkgs/development/libraries/haskell/HTTP/4000.0.9.nix

@@ -1,10 +1,10 @@
-{ cabal, Cabal, mtl, network, parsec }:
+{ cabal, mtl, network, parsec }:
 
 cabal.mkDerivation (self: {
   pname = "HTTP";
   version = "4000.0.9";
   sha256 = "1e2b4a8b782ad1417c8755bb0d248851bc142b351366ed460e07f2945a5e95ba";
-  buildDepends = [ Cabal mtl network parsec ];
+  buildDepends = [ mtl network parsec ];
   meta = {
     homepage = "http://projects.haskell.org/http/";
     description = "A library for client-side HTTP";

pkgs/development/libraries/haskell/HTTP/4000.1.1.nix

@@ -1,10 +1,10 @@
-{ cabal, Cabal, mtl, network, parsec }:
+{ cabal, mtl, network, parsec }:
 
 cabal.mkDerivation (self: {
   pname = "HTTP";
   version = "4000.1.1";
   sha256 = "09khx5fb673a0d7m3bl39xjdxvc60m52rmm4865cha2mby0zidy3";
-  buildDepends = [ Cabal mtl network parsec ];
+  buildDepends = [ mtl network parsec ];
   meta = {
     homepage = "http://projects.haskell.org/http/";
     description = "A library for client-side HTTP";

pkgs/development/libraries/haskell/HTTP/4000.1.2.nix

@@ -1,10 +1,10 @@
-{ cabal, Cabal, mtl, network, parsec }:
+{ cabal, mtl, network, parsec }:
 
 cabal.mkDerivation (self: {
   pname = "HTTP";
   version = "4000.1.2";
   sha256 = "19vcy8xinrvn01caly6sg1p1yvbbf7nwq10kxmnwqssnl4h5cwn8";
-  buildDepends = [ Cabal mtl network parsec ];
+  buildDepends = [ mtl network parsec ];
   meta = {
     homepage = "http://projects.haskell.org/http/";
     description = "A library for client-side HTTP";

pkgs/development/libraries/haskell/HTTP/4000.2.1.nix

@@ -1,10 +1,10 @@
-{ cabal, Cabal, mtl, network, parsec }:
+{ cabal, mtl, network, parsec }:
 
 cabal.mkDerivation (self: {
   pname = "HTTP";
   version = "4000.2.1";
   sha256 = "01076rk7ly5228pszn54x4nqc6rqq1xw11ij9ajvhzf419islh0a";
-  buildDepends = [ Cabal mtl network parsec ];
+  buildDepends = [ mtl network parsec ];
   meta = {
     homepage = "https://github.com/haskell/HTTP";
     description = "A library for client-side HTTP";

pkgs/development/libraries/haskell/HTTP/4000.2.2.nix

@@ -1,10 +1,10 @@
-{ cabal, Cabal, mtl, network, parsec }:
+{ cabal, mtl, network, parsec }:
 
 cabal.mkDerivation (self: {
   pname = "HTTP";
   version = "4000.2.2";
   sha256 = "0qrr9wdj25sdfxifppmw0w14g8skpgf42ic4iqcqylxxzfa8v7vh";
-  buildDepends = [ Cabal mtl network parsec ];
+  buildDepends = [ mtl network parsec ];
   meta = {
     homepage = "https://github.com/haskell/HTTP";
     description = "A library for client-side HTTP";

pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix

@@ -1,10 +1,9 @@
-{ cabal, Cabal }:
+{ cabal }:
 
 cabal.mkDerivation (self: {
   pname = "HUnit";
   version = "1.2.0.3";
   sha256 = "954f584f7c096c3ddef677e70b3811195bb4fd18dfdb4727a260ca7d7465de12";
-  buildDepends = [ Cabal ];
   meta = {
     homepage = "http://hunit.sourceforge.net/";
     description = "A unit testing framework for Haskell";

pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix

@@ -1,4 +1,4 @@
-{ cabal, Cabal }:
+{ cabal }:
 
 cabal.mkDerivation (self: {
   pname = "HUnit";
@@ -6,7 +6,6 @@ cabal.mkDerivation (self: {
   sha256 = "47235503b666658588181795540d29212283059b21edc42e1b4f1998e46ac853";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ Cabal ];
   meta = {
     homepage = "http://hunit.sourceforge.net/";
     description = "A unit testing framework for Haskell";

pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix

@@ -1,4 +1,4 @@
-{ cabal, Cabal }:
+{ cabal }:
 
 cabal.mkDerivation (self: {
   pname = "HUnit";
@@ -6,7 +6,6 @@ cabal.mkDerivation (self: {
   sha256 = "158i6s014ybh5bflzspd21qzdlhdyk89yqpmk8kwc59lxjvvjsxz";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ Cabal ];
   meta = {
     homepage = "http://hunit.sourceforge.net/";
     description = "A unit testing framework for Haskell";

pkgs/development/libraries/haskell/HUnit/1.2.4.2.nix

@@ -1,4 +1,4 @@
-{ cabal, Cabal }:
+{ cabal }:
 
 cabal.mkDerivation (self: {
   pname = "HUnit";
@@ -6,7 +6,6 @@ cabal.mkDerivation (self: {
   sha256 = "0yijvrjmmz6vvgi5h1195z4psmymvhq6rr7kkd26nqbd34lbrg7x";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ Cabal ];
   meta = {
     homepage = "http://hunit.sourceforge.net/";
     description = "A unit testing framework for Haskell";

pkgs/development/libraries/haskell/HaXml/default.nix

@@ -1,4 +1,4 @@
-{ cabal, Cabal, filepath, polyparse, random }:
+{ cabal, filepath, polyparse, random }:
 
 cabal.mkDerivation (self: {
   pname = "HaXml";
@@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "1ckmi8iwyaid4mcnh8117s9kq45f8r7sidh6dbhzbj0dl29rrkbz";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ Cabal filepath polyparse random ];
+  buildDepends = [ filepath polyparse random ];
   meta = {
     homepage = "http://www.cs.york.ac.uk/fp/HaXml/";
     description = "Utilities for manipulating XML documents";

pkgs/development/libraries/haskell/HaskellForMaths/default.nix

@@ -1,10 +1,10 @@
-{ cabal, Cabal, random }:
+{ cabal, random }:
 
 cabal.mkDerivation (self: {
   pname = "HaskellForMaths";
   version = "0.4.3";
   sha256 = "00s502h3pw9i464qn6cn74ihghcnn5gsar891q276ld682m5vdns";
-  buildDepends = [ Cabal random ];
+  buildDepends = [ random ];
   meta = {
     homepage = "http://haskellformaths.blogspot.com/";
     description = "Combinatorics, group theory, commutative algebra, non-commutative algebra";

pkgs/development/libraries/haskell/Hipmunk/default.nix

@@ -1,10 +1,10 @@
-{ cabal, Cabal, StateVar, transformers }:
+{ cabal, StateVar, transformers }:
 
 cabal.mkDerivation (self: {
   pname = "Hipmunk";
   version = "5.2.0.6";
   sha256 = "16yh7v6v05nksspcfz8h054piyhmrfbpaada36562rjxcywyfnfj";
-  buildDepends = [ Cabal StateVar transformers ];
+  buildDepends = [ StateVar transformers ];
   noHaddock = true;
   meta = {
     homepage = "http://patch-tag.com/r/felipe/hipmunk/home";

pkgs/development/libraries/haskell/HsOpenSSL/default.nix

@@ -1,10 +1,10 @@
-{ cabal, Cabal, network, openssl, time }:
+{ cabal, network, openssl, time }:
 
 cabal.mkDerivation (self: {
   pname = "HsOpenSSL";
   version = "0.10.1.2";
   sha256 = "0najn3749s6jxqavpxw7q58jzsvli06sxjgkvs3lidasv6jhwmxh";
-  buildDepends = [ Cabal network time ];
+  buildDepends = [ network time ];
   extraLibraries = [ openssl ];
   meta = {
     homepage = "https://github.com/phonohawk/HsOpenSSL";

pkgs/development/libraries/haskell/HsSyck/default.nix

@@ -1,10 +1,10 @@
-{ cabal, Cabal, syb, utf8String }:
+{ cabal, syb, utf8String }:
 
 cabal.mkDerivation (self: {
   pname = "HsSyck";
   version = "0.50";
   sha256 = "0ap675i2fngvd1nw1dk8p2fz4nbd2aq5ci8dsvpcjbp28y9j2blm";
-  buildDepends = [ Cabal syb utf8String ];
+  buildDepends = [ syb utf8String ];
   meta = {
     description = "Fast, lightweight YAML loader and dumper";
     license = self.stdenv.lib.licenses.bsd3;

pkgs/development/libraries/haskell/JsContracts/default.nix

@@ -1,4 +1,4 @@
-{ cabal, Cabal, filepath, mtl, parsec, syb, WebBits, WebBitsHtml }:
+{ cabal, filepath, mtl, parsec, syb, WebBits, WebBitsHtml }:
 
 cabal.mkDerivation (self: {
   pname = "JsContracts";
@@ -6,9 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "17l6kdpdc7lrpd9j4d2b6vklkpclshcjy6hzpi442b7pj96sn589";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [
+  buildDepends = [ filepath mtl parsec syb WebBits WebBitsHtml ];
-    Cabal filepath mtl parsec syb WebBits WebBitsHtml
-  ];
   meta = {
     homepage = "http://www.cs.brown.edu/research/plt/";
     description = "Design-by-contract for JavaScript";

pkgs/development/libraries/haskell/ListLike/default.nix

@@ -1,4 +1,4 @@
-{ cabal, Cabal }:
+{ cabal }:
 
 cabal.mkDerivation (self: {
   pname = "ListLike";
@@ -6,7 +6,6 @@ cabal.mkDerivation (self: {
   sha256 = "0cpj7vqlazs2yzh0ffhlg69kdb18xyicybfw614nlqfhhrp53lj9";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ Cabal ];
   meta = {
     homepage = "http://software.complete.org/listlike";
     description = "Generic support for list-like structures";

pkgs/development/libraries/haskell/MaybeT/default.nix

@@ -1,10 +1,10 @@
-{ cabal, Cabal, mtl }:
+{ cabal, mtl }:
 
 cabal.mkDerivation (self: {
   pname = "MaybeT";
   version = "0.1.2";
   sha256 = "995e61165122656807d84174e5c1516340fd7ddeba6571c20751352a8476b632";
-  buildDepends = [ Cabal mtl ];
+  buildDepends = [ mtl ];
   meta = {
     description = "MaybeT monad transformer";
     license = self.stdenv.lib.licenses.bsd3;

pkgs/development/libraries/haskell/MemoTrie/default.nix

@@ -1,10 +1,9 @@
-{ cabal, Cabal }:
+{ cabal }:
 
 cabal.mkDerivation (self: {
   pname = "MemoTrie";
   version = "0.4.10";
   sha256 = "1hkraq33sai046gwqlabc9nkz6jbl6vgj0c6lc6j4j5h5d8v08kk";
-  buildDepends = [ Cabal ];
   meta = {
     homepage = "http://haskell.org/haskellwiki/MemoTrie";
     description = "Trie-based memo functions";

pkgs/development/libraries/haskell/MissingH/default.nix

@@ -1,5 +1,5 @@
-{ cabal, Cabal, filepath, hslogger, HUnit, mtl, network, parsec
+{ cabal, filepath, hslogger, HUnit, mtl, network, parsec, random
-, random, regexCompat
+, regexCompat
 }:
 
 cabal.mkDerivation (self: {
@@ -9,7 +9,7 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    Cabal filepath hslogger HUnit mtl network parsec random regexCompat
+    filepath hslogger HUnit mtl network parsec random regexCompat
   ];
   meta = {
     homepage = "http://software.complete.org/missingh";

pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix

@@ -1,10 +1,10 @@
-{ cabal, Cabal, extensibleExceptions, mtl }:
+{ cabal, extensibleExceptions, mtl }:
 
 cabal.mkDerivation (self: {
   pname = "MonadCatchIO-mtl";
   version = "0.3.0.4";
   sha256 = "0wzdrfplwa4v9miv88rg3jvf7l6gphc29lpdp5qjm5873y57jxm7";
-  buildDepends = [ Cabal extensibleExceptions mtl ];
+  buildDepends = [ extensibleExceptions mtl ];
   meta = {
     homepage = "http://darcsden.com/jcpetruzza/MonadCatchIO-mtl";
     description = "Monad-transformer version of the Control.Exception module";

pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix

@@ -1,10 +1,10 @@
-{ cabal, Cabal, extensibleExceptions, transformers }:
+{ cabal, extensibleExceptions, transformers }:
 
 cabal.mkDerivation (self: {
   pname = "MonadCatchIO-transformers";
   version = "0.2.2.3";
   sha256 = "1qwy9rrmf3kl7rb7v46n81xmrwy4xl63lfnlsiz1qc0hybjkl7m6";
-  buildDepends = [ Cabal extensibleExceptions transformers ];
+  buildDepends = [ extensibleExceptions transformers ];
   meta = {
     description = "Monad-transformer compatible version of the Control.Exception module";
     license = self.stdenv.lib.licenses.bsd3;

pkgs/development/libraries/haskell/MonadPrompt/default.nix

@@ -1,10 +1,10 @@
-{ cabal, Cabal, mtl }:
+{ cabal, mtl }:
 
 cabal.mkDerivation (self: {
   pname = "MonadPrompt";
   version = "1.0.0.3";
   sha256 = "0v6svyiajri7c463bz1a1x1nin5s9s7c3s7y0gjc4cn7lhgdsvf2";
-  buildDepends = [ Cabal mtl ];
+  buildDepends = [ mtl ];
   meta = {
     description = "MonadPrompt, implementation & examples";
     license = self.stdenv.lib.licenses.bsd3;

pkgs/development/libraries/haskell/MonadRandom/default.nix

@@ -1,10 +1,10 @@
-{ cabal, Cabal, mtl, random }:
+{ cabal, mtl, random }:
 
 cabal.mkDerivation (self: {
   pname = "MonadRandom";
   version = "0.1.6";
   sha256 = "1429w2h66sf0cw992xj4w9clapcqgpdzmh80as7zxf8l87rarqqp";
-  buildDepends = [ Cabal mtl random ];
+  buildDepends = [ mtl random ];
   meta = {
     description = "Random-number generation monad";
     license = "unknown";

pkgs/development/libraries/haskell/NanoProlog/default.nix

@@ -1,4 +1,4 @@
-{ cabal, Cabal, ListLike, uuParsinglib }:
+{ cabal, ListLike, uuParsinglib }:
 
 cabal.mkDerivation (self: {
   pname = "NanoProlog";
@@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "0wjjwzzc78sj7nsaq1hgxiwv0pc069mxns425lhmrlxcm0vf8fmn";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ Cabal ListLike uuParsinglib ];
+  buildDepends = [ ListLike uuParsinglib ];
   meta = {
     description = "Very small interpreter for a Prolog-like language";
     license = self.stdenv.lib.licenses.bsd3;

pkgs/development/libraries/haskell/NumInstances/default.nix

@@ -1,10 +1,9 @@
-{ cabal, Cabal }:
+{ cabal }:
 
 cabal.mkDerivation (self: {
   pname = "NumInstances";
   version = "1.0";
   sha256 = "1fmg3slwma5f88a2qxj54ny40s67qbdyvsyh506bkp11v54958fy";
-  buildDepends = [ Cabal ];
   meta = {
     description = "Instances of numeric classes for functions and tuples";
     license = self.stdenv.lib.licenses.bsd3;

pkgs/development/libraries/haskell/ObjectName/default.nix

@@ -1,10 +1,9 @@
-{ cabal, Cabal }:
+{ cabal }:
 
 cabal.mkDerivation (self: {
   pname = "ObjectName";
   version = "1.0.0.0";
   sha256 = "0yr1aa0ail2h9qsq2bslcwwq6cxl2lzajmc1laj19r7ks62p32rm";
-  buildDepends = [ Cabal ];
   meta = {
     homepage = "http://www.haskell.org/HOpenGL/";
     description = "Explicitly handled object names";

pkgs/development/libraries/haskell/OneTuple/default.nix

@@ -1,10 +1,9 @@
-{ cabal, Cabal }:
+{ cabal }:
 
 cabal.mkDerivation (self: {
   pname = "OneTuple";
   version = "0.2.1";
   sha256 = "1x52b68zh3k9lnps5s87kzan7dzvqp6mrwgayjq15w9dv6v78vsb";
-  buildDepends = [ Cabal ];
   meta = {
     description = "Singleton Tuple";
     license = self.stdenv.lib.licenses.bsd3;

pkgs/development/libraries/haskell/OpenAL/default.nix

@@ -1,10 +1,10 @@
-{ cabal, Cabal, ObjectName, openal, StateVar, Tensor }:
+{ cabal, ObjectName, openal, StateVar, Tensor }:
 
 cabal.mkDerivation (self: {
   pname = "OpenAL";
   version = "1.4.0.0";
   sha256 = "1vn9r8fd4zwqm8a9d8bgvi9vs1lmygn8sw1rlv819b5wmjwz3ms2";
-  buildDepends = [ Cabal ObjectName StateVar Tensor ];
+  buildDepends = [ ObjectName StateVar Tensor ];
   extraLibraries = [ openal ];
   meta = {
     homepage = "http://connect.creativelabs.com/openal/";

pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix

@@ -1,10 +1,9 @@
-{ cabal, Cabal, libX11, mesa }:
+{ cabal, libX11, mesa }:
 
 cabal.mkDerivation (self: {
   pname = "OpenGL";
   version = "2.2.1.1";
   sha256 = "926ca25cf9502cdaaeb8ade484015468cb60594e1bfbf0e04bd01235d8d9a792";
-  buildDepends = [ Cabal ];
   extraLibraries = [ libX11 mesa ];
   meta = {
     homepage = "http://www.haskell.org/HOpenGL/";

pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix

@@ -1,10 +1,9 @@
-{ cabal, Cabal, libX11, mesa }:
+{ cabal, libX11, mesa }:
 
 cabal.mkDerivation (self: {
   pname = "OpenGL";
   version = "2.2.3.0";
   sha256 = "00h5zdm64mfj5fwnd52kyn9aynsbzqwfic0ymjjakz90pdvk4p57";
-  buildDepends = [ Cabal ];
   extraLibraries = [ libX11 mesa ];
   meta = {
     homepage = "http://www.haskell.org/HOpenGL/";

pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix

@@ -1,14 +1,12 @@
-{ cabal, Cabal, GLURaw, libX11, mesa, ObjectName, OpenGLRaw
+{ cabal, GLURaw, libX11, mesa, ObjectName, OpenGLRaw, StateVar
-, StateVar, Tensor
+, Tensor
 }:
 
 cabal.mkDerivation (self: {
   pname = "OpenGL";
   version = "2.4.0.2";
   sha256 = "00rjvm02p6h8vbyxi3ri4jkk75ki414wk5al2z2fsszjfpdl93b6";
-  buildDepends = [
+  buildDepends = [ GLURaw ObjectName OpenGLRaw StateVar Tensor ];
-    Cabal GLURaw ObjectName OpenGLRaw StateVar Tensor
-  ];
   extraLibraries = [ libX11 mesa ];
   meta = {
     homepage = "http://www.haskell.org/haskellwiki/Opengl";

pkgs/development/libraries/haskell/OpenGL/2.5.0.0.nix

@@ -1,14 +1,12 @@
-{ cabal, Cabal, GLURaw, libX11, mesa, ObjectName, OpenGLRaw
+{ cabal, GLURaw, libX11, mesa, ObjectName, OpenGLRaw, StateVar
-, StateVar, Tensor
+, Tensor
 }:
 
 cabal.mkDerivation (self: {
   pname = "OpenGL";
   version = "2.5.0.0";
   sha256 = "1kpakn5i4aka67mqcpfq9jpl38h409x63zd14y35abpm6h3x8m3j";
-  buildDepends = [
+  buildDepends = [ GLURaw ObjectName OpenGLRaw StateVar Tensor ];
-    Cabal GLURaw ObjectName OpenGLRaw StateVar Tensor
-  ];
   extraLibraries = [ libX11 mesa ];
   meta = {
     homepage = "http://www.haskell.org/haskellwiki/Opengl";

pkgs/development/libraries/haskell/OpenGLRaw/default.nix

@@ -1,10 +1,9 @@
-{ cabal, Cabal, mesa }:
+{ cabal, mesa }:
 
 cabal.mkDerivation (self: {
   pname = "OpenGLRaw";
   version = "1.2.0.0";
   sha256 = "1nwk93wlwh7gz2lb1dc88frmwik71g61a7k8xfiib2q5a8a8kf9r";
-  buildDepends = [ Cabal ];
   extraLibraries = [ mesa ];
   meta = {
     homepage = "http://www.haskell.org/haskellwiki/Opengl";

pkgs/development/libraries/haskell/PSQueue/default.nix

@@ -1,10 +1,9 @@
-{ cabal, Cabal }:
+{ cabal }:
 
 cabal.mkDerivation (self: {
   pname = "PSQueue";
   version = "1.1";
   sha256 = "1k291bh8j5vpcrn6vycww2blwg7jxx9yrfmrqdanz48gs4d8gq58";
-  buildDepends = [ Cabal ];
   meta = {
     description = "Priority Search Queue";
     license = self.stdenv.lib.licenses.bsd3;

pkgs/development/libraries/haskell/Pathfinder/default.nix

@@ -1,10 +1,10 @@
-{ cabal, Cabal, libxml2, text }:
+{ cabal, libxml2, text }:
 
 cabal.mkDerivation (self: {
   pname = "Pathfinder";
   version = "0.5.10";
   sha256 = "1k38p73jnkfcmmz94iqpzg2g6apsxflidvy8p9lwqyzfmg70brqf";
-  buildDepends = [ Cabal text ];
+  buildDepends = [ text ];
   extraLibraries = [ libxml2 ];
   meta = {
     description = "Relational optimiser and code generator";

pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix

@@ -1,10 +1,10 @@
-{ cabal, Cabal, random }:
+{ cabal, random }:
 
 cabal.mkDerivation (self: {
   pname = "QuickCheck";
   version = "1.2.0.0";
   sha256 = "21672d817913ac7ab6d3fd7f102dd5d0f115a0826c95b9604c8c0b0171e8d4ed";
-  buildDepends = [ Cabal random ];
+  buildDepends = [ random ];
   meta = {
     homepage = "http://www.math.chalmers.se/~rjmh/QuickCheck/";
     description = "Automatic testing of Haskell programs";

pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix

@@ -1,10 +1,10 @@
-{ cabal, Cabal, random }:
+{ cabal, random }:
 
 cabal.mkDerivation (self: {
   pname = "QuickCheck";
   version = "1.2.0.1";
   sha256 = "1gxpvbc0ab4n35b5zcbzng8qc7y3mzgym8cj42bci984f08y1bld";
-  buildDepends = [ Cabal random ];
+  buildDepends = [ random ];
   meta = {
     homepage = "http://www.math.chalmers.se/~rjmh/QuickCheck/";
     description = "Automatic testing of Haskell programs";

pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix

@@ -1,10 +1,10 @@
-{ cabal, Cabal, extensibleExceptions, mtl, random }:
+{ cabal, extensibleExceptions, mtl, random }:
 
 cabal.mkDerivation (self: {
   pname = "QuickCheck";
   version = "2.1.1.1";
   sha256 = "626a6f7a69e2bea3b4fe7c573d0bc8da8c77f97035cb2d3a5e1c9fca382b59c9";
-  buildDepends = [ Cabal extensibleExceptions mtl random ];
+  buildDepends = [ extensibleExceptions mtl random ];
   meta = {
     homepage = "http://www.cse.chalmers.se/~koen";
     description = "Automatic testing of Haskell programs";

pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix

@@ -1,10 +1,10 @@
-{ cabal, Cabal, extensibleExceptions, mtl, random }:
+{ cabal, extensibleExceptions, mtl, random }:
 
 cabal.mkDerivation (self: {
   pname = "QuickCheck";
   version = "2.4.0.1";
   sha256 = "1x7jc2svpxbll8qkrbswh5q59sqcjf2v5a6jnqslf5gwr5qpq18r";
-  buildDepends = [ Cabal extensibleExceptions mtl random ];
+  buildDepends = [ extensibleExceptions mtl random ];
   meta = {
     homepage = "http://code.haskell.org/QuickCheck";
     description = "Automatic testing of Haskell programs";

pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix

@@ -1,10 +1,10 @@
-{ cabal, Cabal, extensibleExceptions, random }:
+{ cabal, extensibleExceptions, random }:
 
 cabal.mkDerivation (self: {
   pname = "QuickCheck";
   version = "2.4.1.1";
   sha256 = "06vrn0j26ai2jfl32yd3kx8by4pimcinjf23b0dyc35z2gb139wj";
-  buildDepends = [ Cabal extensibleExceptions random ];
+  buildDepends = [ extensibleExceptions random ];
   meta = {
     homepage = "http://code.haskell.org/QuickCheck";
     description = "Automatic testing of Haskell programs";

pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix

@@ -1,10 +1,10 @@
-{ cabal, Cabal, extensibleExceptions, random }:
+{ cabal, extensibleExceptions, random }:
 
 cabal.mkDerivation (self: {
   pname = "QuickCheck";
   version = "2.4.2";
   sha256 = "17qp73sdp780lha3i6xdsrvgshqz47qwldqknadc0w3vmscw61bg";
-  buildDepends = [ Cabal extensibleExceptions random ];
+  buildDepends = [ extensibleExceptions random ];
   meta = {
     homepage = "http://code.haskell.org/QuickCheck";
     description = "Automatic testing of Haskell programs";

pkgs/development/libraries/haskell/RSA/default.nix

@@ -1,4 +1,4 @@
-{ cabal, binary, Cabal, pureMD5, random, SHA }:
+{ cabal, binary, pureMD5, random, SHA }:
 
 cabal.mkDerivation (self: {
   pname = "RSA";
@@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "0sabvwzgjg6nv5m3x9cjpk5q62r8vhi3kn858ask15frsi7lzhwk";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ binary Cabal pureMD5 random SHA ];
+  buildDepends = [ binary pureMD5 random SHA ];
   meta = {
     description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1.";
     license = self.stdenv.lib.licenses.bsd3;

pkgs/development/libraries/haskell/Ranged-sets/default.nix

@@ -1,10 +1,10 @@
-{ cabal, Cabal, HUnit, QuickCheck }:
+{ cabal, HUnit, QuickCheck }:
 
 cabal.mkDerivation (self: {
   pname = "Ranged-sets";
   version = "0.3.0";
   sha256 = "1am0lsd3yiyn7ayk9k4ff7zdj67m0pxjl10cxi5f9hgjj4y9380l";
-  buildDepends = [ Cabal HUnit QuickCheck ];
+  buildDepends = [ HUnit QuickCheck ];
   meta = {
     homepage = "http://code.haskell.org/ranged-sets";
     description = "Ranged sets for Haskell";

pkgs/development/libraries/haskell/RepLib/default.nix

@@ -1,10 +1,10 @@
-{ cabal, Cabal, mtl, typeEquality }:
+{ cabal, mtl, typeEquality }:
 
 cabal.mkDerivation (self: {
   pname = "RepLib";
   version = "0.5.1";
   sha256 = "1c6zqi87lmmmiz8amsvhw6wkhg90rhh6yl5vh0a9ism3apwh1i7r";
-  buildDepends = [ Cabal mtl typeEquality ];
+  buildDepends = [ mtl typeEquality ];
   noHaddock = true;
   meta = {
     homepage = "http://code.google.com/p/replib/";

pkgs/development/libraries/haskell/SDL-image/default.nix

@@ -1,10 +1,10 @@
-{ cabal, Cabal, SDL, SDL_image }:
+{ cabal, SDL, SDL_image }:
 
 cabal.mkDerivation (self: {
   pname = "SDL-image";
   version = "0.6.1";
   sha256 = "18n6al40db7xalqqr4hp0l26qxxv1kmd8mva0n7vmhg05zypf6ni";
-  buildDepends = [ Cabal SDL ];
+  buildDepends = [ SDL ];
   extraLibraries = [ SDL_image ];
   meta = {
     description = "Binding to libSDL_image";

pkgs/development/libraries/haskell/SDL-mixer/default.nix

@@ -1,10 +1,10 @@
-{ cabal, Cabal, SDL, SDL_mixer }:
+{ cabal, SDL, SDL_mixer }:
 
 cabal.mkDerivation (self: {
   pname = "SDL-mixer";
   version = "0.6.1";
   sha256 = "1fxp5sz0w6pr5047jjvh81wkljxsl7fca239364i50m44mpcsyn1";
-  buildDepends = [ Cabal SDL ];
+  buildDepends = [ SDL ];
   extraLibraries = [ SDL_mixer ];
   meta = {
     description = "Binding to libSDL_mixer";

pkgs/development/libraries/haskell/SDL-ttf/default.nix

@@ -1,10 +1,10 @@
-{ cabal, Cabal, SDL, SDL_ttf }:
+{ cabal, SDL, SDL_ttf }:
 
 cabal.mkDerivation (self: {
   pname = "SDL-ttf";
   version = "0.6.1";
   sha256 = "0n6vbigkjfvvk98bp7ys14snpd1zmbz69ndhhpnrn02h363vwkal";
-  buildDepends = [ Cabal SDL ];
+  buildDepends = [ SDL ];
   extraLibraries = [ SDL_ttf ];
   meta = {
     description = "Binding to libSDL_ttf";

pkgs/development/libraries/haskell/SDL/default.nix

@@ -1,10 +1,9 @@
-{ cabal, Cabal, SDL }:
+{ cabal, SDL }:
 
 cabal.mkDerivation (self: {
   pname = "SDL";
   version = "0.6.2";
   sha256 = "1fqj3sw709q28rmjzcffa3k1mcp7r9cvdrrqmcppaz5yv63ychly";
-  buildDepends = [ Cabal ];
   extraLibraries = [ SDL ];
   meta = {
     description = "Binding to libSDL";

pkgs/development/libraries/haskell/SHA/default.nix

@@ -1,4 +1,4 @@
-{ cabal, binary, Cabal }:
+{ cabal, binary }:
 
 cabal.mkDerivation (self: {
   pname = "SHA";
@@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "12sz1dblmpiy8bg45fwndp1g9gf7494vqqbvbd1hwr5qzyfwyqck";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ binary Cabal ];
+  buildDepends = [ binary ];
   meta = {
     description = "Implementations of the SHA suite of message digest functions";
     license = self.stdenv.lib.licenses.bsd3;

pkgs/development/libraries/haskell/SMTPClient/default.nix

@@ -1,10 +1,10 @@
-{ cabal, Cabal, extensibleExceptions, hsemail, network }:
+{ cabal, extensibleExceptions, hsemail, network }:
 
 cabal.mkDerivation (self: {
   pname = "SMTPClient";
   version = "1.0.4";
   sha256 = "12m0qv8bf0s52yz07sipxlvas8k3xvi1d4lw6960q0nxr40ijyy2";
-  buildDepends = [ Cabal extensibleExceptions hsemail network ];
+  buildDepends = [ extensibleExceptions hsemail network ];
   meta = {
     description = "A simple SMTP client library";
     license = self.stdenv.lib.licenses.bsd3;

pkgs/development/libraries/haskell/Shellac/Shellac-haskeline.nix

@@ -1,10 +1,10 @@
-{ cabal, Cabal, haskeline, mtl, Shellac }:
+{ cabal, haskeline, mtl, Shellac }:
 
 cabal.mkDerivation (self: {
   pname = "Shellac-haskeline";
   version = "0.2.0.1";
   sha256 = "1xvs2ni83yyf7rx3ikmn2bkx20fyj03d03crqyyfw28mikhgv5br";
-  buildDepends = [ Cabal haskeline mtl Shellac ];
+  buildDepends = [ haskeline mtl Shellac ];
   meta = {
     description = "Haskeline backend module for Shellac";
     license = self.stdenv.lib.licenses.bsd3;

pkgs/development/libraries/haskell/Shellac/Shellac-readline.nix

@@ -1,10 +1,10 @@
-{ cabal, Cabal, readline, Shellac }:
+{ cabal, readline, Shellac }:
 
 cabal.mkDerivation (self: {
   pname = "Shellac-readline";
   version = "0.9";
   sha256 = "3edffecf2225c199f0a4df55e3685f7deee47755ae7f8d03f5da7fac3c2ab878";
-  buildDepends = [ Cabal readline Shellac ];
+  buildDepends = [ readline Shellac ];
   meta = {
     description = "Readline backend module for Shellac";
     license = self.stdenv.lib.licenses.bsd3;

pkgs/development/libraries/haskell/Shellac/Shellac.nix

@@ -1,10 +1,10 @@
-{ cabal, Cabal, mtl }:
+{ cabal, mtl }:
 
 cabal.mkDerivation (self: {
   pname = "Shellac";
   version = "0.9.5.1";
   sha256 = "19fpbh5ijy9xc3rhl9qwyan8jfnz9nsqvnsjxb7kkb7l2bpz4qfp";
-  buildDepends = [ Cabal mtl ];
+  buildDepends = [ mtl ];
   meta = {
     homepage = "http://www.cs.princeton.edu/~rdockins/shellac/home/";
     description = "A framework for creating shell envinronments";

pkgs/development/libraries/haskell/StateVar/default.nix

@@ -1,10 +1,9 @@
-{ cabal, Cabal }:
+{ cabal }:
 
 cabal.mkDerivation (self: {
   pname = "StateVar";
   version = "1.0.0.0";
   sha256 = "1c1b6a6nn1cdnba08zzp0645wl482h7yaa69zw2l3wwyyyccjic4";
-  buildDepends = [ Cabal ];
   meta = {
     homepage = "http://www.haskell.org/HOpenGL/";
     description = "State variables";

pkgs/development/libraries/haskell/TableAlgebra/default.nix

@@ -1,10 +1,10 @@
-{ cabal, Cabal, HaXml, mtl }:
+{ cabal, HaXml, mtl }:
 
 cabal.mkDerivation (self: {
   pname = "TableAlgebra";
   version = "0.7.1";
   sha256 = "1jqkjnyznklyiy2shm4c9gix267war1hmsjncdmailhca41fs4bz";
-  buildDepends = [ Cabal HaXml mtl ];
+  buildDepends = [ HaXml mtl ];
   meta = {
     description = "Ferry Table Algebra";
     license = self.stdenv.lib.licenses.bsd3;

pkgs/development/libraries/haskell/Tensor/default.nix

@@ -1,10 +1,9 @@
-{ cabal, Cabal }:
+{ cabal }:
 
 cabal.mkDerivation (self: {
   pname = "Tensor";
   version = "1.0.0.1";
   sha256 = "10arhk5gkn5jxpb53r80bblpk0afdax1fc2mik40hj5g5g960cp9";
-  buildDepends = [ Cabal ];
   meta = {
     homepage = "http://www.haskell.org/HOpenGL/";
     description = "Tensor data types";

pkgs/development/libraries/haskell/Vec/default.nix

@@ -1,10 +1,10 @@
-{ cabal, Cabal, QuickCheck }:
+{ cabal, QuickCheck }:
 
 cabal.mkDerivation (self: {
   pname = "Vec";
   version = "0.9.8";
   sha256 = "0yaqy0p2jh2ajf8897vsxl5w6bmavixn6n5cc7w8kdnybpbdms6v";
-  buildDepends = [ Cabal QuickCheck ];
+  buildDepends = [ QuickCheck ];
   meta = {
     homepage = "http://graphics.cs.ucdavis.edu/~sdillard/Vec";
     description = "Fixed-length lists and low-dimensional linear algebra";

pkgs/development/libraries/haskell/WebBits-Html/1.0.1.nix

@@ -1,10 +1,10 @@
-{ cabal, Cabal, mtl, parsec, syb, WebBits }:
+{ cabal, mtl, parsec, syb, WebBits }:
 
 cabal.mkDerivation (self: {
   pname = "WebBits-Html";
   version = "1.0.1";
   sha256 = "134rmm5ccfsjdr0pdwn2mf81l81rgxapa3wjjfjkxrkxq6hav35n";
-  buildDepends = [ Cabal mtl parsec syb WebBits ];
+  buildDepends = [ mtl parsec syb WebBits ];
   meta = {
     homepage = "http://www.cs.brown.edu/research/plt/";
     description = "JavaScript analysis tools";

pkgs/development/libraries/haskell/WebBits-Html/1.0.2.nix

@@ -1,10 +1,10 @@
-{ cabal, Cabal, mtl, parsec, syb, WebBits }:
+{ cabal, mtl, parsec, syb, WebBits }:
 
 cabal.mkDerivation (self: {
   pname = "WebBits-Html";
   version = "1.0.2";
   sha256 = "18dd52970cd27kra4l89vvrx2mrdbqd4w4f76xrq3142daxsagal";
-  buildDepends = [ Cabal mtl parsec syb WebBits ];
+  buildDepends = [ mtl parsec syb WebBits ];
   meta = {
     homepage = "http://www.cs.brown.edu/research/plt/";
     description = "JavaScript analysis tools";

pkgs/development/libraries/haskell/WebBits/1.0.nix

@@ -1,10 +1,10 @@
-{ cabal, Cabal, mtl, parsec, syb }:
+{ cabal, mtl, parsec, syb }:
 
 cabal.mkDerivation (self: {
   pname = "WebBits";
   version = "1.0";
   sha256 = "1xqk4ajywlaq9nb9a02i7c25na5p2qbpc2k9zw93gbapppjiapsc";
-  buildDepends = [ Cabal mtl parsec syb ];
+  buildDepends = [ mtl parsec syb ];
   meta = {
     homepage = "http://www.cs.brown.edu/research/plt/";
     description = "JavaScript analysis tools";

pkgs/development/libraries/haskell/WebBits/2.0.nix

@@ -1,10 +1,10 @@
-{ cabal, Cabal, mtl, parsec, syb }:
+{ cabal, mtl, parsec, syb }:
 
 cabal.mkDerivation (self: {
   pname = "WebBits";
   version = "2.0";
   sha256 = "14a1rqlq925f6rdbi8yx44xszj5pvskcmw1gi1bj8hbilgmlwi7f";
-  buildDepends = [ Cabal mtl parsec syb ];
+  buildDepends = [ mtl parsec syb ];
   meta = {
     homepage = "http://www.cs.brown.edu/research/plt/";
     description = "JavaScript analysis tools";

pkgs/development/libraries/haskell/WebBits/2.1.nix

@@ -1,10 +1,10 @@
-{ cabal, Cabal, mtl, parsec, syb }:
+{ cabal, mtl, parsec, syb }:
 
 cabal.mkDerivation (self: {
   pname = "WebBits";
   version = "2.1";
   sha256 = "18m19fck9zb6jh8bfd47nja1q6ab1jmd0q5r3k8m5674i6273hyn";
-  buildDepends = [ Cabal mtl parsec syb ];
+  buildDepends = [ mtl parsec syb ];
   meta = {
     homepage = "http://www.cs.brown.edu/research/plt/";
     description = "JavaScript analysis tools";

pkgs/development/libraries/haskell/X11-xft/default.nix

@@ -1,12 +1,11 @@
-{ cabal, Cabal, fontconfig, freetype, libXft, pkgconfig, utf8String
+{ cabal, fontconfig, freetype, libXft, pkgconfig, utf8String, X11
-, X11
 }:
 
 cabal.mkDerivation (self: {
   pname = "X11-xft";
   version = "0.3.1";
   sha256 = "1lgqb0s2qfwwgbvwxhjbi23rbwamzdi0l0slfr20c3jpcbp3zfjf";
-  buildDepends = [ Cabal utf8String X11 ];
+  buildDepends = [ utf8String X11 ];
   extraLibraries = [ fontconfig freetype pkgconfig ];
   pkgconfigDepends = [ libXft ];
   configureFlags = "--extra-include-dirs=${freetype}/include/freetype2";

pkgs/development/libraries/haskell/X11/default.nix

@@ -1,10 +1,10 @@
-{ cabal, Cabal, libX11, libXext, libXinerama, syb }:
+{ cabal, libX11, libXext, libXinerama, syb }:
 
 cabal.mkDerivation (self: {
   pname = "X11";
   version = "1.5.0.1";
   sha256 = "0s8k3lhvlks6i1mwfnm5fimfd2f0sjw9k2p67is3x564kih7mh19";
-  buildDepends = [ Cabal syb ];
+  buildDepends = [ syb ];
   extraLibraries = [ libX11 libXext libXinerama ];
   meta = {
     homepage = "https://github.com/haskell-pkg-janitors/X11";

pkgs/development/libraries/haskell/Zwaluw/default.nix

@@ -1,10 +1,9 @@
-{ cabal, Cabal }:
+{ cabal }:
 
 cabal.mkDerivation (self: {
   pname = "Zwaluw";
   version = "0.1";
   sha256 = "1crvcvni5gzpc1c6cnaqqp0gng1l9gk9d8ac23967nvp82xav7s1";
-  buildDepends = [ Cabal ];
   meta = {
     homepage = "https://github.com/MedeaMelana/Zwaluw";
     description = "Combinators for bidirectional URL routing";

pkgs/development/libraries/haskell/aeson/default.nix

@@ -1,5 +1,5 @@
-{ cabal, attoparsec, blazeBuilder, Cabal, deepseq, dlist, hashable
+{ cabal, attoparsec, blazeBuilder, deepseq, dlist, hashable, mtl
-, mtl, syb, text, time, unorderedContainers, vector
+, syb, text, time, unorderedContainers, vector
 }:
 
 cabal.mkDerivation (self: {
@@ -7,8 +7,8 @@ cabal.mkDerivation (self: {
   version = "0.6.0.0";
   sha256 = "1j8g1q7xr1pgyfyrkbh2zz7fhqshj0q5qg7fczrnsbbzf5k459zw";
   buildDepends = [
-    attoparsec blazeBuilder Cabal deepseq dlist hashable mtl syb text
+    attoparsec blazeBuilder deepseq dlist hashable mtl syb text time
-    time unorderedContainers vector
+    unorderedContainers vector
   ];
   meta = {
     homepage = "https://github.com/bos/aeson";

pkgs/development/libraries/haskell/alternative-io/default.nix

@@ -1,5 +1,4 @@
-{ cabal, Cabal, liftedBase, monadControl, transformers
+{ cabal, liftedBase, monadControl, transformers, transformersBase
-, transformersBase
 }:
 
 cabal.mkDerivation (self: {
@@ -7,7 +6,7 @@ cabal.mkDerivation (self: {
   version = "0.0.0";
   sha256 = "1nfwiw753m8ljrk47yi5cgncbfkddnr4fz44fk1pv501a86cmk8y";
   buildDepends = [
-    Cabal liftedBase monadControl transformers transformersBase
+    liftedBase monadControl transformers transformersBase
   ];
   meta = {
     description = "IO as Alternative instance";

pkgs/development/libraries/haskell/ansi-terminal/default.nix

@@ -1,4 +1,4 @@
-{ cabal, Cabal }:
+{ cabal }:
 
 cabal.mkDerivation (self: {
   pname = "ansi-terminal";
@@ -6,7 +6,6 @@ cabal.mkDerivation (self: {
   sha256 = "09r4nlpmkis6cp30jkymfas13hz6ph4zqxhvigrxn6s76v7nb5a8";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ Cabal ];
   meta = {
     homepage = "http://batterseapower.github.com/ansi-terminal";
     description = "Simple ANSI terminal support, with Windows compatibility";

pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix

@@ -1,4 +1,4 @@
-{ cabal, ansiTerminal, Cabal }:
+{ cabal, ansiTerminal }:
 
 cabal.mkDerivation (self: {
   pname = "ansi-wl-pprint";
@@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "0zrhzkmc5ki6q9ac5l16lhnyf9z2raj78gj9n0a7530rcv4ak3k0";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ ansiTerminal Cabal ];
+  buildDepends = [ ansiTerminal ];
   meta = {
     homepage = "http://github.com/batterseapower/ansi-wl-pprint";
     description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output";