Updated Haskell expressions with the latest version of cabal2nix.

* haskell-dataenc: updated to version 0.14.0.2
 * haskell-fclabels: updated to version 1.0.1

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

pkgs/applications/misc/xmobar/default.nix

@@ -1,4 +1,4 @@
-{ cabal, X11, mtl, parsec, stm, time, utf8String }:
+{ cabal, mtl, parsec, stm, time, utf8String, X11 }:
 
 cabal.mkDerivation (self: {
   pname = "xmobar";
@@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "0ijava0vn2dmc6v57i6x663rvxz3ryb2gqks18qk1qli4k0m3hf7";
   isLibrary = false;
   isExecutable = true;
-  buildDepends = [ X11 mtl parsec stm time utf8String ];
+  buildDepends = [ mtl parsec stm time utf8String X11 ];
   meta = {
     homepage = "http://projects.haskell.org/xmobar/";
     description = "A Minimalistic Text Based Status Bar";

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

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

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

@@ -1,4 +1,4 @@
-{ cabal, X11, X11Xft, extensibleExceptions, mtl, random, utf8String
+{ cabal, extensibleExceptions, mtl, random, utf8String, X11, X11Xft
 , xmonad
 }:
 
@@ -7,7 +7,7 @@ cabal.mkDerivation (self: {
   version = "0.9.2";
   sha256 = "06hg5j4w8iz62wmyygq4c7xcbi9dxlhhh3dbic438cjk7c0w1h5p";
   buildDepends = [
-    X11 X11Xft extensibleExceptions mtl random utf8String xmonad
+    extensibleExceptions mtl random utf8String X11 X11Xft xmonad
   ];
   meta = {
     homepage = "http://xmonad.org/";

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

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

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

@@ -1,4 +1,4 @@
-{ cabal, postgresql, HDBC, mtl, parsec, time, utf8String }:
+{ cabal, HDBC, mtl, parsec, postgresql, time, utf8String }:
 
 cabal.mkDerivation (self: {
   pname = "HDBC-postgresql";

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

@@ -1,4 +1,4 @@
-{ cabal, sqlite, HDBC, mtl, utf8String }:
+{ cabal, HDBC, mtl, sqlite, utf8String }:
 
 cabal.mkDerivation (self: {
   pname = "HDBC-sqlite3";

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

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

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

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

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

@@ -1,4 +1,4 @@
-{ cabal, SHA, binary, pureMD5, random }:
+{ cabal, binary, pureMD5, random, SHA }:
 
 cabal.mkDerivation (self: {
   pname = "RSA";
@@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "1d0birzvapcsgay0wwh5v9mcd77sghj1bps9ws04ww9ga97gyp0l";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ SHA binary pureMD5 random ];
+  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/Shellac/Shellac-haskeline.nix

@@ -1,10 +1,10 @@
-{ cabal, Shellac, haskeline, mtl }:
+{ cabal, haskeline, mtl, Shellac }:
 
 cabal.mkDerivation (self: {
   pname = "Shellac-haskeline";
   version = "0.2.0.1";
   sha256 = "1xvs2ni83yyf7rx3ikmn2bkx20fyj03d03crqyyfw28mikhgv5br";
-  buildDepends = [ Shellac haskeline mtl ];
+  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, Shellac, readline }:
+{ cabal, readline, Shellac }:
 
 cabal.mkDerivation (self: {
   pname = "Shellac-readline";
   version = "0.9";
   sha256 = "3edffecf2225c199f0a4df55e3685f7deee47755ae7f8d03f5da7fac3c2ab878";
-  buildDepends = [ Shellac readline ];
+  buildDepends = [ readline Shellac ];
   meta = {
     description = "Readline backend module for Shellac";
     license = self.stdenv.lib.licenses.bsd3;

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

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

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

@@ -1,7 +1,7 @@
-{ cabal, RSA, SHA, aeson, attoparsec, base64Bytestring
+{ cabal, aeson, attoparsec, base64Bytestring, blazeBuilder
-, blazeBuilder, caseInsensitive, enumerator, failure
+, caseInsensitive, enumerator, failure, httpEnumerator, httpTypes
-, httpEnumerator, httpTypes, network, random, tagsoup, text, time
+, network, random, RSA, SHA, tagsoup, text, time, tls, transformers
-, tls, transformers, xmlEnumerator
+, xmlEnumerator
 }:
 
 cabal.mkDerivation (self: {
@@ -9,9 +9,9 @@ cabal.mkDerivation (self: {
   version = "0.9.2.2";
   sha256 = "0rn1f458ag9mmh55hi873xg5iqypwl6vf6blyaxwbgbp6nm327iz";
   buildDepends = [
-    RSA SHA aeson attoparsec base64Bytestring blazeBuilder
+    aeson attoparsec base64Bytestring blazeBuilder caseInsensitive
-    caseInsensitive enumerator failure httpEnumerator httpTypes network
+    enumerator failure httpEnumerator httpTypes network random RSA SHA
-    random tagsoup text time tls transformers xmlEnumerator
+    tagsoup text time tls transformers xmlEnumerator
   ];
   meta = {
     homepage = "http://github.com/snoyberg/authenticate/tree/master";

pkgs/development/libraries/haskell/cgi/3001.1.8.2.nix

@@ -1,4 +1,4 @@
-{ cabal, MonadCatchIOMtl, extensibleExceptions, mtl, network
+{ cabal, extensibleExceptions, MonadCatchIOMtl, mtl, network
 , parsec, xhtml
 }:
 
@@ -7,7 +7,7 @@ cabal.mkDerivation (self: {
   version = "3001.1.8.2";
   sha256 = "09ly7bn5ck563jq1wip5w628g74xj4p1ha9rllfdck33pqrl2mgz";
   buildDepends = [
-    MonadCatchIOMtl extensibleExceptions mtl network parsec xhtml
+    extensibleExceptions MonadCatchIOMtl mtl network parsec xhtml
   ];
   meta = {
     homepage = "http://andersk.mit.edu/haskell/cgi/";

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

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "dataenc";
-  version = "0.14";
+  version = "0.14.0.2";
-  sha256 = "0q92pzm6wp4rl92ac9b2x2b6na8nzhf229myc9h3cyr3p822liw6";
+  sha256 = "1zym24259d053b7vbxir2l7229gilkg81vvc0wf9605873j6gw5b";
   isLibrary = true;
   isExecutable = true;
   meta = {

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

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "fclabels";
-  version = "1.0";
+  version = "1.0.1";
-  sha256 = "0mc5lbpgyf8m1rpfszj61yhjddxbgk28rx71321jrfqsrzynf4h5";
+  sha256 = "0kmbdlf4v4651sc8igx5i1pg26xryai06l9nvp5vwsmbjcvrajcq";
   buildDepends = [ mtl transformers ];
   meta = {
     description = "First class accessor labels";

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

@@ -1,8 +1,8 @@
-{ cabal, ConfigFile, HStringTemplate, HTTP, SHA, cgi, feed
+{ cabal, cgi, ConfigFile, feed, filestore, ghcPaths
-, filestore, ghcPaths, happstackServer, happstackUtil
+, happstackServer, happstackUtil, highlightingKate, hslogger
-, highlightingKate, hslogger, json, mtl, network, pandoc
+, HStringTemplate, HTTP, json, mtl, network, pandoc, pandocTypes
-, pandocTypes, parsec, random, recaptcha, safe, syb, time, url
+, parsec, random, recaptcha, safe, SHA, syb, time, url, utf8String
-, utf8String, xhtml, xml, xssSanitize, zlib
+, xhtml, xml, xssSanitize, zlib
 }:
 
 cabal.mkDerivation (self: {
@@ -12,10 +12,10 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    ConfigFile HStringTemplate HTTP SHA cgi feed filestore ghcPaths
+    cgi ConfigFile feed filestore ghcPaths happstackServer
-    happstackServer happstackUtil highlightingKate hslogger json mtl
+    happstackUtil highlightingKate hslogger HStringTemplate HTTP json
-    network pandoc pandocTypes parsec random recaptcha safe syb time
+    mtl network pandoc pandocTypes parsec random recaptcha safe SHA syb
-    url utf8String xhtml xml xssSanitize zlib
+    time url utf8String xhtml xml xssSanitize zlib
   ];
   meta = {
     homepage = "http://github.com/jgm/gitit/tree/master";

pkgs/development/libraries/haskell/happstack/happstack-server.nix

@@ -1,6 +1,6 @@
-{ cabal, MaybeT, blazeHtml, extensibleExceptions, happstackData
+{ cabal, blazeHtml, extensibleExceptions, happstackData
-, happstackUtil, hslogger, html, mtl, network, parsec, sendfile
+, happstackUtil, hslogger, html, MaybeT, mtl, network, parsec
-, syb, text, time, utf8String, xhtml, zlib
+, sendfile, syb, text, time, utf8String, xhtml, zlib
 }:
 
 cabal.mkDerivation (self: {
@@ -10,8 +10,8 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    MaybeT blazeHtml extensibleExceptions happstackData happstackUtil
+    blazeHtml extensibleExceptions happstackData happstackUtil hslogger
-    hslogger html mtl network parsec sendfile syb text time utf8String
+    html MaybeT mtl network parsec sendfile syb text time utf8String
     xhtml zlib
   ];
   meta = {

pkgs/development/libraries/haskell/haskell-src-exts/1.11.1.nix

@@ -1,4 +1,4 @@
-{ cabal, happy, cpphs }:
+{ cabal, cpphs, happy }:
 
 cabal.mkDerivation (self: {
   pname = "haskell-src-exts";

pkgs/development/libraries/haskell/haskell-src-exts/1.9.6.nix

@@ -1,4 +1,4 @@
-{ cabal, happy, cpphs }:
+{ cabal, cpphs, happy }:
 
 cabal.mkDerivation (self: {
   pname = "haskell-src-exts";

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

@@ -1,4 +1,4 @@
-{ cabal, HTTP, HaXml, blazeBuilder, dataenc, mtl, network, time
+{ cabal, blazeBuilder, dataenc, HaXml, HTTP, mtl, network, time
 , utf8String
 }:
 
@@ -7,7 +7,7 @@ cabal.mkDerivation (self: {
   version = "3000.8.4";
   sha256 = "0cyf1q1ngz0jqxdrvblcy9iw7l478v0rfr7bgkpq0l4brw0ca1pg";
   buildDepends = [
-    HTTP HaXml blazeBuilder dataenc mtl network time utf8String
+    blazeBuilder dataenc HaXml HTTP mtl network time utf8String
   ];
   meta = {
     homepage = "http://www.haskell.org/haskellwiki/HaXR";

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

@@ -1,5 +1,5 @@
-{ cabal, MonadCatchIOMtl, extensibleExceptions, ghcMtl, ghcPaths
+{ cabal, extensibleExceptions, ghcMtl, ghcPaths, haskellSrc
-, haskellSrc, mtl, random, utf8String
+, MonadCatchIOMtl, mtl, random, utf8String
 }:
 
 cabal.mkDerivation (self: {
@@ -7,7 +7,7 @@ cabal.mkDerivation (self: {
   version = "0.3.3.2";
   sha256 = "1qm74hjz8cxypvavcw7s094zg9ic3r1ll2lj3y159ipc79cw2sn1";
   buildDepends = [
-    MonadCatchIOMtl extensibleExceptions ghcMtl ghcPaths haskellSrc mtl
+    extensibleExceptions ghcMtl ghcPaths haskellSrc MonadCatchIOMtl mtl
     random utf8String
   ];
   meta = {

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

@@ -1,4 +1,4 @@
-{ cabal, HUnit, csv, haskeline, hledgerLib, mtl, parsec, regexpr
+{ cabal, csv, haskeline, hledgerLib, HUnit, mtl, parsec, regexpr
 , safe, split, time, utf8String
 }:
 
@@ -9,7 +9,7 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    HUnit csv haskeline hledgerLib mtl parsec regexpr safe split time
+    csv haskeline hledgerLib HUnit mtl parsec regexpr safe split time
     utf8String
   ];
   meta = {

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

@@ -1,4 +1,4 @@
-{ cabal, openssl, mtl }:
+{ cabal, mtl, openssl }:
 
 cabal.mkDerivation (self: {
   pname = "hopenssl";

pkgs/development/libraries/haskell/monad-par/default.nix

@@ -1,10 +1,10 @@
-{ cabal, HUnit, deepseq }:
+{ cabal, deepseq, HUnit }:
 
 cabal.mkDerivation (self: {
   pname = "monad-par";
   version = "0.1.0.1";
   sha256 = "0sd5w09vi12jwzz8xgh51r27577byr6pqp15dw0z5nhf4w869qxq";
-  buildDepends = [ HUnit deepseq ];
+  buildDepends = [ deepseq HUnit ];
   meta = {
     homepage = "https://github.com/simonmar/monad-par";
     description = "A library for parallel programming based on a monad";

pkgs/development/libraries/haskell/numeric-prelude/default.nix

@@ -1,4 +1,4 @@
-{ cabal, QuickCheck, nonNegative, parsec, random, storableRecord
+{ cabal, nonNegative, parsec, QuickCheck, random, storableRecord
 , utilityHt
 }:
 
@@ -9,7 +9,7 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    QuickCheck nonNegative parsec random storableRecord utilityHt
+    nonNegative parsec QuickCheck random storableRecord utilityHt
   ];
   meta = {
     homepage = "http://www.haskell.org/haskellwiki/Numeric_Prelude";

pkgs/development/libraries/haskell/pandoc/1.6.0.1.nix

@@ -1,4 +1,4 @@
-{ cabal, HTTP, extensibleExceptions, mtl, network, parsec, random
+{ cabal, extensibleExceptions, HTTP, mtl, network, parsec, random
 , syb, texmath, utf8String, xhtml, xml, zipArchive
 }:
 
@@ -9,7 +9,7 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    HTTP extensibleExceptions mtl network parsec random syb texmath
+    extensibleExceptions HTTP mtl network parsec random syb texmath
     utf8String xhtml xml zipArchive
   ];
   meta = {

pkgs/development/libraries/haskell/pandoc/1.8.2.1.nix

@@ -1,6 +1,6 @@
-{ cabal, HTTP, base64Bytestring, citeprocHs, dlist
+{ cabal, base64Bytestring, citeprocHs, dlist, extensibleExceptions
-, extensibleExceptions, json, mtl, network, pandocTypes, parsec
+, HTTP, json, mtl, network, pandocTypes, parsec, random, syb
-, random, syb, tagsoup, texmath, utf8String, xhtml, xml, zipArchive
+, tagsoup, texmath, utf8String, xhtml, xml, zipArchive
 }:
 
 cabal.mkDerivation (self: {
@@ -10,7 +10,7 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    HTTP base64Bytestring citeprocHs dlist extensibleExceptions json
+    base64Bytestring citeprocHs dlist extensibleExceptions HTTP json
     mtl network pandocTypes parsec random syb tagsoup texmath
     utf8String xhtml xml zipArchive
   ];

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

@@ -1,4 +1,4 @@
-{ cabal, sqlite, blazeHtml, enumerator, monadControl, parsec, pool
+{ cabal, blazeHtml, enumerator, monadControl, parsec, pool, sqlite
 , text, time, transformers
 }:
 

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

@@ -1,4 +1,4 @@
-{ cabal, MaybeTTransformers, fclabels, monadsFd, network, pureMD5
+{ cabal, fclabels, MaybeTTransformers, monadsFd, network, pureMD5
 , random, safe, salviaProtocol, split, stm, text, threadmanager
 , time, transformers, utf8String
 }:
@@ -8,7 +8,7 @@ cabal.mkDerivation (self: {
   version = "1.0.0";
   sha256 = "d1be63e3eb7cb071e8e339d730692b3ce52576e513f718b89a194b17878496e1";
   buildDepends = [
-    MaybeTTransformers fclabels monadsFd network pureMD5 random safe
+    fclabels MaybeTTransformers monadsFd network pureMD5 random safe
     salviaProtocol split stm text threadmanager time transformers
     utf8String
   ];

pkgs/development/libraries/haskell/snap/core.nix

@@ -1,7 +1,7 @@
-{ cabal, MonadCatchIOTransformers, attoparsec, attoparsecEnumerator
+{ cabal, attoparsec, attoparsecEnumerator, blazeBuilder
-, blazeBuilder, bytestringMmap, bytestringNums, caseInsensitive
+, bytestringMmap, bytestringNums, caseInsensitive, deepseq, dlist
-, deepseq, dlist, enumerator, mtl, text, time, transformers
+, enumerator, MonadCatchIOTransformers, mtl, text, time
-, unixCompat, vector, zlib
+, transformers, unixCompat, vector, zlib
 }:
 
 cabal.mkDerivation (self: {
@@ -9,9 +9,10 @@ cabal.mkDerivation (self: {
   version = "0.5.3.1";
   sha256 = "0qwlcak1hi4cqyhnks7qqf4zq0rw2486paf0mlasyzb6ba0pwl6m";
   buildDepends = [
-    MonadCatchIOTransformers attoparsec attoparsecEnumerator
+    attoparsec attoparsecEnumerator blazeBuilder bytestringMmap
-    blazeBuilder bytestringMmap bytestringNums caseInsensitive deepseq
+    bytestringNums caseInsensitive deepseq dlist enumerator
-    dlist enumerator mtl text time transformers unixCompat vector zlib
+    MonadCatchIOTransformers mtl text time transformers unixCompat
+    vector zlib
   ];
   meta = {
     homepage = "http://snapframework.com/";

pkgs/development/libraries/haskell/snap/server.nix

@@ -1,8 +1,8 @@
-{ cabal, MonadCatchIOTransformers, PSQueue, attoparsec
+{ cabal, attoparsec, attoparsecEnumerator, binary, blazeBuilder
-, attoparsecEnumerator, binary, blazeBuilder
 , blazeBuilderEnumerator, bytestringNums, caseInsensitive
-, directoryTree, enumerator, mtl, murmurHash, network, snapCore
+, directoryTree, enumerator, MonadCatchIOTransformers, mtl
-, text, time, transformers, unixCompat, vector, vectorAlgorithms
+, murmurHash, network, PSQueue, snapCore, text, time, transformers
+, unixCompat, vector, vectorAlgorithms
 }:
 
 cabal.mkDerivation (self: {
@@ -10,9 +10,9 @@ cabal.mkDerivation (self: {
   version = "0.5.3.1";
   sha256 = "0rbfklgngrpp2aggkmyamfxn9hpnz3bsxd58lw0fi4ls76bagxvz";
   buildDepends = [
-    MonadCatchIOTransformers PSQueue attoparsec attoparsecEnumerator
+    attoparsec attoparsecEnumerator binary blazeBuilder
-    binary blazeBuilder blazeBuilderEnumerator bytestringNums
+    blazeBuilderEnumerator bytestringNums caseInsensitive directoryTree
-    caseInsensitive directoryTree enumerator mtl murmurHash network
+    enumerator MonadCatchIOTransformers mtl murmurHash network PSQueue
     snapCore text time transformers unixCompat vector vectorAlgorithms
   ];
   meta = {

pkgs/development/libraries/haskell/test-framework-hunit/default.nix

@@ -1,10 +1,10 @@
-{ cabal, HUnit, extensibleExceptions, testFramework }:
+{ cabal, extensibleExceptions, HUnit, testFramework }:
 
 cabal.mkDerivation (self: {
   pname = "test-framework-hunit";
   version = "0.2.6";
   sha256 = "1ivgyh71wwvrrgnk3fp6hsfssvy39jikhjdzr7x68pv1ca7f247r";
-  buildDepends = [ HUnit extensibleExceptions testFramework ];
+  buildDepends = [ extensibleExceptions HUnit testFramework ];
   meta = {
     homepage = "http://batterseapower.github.com/test-framework/";
     description = "HUnit support for the test-framework package";

pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix

@@ -1,4 +1,4 @@
-{ cabal, QuickCheck, deepseq, extensibleExceptions, random
+{ cabal, deepseq, extensibleExceptions, QuickCheck, random
 , testFramework
 }:
 
@@ -7,7 +7,7 @@ cabal.mkDerivation (self: {
   version = "0.2.7";
   sha256 = "065nazli8vh9dz8xi71gwzlwy81anfd471jhz6hv3m893cc9vvx8";
   buildDepends = [
-    QuickCheck deepseq extensibleExceptions random testFramework
+    deepseq extensibleExceptions QuickCheck random testFramework
   ];
   meta = {
     homepage = "http://batterseapower.github.com/test-framework/";

pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix

@@ -1,11 +1,11 @@
-{ cabal, QuickCheck, extensibleExceptions, random, testFramework }:
+{ cabal, extensibleExceptions, QuickCheck, random, testFramework }:
 
 cabal.mkDerivation (self: {
   pname = "test-framework-quickcheck2";
   version = "0.2.10";
   sha256 = "12c37m74idjydxshgms9ib9ii2rpvy4647kra2ards1w2jmnr6w3";
   buildDepends = [
-    QuickCheck extensibleExceptions random testFramework
+    extensibleExceptions QuickCheck random testFramework
   ];
   meta = {
     homepage = "http://batterseapower.github.com/test-framework/";

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

@@ -1,10 +1,10 @@
-{ cabal, HUnit, QuickCheck, mtl, random }:
+{ cabal, HUnit, mtl, QuickCheck, random }:
 
 cabal.mkDerivation (self: {
   pname = "testpack";
   version = "2.1.1";
   sha256 = "1z8g3xhvy901h7kr7q4wcms5b23xniskrgxfpq42w4b34acwvhmg";
-  buildDepends = [ HUnit QuickCheck mtl random ];
+  buildDepends = [ HUnit mtl QuickCheck random ];
   meta = {
     homepage = "http://hackage.haskell.org/cgi-bin/hackage-scripts/package/testpack";
     description = "Test Utililty Pack for HUnit and QuickCheck";

pkgs/development/libraries/haskell/yesod-auth/default.nix

@@ -1,6 +1,6 @@
-{ cabal, SHA, aeson, authenticate, blazeHtml, controlMonadAttempt
+{ cabal, aeson, authenticate, blazeHtml, controlMonadAttempt
 , hamlet, httpEnumerator, mimeMail, persistent, persistentTemplate
-, pureMD5, random, text, transformers, wai, webRoutesQuasi
+, pureMD5, random, SHA, text, transformers, wai, webRoutesQuasi
 , yesodCore, yesodForm, yesodJson, yesodPersistent
 }:
 
@@ -9,9 +9,9 @@ cabal.mkDerivation (self: {
   version = "0.4.0.2";
   sha256 = "1vf02kgm3pcak4igvp8009lgv8i8bir272byw0ma2mg6bl0sgyvl";
   buildDepends = [
-    SHA aeson authenticate blazeHtml controlMonadAttempt hamlet
+    aeson authenticate blazeHtml controlMonadAttempt hamlet
     httpEnumerator mimeMail persistent persistentTemplate pureMD5
-    random text transformers wai webRoutesQuasi yesodCore yesodForm
+    random SHA text transformers wai webRoutesQuasi yesodCore yesodForm
     yesodJson yesodPersistent
   ];
   meta = {

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

@@ -1,4 +1,4 @@
-{ cabal, HStringTemplate, HsSyck, csv, pandoc, parsec, split, time
+{ cabal, csv, HsSyck, HStringTemplate, pandoc, parsec, split, time
 , utf8String, xhtml
 }:
 
@@ -9,7 +9,7 @@ cabal.mkDerivation (self: {
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
-    HStringTemplate HsSyck csv pandoc parsec split time utf8String
+    csv HsSyck HStringTemplate pandoc parsec split time utf8String
     xhtml
   ];
   meta = {

pkgs/development/tools/parsing/happy/1.18.5.nix

@@ -1,4 +1,4 @@
-{ cabal, perl, mtl }:
+{ cabal, mtl, perl }:
 
 cabal.mkDerivation (self: {
   pname = "happy";

pkgs/development/tools/parsing/happy/1.18.6.nix

@@ -1,4 +1,4 @@
-{ cabal, perl, mtl }:
+{ cabal, mtl, perl }:
 
 cabal.mkDerivation (self: {
   pname = "happy";