Updated (almost) all Haskell package expressions with cabal2nix.

The new files ...

 * conform to the coding guidelines,

 * consistently specify meta.maintainers and meta.platforms,

 * have proper descriptions and licenses as specified in their Cabal file, and

 * take advantage of the new cabal.nix extensions, i.e. proper
   distinction between buildInputs and propagatedBuildInputs.

Furthermore, the following updates were performed:

 * haskell-Ranged-sets: updated to version 0.3.0
 * haskell-Shellac-haskeline: updated to version 0.2.0.1
 * haskell-cpphs: updated to version 1.12
 * haskell-hslogger: updated to version 1.1.5
 * haskell-xml: updated to version 1.3.9
 * haskell-HDBC-postgresql: updated to version 2.3.2.0
 * haskell-HDBC-sqlite3: updated to version 2.3.3.0
 * haskell-HDBC: updated to version 2.3.1.0
 * haskell-base-unicode-symbols: updated to version 0.2.2.1
 * haskell-convertible: updated to version 1.0.11.0
 * haskell-monad-control: updated to version 0.2.0.2
 * haskell-murmur-hash: updated to version 0.1.0.4
 * haskell-repa: updated to version 2.1.1.3
 * haskell-statistics: updated to version 0.9.0.0
 * haskell-ansi-terminal: updated to version 0.5.5

haskell-maybench was dropped, because it cannot be built with recent
versions of Cabal:

   Configuring maybench-0.2.4.1...
   Setup: At least the following dependencies are missing:
   Cabal >=1.2 && <1.5

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

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

@@ -1,13 +1,16 @@
-{cabal}:
+{ cabal }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "AC-Vector";
   version = "2.3.1";
   sha256 = "0nmj57czqcik23j9iqxbdwqg73n5n1kc9akhp0wywrbkklgf79a0";
   meta = {
-    description = "Efficient geometric vectors and transformations";
+    description = "Efficient geometric vectors and transformations.";
-    license = "BSD";
+    license = self.stdenv.lib.licenses.bsd3;
-    maintainers = [self.stdenv.lib.maintainers.andres];
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
-

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

@@ -1,18 +1,25 @@
-{cabal, QuickCheck, binary, haskeline, haskellSrcExts, mtl, utf8String,
+{ cabal, alex, happy, QuickCheck, binary, haskeline, haskellSrcExts
- syb, xhtml, zlib,
+, mtl, syb, xhtml, zlib
- happy, alex}:
+}:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "Agda";
   version = "2.2.10";
   sha256 = "1bh96g5c6b6jzaf3m9gm0vr64avgi86kb45p8i1vg1jbfjdbdlsw";
-  extraBuildInputs = [happy alex];
+  isLibrary = true;
-  propagatedBuildInputs =
+  isExecutable = true;
-    [QuickCheck binary haskeline haskellSrcExts mtl utf8String
+  buildDepends = [
-     syb xhtml zlib];
+    QuickCheck binary haskeline haskellSrcExts mtl syb xhtml zlib
+  ];
+  buildTools = [ alex happy ];
   meta = {
-    description = "A dependently typed functional language and proof assistant";
+    homepage = "http://wiki.portal.chalmers.se/agda/";
-    maintainers = [self.stdenv.lib.maintainers.andres];
+    description = "A dependently typed functional programming language and proof assistant";
+    license = "unknown";
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
-

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

@@ -1,18 +1,18 @@
-{cabal, HList, mtl} :
+{ cabal, HList, mtl }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "AspectAG";
   version = "0.3.3";
   sha256 = "06vmdg72f7v11603a0y6f5wq5lydi5inx1d98nwgpp4vj8y138j1";
-  propagatedBuildInputs = [ 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";
     license = "LGPL";
     platforms = self.ghc.meta.platforms;
     maintainers = [
-      self.stdenv.lib.maintainers.simons
       self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
     ];
   };
 })

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

@@ -1,13 +1,16 @@
-{cabal}:
+{ cabal }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "Boolean";
   version = "0.0.1";
   sha256 = "dafcfb2e9d7f7aa24a3d3ceb385424176297cdf6f6044028d42d0fea1cae7765";
   meta = {
     description = "Generalized booleans";
-    license = "BSD";
+    license = self.stdenv.lib.licenses.bsd3;
-    maintainers = [self.stdenv.lib.maintainers.andres];
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
-

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

@@ -1,15 +1,22 @@
-{cabal, cairo, colour, dataAccessor, dataAccessorTemplate, gtk, mtl}:
+{ cabal, cairo, colour, dataAccessor, dataAccessorTemplate, gtk
+, mtl, time
+}:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "Chart";
   version = "0.14";
   sha256 = "0ji81j4c2by5zyrdhx1s17j6kqsi3ngr9y1zh7hr9wv7jsrj3rf2";
-  propagatedBuildInputs =
+  buildDepends = [
-    [cairo colour dataAccessor dataAccessorTemplate gtk mtl];
+    cairo colour dataAccessor dataAccessorTemplate gtk mtl time
+  ];
   meta = {
+    homepage = "http://www.dockerz.net/software/chart.html";
     description = "A library for generating 2D Charts and Plots";
-    license = "BSD";
+    license = self.stdenv.lib.licenses.bsd3;
-    maintainers = [self.stdenv.lib.maintainers.andres];
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
-

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

@@ -1,14 +1,20 @@
-{cabal, mtl, parsec, MissingH}:
+{ cabal, MissingH, mtl, parsec }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "ConfigFile";
   version = "1.0.6";
   sha256 = "339722184b86d53d8b361933e572b6e1478824c7eba3fb66b67d0eb5245cd038";
-  propagatedBuildInputs = [mtl parsec MissingH];
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ MissingH mtl parsec ];
   meta = {
+    homepage = "http://software.complete.org/configfile";
     description = "Configuration file reading & writing";
     license = "LGPL";
-    maintainers = [self.stdenv.lib.maintainers.andres];
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
-

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

@@ -1,15 +1,18 @@
-{cabal, HTTP, json, mtl, network} :
+{ cabal, HTTP, json, mtl, network }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "CouchDB";
   version = "0.10.1";
   sha256 = "1ny62ab0sjrkh7mpxj0ahqrv7c8dh0n5s1g8xl0mq3yiwlrjdsim";
-  propagatedBuildInputs = [ HTTP json mtl network ];
+  buildDepends = [ HTTP json mtl network ];
   meta = {
     homepage = "http://github.com/arjunguha/haskell-couchdb/";
     description = "CouchDB interface";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.simons ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

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

@@ -1,14 +1,19 @@
-{cabal, HUnit, QuickCheck} :
+{ cabal, HUnit, QuickCheck }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "Crypto";
   version = "4.2.3";
   sha256 = "02wi8lyi27i8cdj8vclrl7vcng38srdzz9qpqwsc4y4lmvgg82br";
-  propagatedBuildInputs = [ HUnit QuickCheck ];
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ HUnit QuickCheck ];
   meta = {
     description = "Collects together existing Haskell cryptographic functions into a package";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.simons ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

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

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

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

@@ -1,13 +1,17 @@
-{cabal}:
+{ cabal }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "GlomeVec";
   version = "0.1.2";
   sha256 = "6023c11977bf16baf487235087e94f5a2f465e8403b8e40ab513e7879dd52639";
   meta = {
+    homepage = "http://www.haskell.org/haskellwiki/Glome";
     description = "Simple 3D vector library";
     license = "GPL";
-    maintainers = [self.stdenv.lib.maintainers.andres];
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
-

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

@@ -1,14 +1,20 @@
-{cabal, bktrees, fgl, graphviz, pandoc} :
+{ cabal, bktrees, extensibleExceptions, fgl, graphviz, pandoc, time
+}:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "Graphalyze";
   version = "0.11.0.0";
   sha256 = "1aplfd0qp7ypr9rh4v4x5g8f4b0d1w0dcgz7hgjm9haqcsv37a79";
-  propagatedBuildInputs = [ bktrees fgl graphviz pandoc ];
+  buildDepends = [
+    bktrees extensibleExceptions fgl graphviz pandoc time
+  ];
   meta = {
     description = "Graph-Theoretic Analysis library.";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.simons ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

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

@@ -1,12 +1,21 @@
-{cabal, HDBC, postgresql, parsec}:
+{ cabal, postgresql, HDBC, mtl, parsec, time, utf8String }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "HDBC-postgresql";
-  version = "2.2.3.3";
+  version = "2.3.2.0";
-  sha256 = "1wh3pwqgxilz4v108q88z1gcqyzxp1fzd47s6g4857m1fzbdj7an";
+  sha256 = "0fwza9h2ghl70x44c4snfybnnfsj1mwlf5a1x12ddl1fbj6fx6gs";
-  propagatedBuildInputs = [HDBC parsec postgresql];
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ HDBC mtl parsec time utf8String ];
+  extraLibraries = [ postgresql ];
   meta = {
-    description = "This package provides a PostgreSQL driver for HDBC";
+    homepage = "http://software.complete.org/hdbc-postgresql";
+    description = "PostgreSQL driver for HDBC";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
-

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

@@ -1,12 +1,21 @@
-{cabal, HDBC, sqlite, mtl, utf8String}:
+{ cabal, sqlite, HDBC, mtl, utf8String }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "HDBC-sqlite3";
-  version = "2.3.1.0";
+  version = "2.3.3.0";
-  sha256 = "0w90mnbl71hfwgscky25gy22w1arj9v3fyj8sy8cm7bkfbs70m8c";
+  sha256 = "11765nsncgyv9j6r5wpziqyhy0lxrmqbhgricbdx0c788ky75y92";
-  propagatedBuildInputs = [HDBC sqlite mtl utf8String];
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ HDBC mtl utf8String ];
+  extraLibraries = [ sqlite ];
   meta = {
-    description = "This is the Sqlite v3 driver for HDBC, the generic database access system for Haskell";
+    homepage = "http://software.complete.org/hdbc-sqlite3";
+    description = "Sqlite v3 driver for HDBC";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
-

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

@@ -1,12 +1,20 @@
-{cabal, HUnit, QuickCheck, mtl, time, utf8String, convertible, text, testpack}:
+{ cabal, convertible, mtl, text, time, utf8String }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "HDBC";
-  version = "2.2.7.0";
+  version = "2.3.1.0";
-  sha256 = "10bkmrd48knkr1zsm3fmnp7ah9y13pjwaya7z1f93sg29jq3k906";
+  sha256 = "1y3qcc0ids9k3af4qkhabwg82q03a21wl4vdqhj1h0zmf08b3m6k";
-  propagatedBuildInputs =
+  isLibrary = true;
-    [HUnit QuickCheck mtl time utf8String convertible text testpack];
+  isExecutable = true;
+  buildDepends = [ convertible mtl text time utf8String ];
   meta = {
-    description = "HDBC provides an abstraction layer between Haskell programs and SQL relational databases";
+    homepage = "https://github.com/jgoerzen/hdbc/wiki";
+    description = "Haskell Database Connectivity";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

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

@@ -1,14 +1,17 @@
-{cabal, X11} :
+{ cabal, X11 }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "HGL";
   version = "3.2.0.2";
   sha256 = "13wcvf6bfii9pihr8m08b81fyslf5n587ds4zzgizbd8m38k81vz";
-  propagatedBuildInputs = [ X11 ];
+  buildDepends = [ X11 ];
   meta = {
     description = "A simple graphics library based on X11 or Win32";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.simons ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

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

@@ -1,11 +1,16 @@
-{cabal}:
+{ cabal }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "HList";
   version = "0.2.3";
   sha256 = "1efbe0c2cb361ab0a9d864a09f9c58075132cb50094207260cb1363fe73c2908";
   meta = {
     description = "Heterogeneous lists";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
-

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

@@ -1,12 +1,21 @@
-{cabal, parsec, time, text, utf8String, parallel, syb}:
+{ cabal, deepseq, mtl, parsec, syb, sybWithClass, text, time
+, utf8String
+}:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "HStringTemplate";
   version = "0.6.6";
   sha256 = "1ian79az5q6m08pwb5fks52ffs4h2mq02kkcwmr6jb7i0ha2k2si";
-  propagatedBuildInputs = [parsec time text utf8String parallel syb];
+  buildDepends = [
+    deepseq mtl parsec syb sybWithClass text time utf8String
+  ];
   meta = {
-    description = "StringTemplate implementation in Haskell";
+    description = "StringTemplate implementation in Haskell.";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
-

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

@@ -1,12 +1,18 @@
-{cabal, mtl, network, parsec}:
+{ cabal, network, parsec }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "HTTP";
   version = "3001.1.5";
   sha256 = "e34d9f979bafbbf2e45bf90a9ee9bfd291f3c67c291a250cc0a6378431578aeb";
-  propagatedBuildInputs = [mtl network parsec];
+  buildDepends = [ network parsec ];
   meta = {
-    description = "a Haskell library for client-side HTTP";
+    homepage = "http://www.haskell.org/http/";
+    description = "A library for client-side HTTP";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
-

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

@@ -1,12 +1,18 @@
-{cabal, mtl, network, parsec}:
+{ cabal, mtl, network, parsec }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "HTTP";
-  version = "4000.0.6"; # Haskell Platform 2009.1.1
+  version = "4000.0.6";
   sha256 = "75af1ac4dc21b10c8a1a54a33179ea822e591887bab7278360a3d6b38304d39b";
-  propagatedBuildInputs = [mtl network parsec];
+  buildDepends = [ mtl network parsec ];
   meta = {
-    description = "a Haskell library for client-side HTTP";
+    homepage = "http://projects.haskell.org/http/";
+    description = "A library for client-side HTTP";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
-

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

@@ -1,12 +1,18 @@
-{cabal, mtl, network, parsec}:
+{ cabal, mtl, network, parsec }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "HTTP";
-  version = "4000.0.9"; # Haskell Platform 2010.1.0.0 and 2010.2.0.0
+  version = "4000.0.9";
   sha256 = "1e2b4a8b782ad1417c8755bb0d248851bc142b351366ed460e07f2945a5e95ba";
-  propagatedBuildInputs = [mtl network parsec];
+  buildDepends = [ mtl network parsec ];
   meta = {
-    description = "a Haskell library for client-side HTTP";
+    homepage = "http://projects.haskell.org/http/";
+    description = "A library for client-side HTTP";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
-

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

@@ -1,12 +1,18 @@
-{cabal, mtl, network, parsec}:
+{ cabal, mtl, network, parsec }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "HTTP";
-  version = "4000.1.1"; # Haskell Platform 2011.2.0.0
+  version = "4000.1.1";
   sha256 = "09khx5fb673a0d7m3bl39xjdxvc60m52rmm4865cha2mby0zidy3";
-  propagatedBuildInputs = [mtl network parsec];
+  buildDepends = [ mtl network parsec ];
   meta = {
-    description = "a Haskell library for client-side HTTP";
+    homepage = "http://projects.haskell.org/http/";
+    description = "A library for client-side HTTP";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
-

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

@@ -1,11 +1,17 @@
-{cabal}:
+{ cabal }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "HUnit";
-  version = "1.2.0.3"; # Haskell Platform 2009.0.0
+  version = "1.2.0.3";
   sha256 = "954f584f7c096c3ddef677e70b3811195bb4fd18dfdb4727a260ca7d7465de12";
   meta = {
+    homepage = "http://hunit.sourceforge.net/";
     description = "A unit testing framework for Haskell";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
-

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

@@ -1,11 +1,19 @@
-{cabal}:
+{ cabal }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "HUnit";
-  version = "1.2.2.1"; # Haskell Platform 2010.1.0.0 and 2010.2.0.0
+  version = "1.2.2.1";
   sha256 = "47235503b666658588181795540d29212283059b21edc42e1b4f1998e46ac853";
+  isLibrary = true;
+  isExecutable = true;
   meta = {
+    homepage = "http://hunit.sourceforge.net/";
     description = "A unit testing framework for Haskell";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
-

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

@@ -1,11 +1,19 @@
-{cabal}:
+{ cabal }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "HUnit";
-  version = "1.2.2.3"; # Haskell Platform 2011.2.0.0
+  version = "1.2.2.3";
   sha256 = "158i6s014ybh5bflzspd21qzdlhdyk89yqpmk8kwc59lxjvvjsxz";
+  isLibrary = true;
+  isExecutable = true;
   meta = {
+    homepage = "http://hunit.sourceforge.net/";
     description = "A unit testing framework for Haskell";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
-

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

@@ -1,11 +1,19 @@
-{cabal}:
+{ cabal }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "HaXml";
   version = "1.13.3";
   sha256 = "08d9wy0rg9m66dd10x0zvkl74l25vxdakz7xp3j88s2gd31jp1v0";
+  isLibrary = true;
+  isExecutable = true;
   meta = {
-    description = "Haskell utilities for parsing, filtering, transforming and generating XML documents.";
+    homepage = "http://www.cs.york.ac.uk/fp/HaXml/";
+    description = "Utilities for manipulating XML documents";
+    license = "LGPL";
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
-

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

@@ -1,12 +1,20 @@
-{cabal, polyparse}:
+{ cabal, polyparse }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "HaXml";
   version = "1.20.2";
   sha256 = "05kmr2ablinnrg3x1xr19g5kzzby322lblvcvhwbkv26ajwi0b63";
-  propagatedBuildInputs = [polyparse];
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ polyparse ];
   meta = {
-    description = "Haskell utilities for parsing, filtering, transforming and generating XML documents.";
+    homepage = "http://www.cs.york.ac.uk/fp/HaXml/";
+    description = "Utilities for manipulating XML documents";
+    license = "LGPL";
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
-

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

@@ -1,14 +1,20 @@
-{cabal, polyparse}:
+{ cabal, polyparse }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "HaXml";
   version = "1.22.3";
   sha256 = "10gbax7nih45ck5fg056gnfgzr7zyndxpvdhvx3af2wnrmilkcbh";
-  propagatedBuildInputs = [polyparse];
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ polyparse ];
   meta = {
-    description = "Haskell utilities for parsing, filtering, transforming and generating XML documents.";
+    homepage = "http://www.cs.york.ac.uk/fp/HaXml/";
+    description = "Utilities for manipulating XML documents";
+    license = "LGPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.simons ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
-

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

@@ -1,15 +1,18 @@
-{cabal, StateVar, transformers} :
+{ cabal, StateVar, transformers }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "Hipmunk";
   version = "5.2.0.2";
   sha256 = "18ly05q953x59smqqrhwjlfa1v6lqma0xiarmr689i63zzb7ji8z";
-  propagatedBuildInputs = [ StateVar transformers ];
+  buildDepends = [ StateVar transformers ];
   meta = {
     homepage = "http://patch-tag.com/r/felipe/hipmunk/home";
     description = "A Haskell binding for Chipmunk.";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.simons ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

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

@@ -1,14 +1,17 @@
-{cabal, syb, utf8String} :
+{ cabal, syb, utf8String }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "HsSyck";
   version = "0.50";
   sha256 = "0ap675i2fngvd1nw1dk8p2fz4nbd2aq5ci8dsvpcjbp28y9j2blm";
-  propagatedBuildInputs = [ syb utf8String ];
+  buildDepends = [ syb utf8String ];
   meta = {
     description = "Fast, lightweight YAML loader and dumper";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.simons ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

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

@@ -1,13 +1,20 @@
-{cabal, WebBits, WebBitsHtml}:
+{ cabal, WebBits, WebBitsHtml, mtl, parsec, syb }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "JsContracts";
   version = "0.5.3";
   sha256 = "17l6kdpdc7lrpd9j4d2b6vklkpclshcjy6hzpi442b7pj96sn589";
-
+  isLibrary = true;
-  propagatedBuildInputs = [ WebBits WebBitsHtml ];
+  isExecutable = true;
-
+  buildDepends = [ WebBits WebBitsHtml mtl parsec syb ];
   meta = {
-    description = "Design-by-contract for JavaScript.";
+    homepage = "http://www.cs.brown.edu/research/plt/";
+    description = "Design-by-contract for JavaScript";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

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

@@ -1,17 +1,19 @@
-{cabal} :
+{ cabal }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "ListLike";
   version = "3.1.1";
   sha256 = "16q1rsjr9rjlm8iwmr32s1yfcpw0xj34hvb8jfjqyfsail6nh9fh";
+  isLibrary = true;
+  isExecutable = true;
   meta = {
     homepage = "http://software.complete.org/listlike";
     description = "Generic support for list-like structures";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [
-      self.stdenv.lib.maintainers.simons
       self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
     ];
   };
 })

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

@@ -1,17 +1,17 @@
-{cabal, monadsFd, transformers} :
+{ cabal, monadsFd, transformers }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "MaybeT-transformers";
   version = "0.2";
   sha256 = "189w8dpxyq7gksca6k08hb4vpanpz06c99akgzpcpjy0i7k22ily";
-  propagatedBuildInputs = [ monadsFd transformers ];
+  buildDepends = [ monadsFd transformers ];
   meta = {
     description = "MaybeT monad transformer using transformers instead of mtl.";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [
-      self.stdenv.lib.maintainers.simons
       self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
     ];
   };
 })

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

@@ -1,14 +1,17 @@
-{cabal, mtl}:
+{ cabal, mtl }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "MaybeT";
   version = "0.1.2";
   sha256 = "995e61165122656807d84174e5c1516340fd7ddeba6571c20751352a8476b632";
-  propagatedBuildInputs = [mtl];
+  buildDepends = [ mtl ];
   meta = {
     description = "MaybeT monad transformer";
-    license = "BSD";
+    license = self.stdenv.lib.licenses.bsd3;
-    maintainers = [self.stdenv.lib.maintainers.andres];
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
-

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

@@ -1,6 +1,6 @@
-{cabal} :
+{ cabal }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "MemoTrie";
   version = "0.4.10";
   sha256 = "1hkraq33sai046gwqlabc9nkz6jbl6vgj0c6lc6j4j5h5d8v08kk";
@@ -10,8 +10,8 @@ cabal.mkDerivation (self : {
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [
-      self.stdenv.lib.maintainers.simons
       self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
     ];
   };
 })

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

@@ -1,14 +1,20 @@
-{cabal, HUnit, hslogger, network, parsec, regexCompat}:
+{ cabal, HUnit, hslogger, mtl, network, parsec, regexCompat }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "MissingH";
   version = "1.1.0.3";
   sha256 = "2d566511e8a347189cf864188d97f8406c6958c6f0a6fcf8cb1593c6bae13dbf";
-  propagatedBuildInputs = [HUnit hslogger network parsec regexCompat];
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ HUnit hslogger mtl network parsec regexCompat ];
   meta = {
+    homepage = "http://software.complete.org/missingh";
     description = "Large utility library";
     license = "GPL";
-    maintainers = [self.stdenv.lib.maintainers.andres];
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
-

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

@@ -1,15 +1,18 @@
-{cabal, mtl} :
+{ cabal, extensibleExceptions, mtl }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "MonadCatchIO-mtl";
   version = "0.3.0.3";
   sha256 = "0sqvdrvl1z6y176jwxv02aam4fz2awmqyjba803w816pp9m9a5pr";
-  propagatedBuildInputs = [ mtl ];
+  buildDepends = [ extensibleExceptions mtl ];
   meta = {
     homepage = "http://code.haskell.org/~jcpetruzza/MonadCatchIO-mtl";
     description = "Monad-transformer version of the Control.Exception module";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.simons ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

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

@@ -1,14 +1,17 @@
-{cabal, transformers} :
+{ cabal, extensibleExceptions, transformers }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "MonadCatchIO-transformers";
   version = "0.2.2.2";
   sha256 = "083c0abwja447j0p8q0j15iv7bshchy83rfqw07b2hfy38467h9g";
-  propagatedBuildInputs = [ transformers ];
+  buildDepends = [ extensibleExceptions transformers ];
   meta = {
     description = "Monad-transformer compatible version of the Control.Exception module";
     license = self.stdenv.lib.licenses.publicDomain;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.simons ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

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

@@ -1,17 +1,17 @@
-{cabal, mtl} :
+{ cabal, mtl }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "MonadPrompt";
   version = "1.0.0.3";
   sha256 = "0v6svyiajri7c463bz1a1x1nin5s9s7c3s7y0gjc4cn7lhgdsvf2";
-  propagatedBuildInputs = [ mtl ];
+  buildDepends = [ mtl ];
   meta = {
     description = "MonadPrompt, implementation & examples";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [
-      self.stdenv.lib.maintainers.simons
       self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
     ];
   };
 })

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

@@ -1,14 +1,17 @@
-{cabal, mtl} :
+{ cabal, mtl }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "MonadRandom";
   version = "0.1.6";
   sha256 = "1429w2h66sf0cw992xj4w9clapcqgpdzmh80as7zxf8l87rarqqp";
-  propagatedBuildInputs = [ mtl ];
+  buildDepends = [ mtl ];
   meta = {
     description = "Random-number generation monad.";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.simons ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

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

@@ -1,6 +1,6 @@
-{cabal} :
+{ cabal }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "ObjectName";
   version = "1.0.0.0";
   sha256 = "0yr1aa0ail2h9qsq2bslcwwq6cxl2lzajmc1laj19r7ks62p32rm";
@@ -9,6 +9,9 @@ cabal.mkDerivation (self : {
     description = "Explicitly handled object names";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.simons ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

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

@@ -1,13 +1,16 @@
-{cabal}:
+{ cabal }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "OneTuple";
   version = "0.2.1";
   sha256 = "1x52b68zh3k9lnps5s87kzan7dzvqp6mrwgayjq15w9dv6v78vsb";
   meta = {
     description = "Singleton Tuple";
-    license = "BSD";
+    license = self.stdenv.lib.licenses.bsd3;
-    maintainers = [self.stdenv.lib.maintainers.andres];
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
-

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

@@ -1,12 +1,16 @@
-{cabal}:
+{ cabal }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "PSQueue";
   version = "1.1";
   sha256 = "1k291bh8j5vpcrn6vycww2blwg7jxx9yrfmrqdanz48gs4d8gq58";
   meta = {
-    description = "Priority Search Queue implementation for Haskell";
+    description = "Priority Search Queue";
-    license = "BSD";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
-

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

@@ -1,14 +1,19 @@
-{cabal, SHA, binary, pureMD5} :
+{ cabal, SHA, binary, pureMD5 }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "RSA";
   version = "1.0.6.1";
   sha256 = "1d0birzvapcsgay0wwh5v9mcd77sghj1bps9ws04ww9ga97gyp0l";
-  propagatedBuildInputs = [ SHA binary pureMD5 ];
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ SHA binary pureMD5 ];
   meta = {
     description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1.";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

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

@@ -1,14 +1,18 @@
-{cabal, HUnit, QuickCheck}:
+{ cabal, HUnit, QuickCheck }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "Ranged-sets";
-  version = "0.2.1";
+  version = "0.3.0";
-  sha256 = "dee83d2ea0ae56ff31eb7c74a0785328ca8621792c0859e223b12c17bb775f12";
+  sha256 = "1am0lsd3yiyn7ayk9k4ff7zdj67m0pxjl10cxi5f9hgjj4y9380l";
-  propagatedBuildInputs = [HUnit QuickCheck];
+  buildDepends = [ HUnit QuickCheck ];
   meta = {
+    homepage = "http://code.haskell.org/ranged-sets";
     description = "Ranged sets for Haskell";
-    license = "BSD";
+    license = self.stdenv.lib.licenses.bsd3;
-    maintainers = [self.stdenv.lib.maintainers.andres];
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
-

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

@@ -1,12 +1,19 @@
-{cabal, binary}:
+{ cabal, binary }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "SHA";
   version = "1.4.1.3";
   sha256 = "1sx68mvzb2y3dq9hk769fzp8vw4jf4hk5v45i0a9a8b31imlicf0";
-  propagatedBuildInputs = [binary];
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ binary ];
   meta = {
     description = "Implementations of the SHA suite of message digest functions";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
-

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

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

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

@@ -1,12 +1,17 @@
-{cabal, Shellac, haskeline}:
+{ cabal, Shellac, haskeline, mtl }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "Shellac-haskeline";
-  version = "0.2";
+  version = "0.2.0.1";
-  sha256 = "e3024b1915efd9841be9f405503f26c52524e7ea2a9c630ad651a9986e5329e0";
+  sha256 = "1xvs2ni83yyf7rx3ikmn2bkx20fyj03d03crqyyfw28mikhgv5br";
-  propagatedBuildInputs = [Shellac haskeline];
+  buildDepends = [ Shellac haskeline mtl ];
   meta = {
     description = "Haskeline backend module for Shellac";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
-

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

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

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

@@ -1,15 +1,18 @@
-{cabal, mtl} :
+{ cabal, mtl }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "Shellac";
   version = "0.9.5.1";
   sha256 = "19fpbh5ijy9xc3rhl9qwyan8jfnz9nsqvnsjxb7kkb7l2bpz4qfp";
-  propagatedBuildInputs = [ mtl ];
+  buildDepends = [ mtl ];
   meta = {
     homepage = "http://www.cs.princeton.edu/~rdockins/shellac/home/";
     description = "A framework for creating shell envinronments";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.simons ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

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

@@ -1,6 +1,6 @@
-{cabal} :
+{ cabal }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "StateVar";
   version = "1.0.0.0";
   sha256 = "1c1b6a6nn1cdnba08zzp0645wl482h7yaa69zw2l3wwyyyccjic4";
@@ -8,5 +8,10 @@ cabal.mkDerivation (self : {
     homepage = "http://www.haskell.org/HOpenGL/";
     description = "State variables";
     license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

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

@@ -1,6 +1,6 @@
-{cabal} :
+{ cabal }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "Tensor";
   version = "1.0.0.1";
   sha256 = "10arhk5gkn5jxpb53r80bblpk0afdax1fc2mik40hj5g5g960cp9";
@@ -9,6 +9,9 @@ cabal.mkDerivation (self : {
     description = "Tensor data types";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.simons ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

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

@@ -1,18 +1,18 @@
-{cabal, QuickCheck} :
+{ cabal, QuickCheck }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "Vec";
   version = "0.9.8";
   sha256 = "0yaqy0p2jh2ajf8897vsxl5w6bmavixn6n5cc7w8kdnybpbdms6v";
-  propagatedBuildInputs = [ QuickCheck ];
+  buildDepends = [ QuickCheck ];
   meta = {
     homepage = "http://graphics.cs.ucdavis.edu/~sdillard/Vec";
     description = "Fixed-length lists and low-dimensional linear algebra.";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [
-      self.stdenv.lib.maintainers.simons
       self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
     ];
   };
 })

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

@@ -1,15 +1,18 @@
-{cabal, WebBits, mtl, parsec, syb} :
+{ cabal, WebBits, mtl, parsec, syb }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "WebBits-Html";
   version = "1.0.2";
   sha256 = "18dd52970cd27kra4l89vvrx2mrdbqd4w4f76xrq3142daxsagal";
-  propagatedBuildInputs = [ WebBits mtl parsec syb ];
+  buildDepends = [ WebBits mtl parsec syb ];
   meta = {
     homepage = "http://www.cs.brown.edu/research/plt/";
     description = "JavaScript analysis tools";
     license = "LGPL";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.simons ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

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

@@ -1,13 +1,18 @@
-{cabal, mtl, parsec, syb}:
+{ cabal, mtl, parsec, syb }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "WebBits";
   version = "1.0";
   sha256 = "1xqk4ajywlaq9nb9a02i7c25na5p2qbpc2k9zw93gbapppjiapsc";
-
+  buildDepends = [ mtl parsec syb ];
-  propagatedBuildInputs = [ mtl parsec syb ];
-
   meta = {
-    description = "WebBits is a collection of libraries for working with JavaScript.";
+    homepage = "http://www.cs.brown.edu/research/plt/";
+    description = "JavaScript analysis tools";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

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

@@ -1,15 +1,18 @@
-{cabal, mtl, parsec, syb} :
+{ cabal, mtl, parsec, syb }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "WebBits";
   version = "2.0";
   sha256 = "14a1rqlq925f6rdbi8yx44xszj5pvskcmw1gi1bj8hbilgmlwi7f";
-  propagatedBuildInputs = [ mtl parsec syb ];
+  buildDepends = [ mtl parsec syb ];
   meta = {
     homepage = "http://www.cs.brown.edu/research/plt/";
     description = "JavaScript analysis tools";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.simons ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

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

@@ -1,13 +1,14 @@
-{cabal, attoparsec, blazeBuilder, blazeTextual, deepseq, hashable,
+{ cabal, attoparsec, blazeBuilder, blazeTextual, deepseq, hashable
- mtl, syb, text, unorderedContainers, vector} :
+, mtl, syb, text, time, unorderedContainers, vector
+}:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "aeson";
   version = "0.3.2.9";
   sha256 = "1qaajk797zpickw4ik5lc03wnmxkrcmv3zik7n1bjqx6h37h0zqw";
-  propagatedBuildInputs = [
+  buildDepends = [
     attoparsec blazeBuilder blazeTextual deepseq hashable mtl syb text
-    unorderedContainers vector
+    time unorderedContainers vector
   ];
   meta = {
     homepage = "http://github.com/mailrank/aeson";
@@ -15,8 +16,8 @@ cabal.mkDerivation (self : {
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [
-      self.stdenv.lib.maintainers.simons
       self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
     ];
   };
 })

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

@@ -1,11 +1,19 @@
-{cabal}:
+{ cabal }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "ansi-terminal";
-  version = "0.5.0";
+  version = "0.5.5";
-  sha256 = "ee921584bb0d6c37f48b7069709297506651fe8e2c5a22810c38072b54c2fee9";
+  sha256 = "09r4nlpmkis6cp30jkymfas13hz6ph4zqxhvigrxn6s76v7nb5a8";
+  isLibrary = true;
+  isExecutable = true;
   meta = {
+    homepage = "http://batterseapower.github.com/ansi-terminal";
     description = "Simple ANSI terminal support, with Windows compatibility";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
-

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

@@ -1,15 +1,20 @@
-{cabal, ansiTerminal} :
+{ cabal, ansiTerminal }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "ansi-wl-pprint";
   version = "0.6.3";
   sha256 = "1cpkfn1ld0sjysksdsxxwwy1b17s4smmzk8y88y9mb81vgwlalkl";
-  propagatedBuildInputs = [ ansiTerminal ];
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ ansiTerminal ];
   meta = {
     homepage = "http://github.com/batterseapower/ansi-wl-pprint";
     description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.simons ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

pkgs/development/libraries/haskell/asn1-data/default.nix

@@ -1,10 +1,12 @@
-{cabal, attoparsec, attoparsecEnumerator, enumerator, mtl, text} :
+{ cabal, attoparsec, attoparsecEnumerator, enumerator, mtl, text }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "asn1-data";
   version = "0.5.1";
   sha256 = "10ci77pf0y8g7i1fwksv5na32jsy3brfdv6nzrnwih1brq6l5fn4";
-  propagatedBuildInputs = [
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
     attoparsec attoparsecEnumerator enumerator mtl text
   ];
   meta = {
@@ -12,6 +14,9 @@ cabal.mkDerivation (self : {
     description = "ASN1 data reader and writer in RAW, BER, DER and CER forms";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

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

@@ -1,13 +1,17 @@
-{cabal}:
+{ cabal }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "async";
   version = "1.2";
   sha256 = "a5963d36fc1ba142d18920f967190b25cf80f700d863372b6d33ad5257a1773a";
-  propagatedBuildInputs = [];
   meta = {
     homepage = "http://gitorious.org/async/";
     description = "Asynchronous Computations";
     license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

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

@@ -1,15 +1,18 @@
-{cabal, failure} :
+{ cabal, failure }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "attempt";
   version = "0.3.1.1";
   sha256 = "0yfn8mh7gy6nh689ic6sygf9d7lk44kpj2wahnljl53k6vw7smv5";
-  propagatedBuildInputs = [ failure ];
+  buildDepends = [ failure ];
   meta = {
     homepage = "http://github.com/snoyberg/attempt/tree/master";
     description = "Concrete data type for handling extensible exceptions as failures.";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

pkgs/development/libraries/haskell/attoparsec-text-enumerator/default.nix

@@ -1,14 +1,17 @@
-{cabal, attoparsecText, enumerator, text} :
+{ cabal, attoparsecText, enumerator, text }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "attoparsec-text-enumerator";
   version = "0.2.0.0";
   sha256 = "149ipf5qh7wzjrnv98h6j94djr0ndzg8s4rs8h7kzbii21ynmzz5";
-  propagatedBuildInputs = [ attoparsecText enumerator text ];
+  buildDepends = [ attoparsecText enumerator text ];
   meta = {
     description = "Convert an attoparsec-text parser into an iteratee";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

pkgs/development/libraries/haskell/attoparsec-text/default.nix

@@ -1,15 +1,18 @@
-{cabal, attoparsec, text} :
+{ cabal, attoparsec, text }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "attoparsec-text";
   version = "0.8.5.1";
   sha256 = "1in0ziqjf2hvlv6yay2b5xkm35j1szzwdfapn5mpflv64qi33i0z";
-  propagatedBuildInputs = [ attoparsec text ];
+  buildDepends = [ attoparsec text ];
   meta = {
     homepage = "http://patch-tag.com/r/felipe/attoparsec-text/home";
     description = "Fast combinator parsing for texts";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

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

@@ -1,13 +1,18 @@
-{cabal, deepseq}:
+{ cabal, deepseq }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "attoparsec";
   version = "0.9.1.1";
   sha256 = "1qkkl9pzk4znqh34pchmxbcslybvii35lkxhwf6445lyhj20356b";
-  propagatedBuildInputs = [deepseq];
+  buildDepends = [ deepseq ];
   meta = {
+    homepage = "https://bitbucket.org/bos/attoparsec";
     description = "Fast combinator parsing for bytestrings";
-    license = "BSD3";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
-

pkgs/development/libraries/haskell/attoparsec/enumerator.nix

@@ -1,13 +1,18 @@
-{cabal, attoparsec, enumerator}:
+{ cabal, attoparsec, enumerator }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "attoparsec-enumerator";
   version = "0.2.0.4";
   sha256 = "14v53vppcf4k3m4kid10pg5r3zsn894f36w1y2pzlc72w81fv3gd";
-  propagatedBuildInputs = [attoparsec enumerator];
+  buildDepends = [ attoparsec enumerator ];
   meta = {
-    description = "Converts an Attoparsec parser into an iteratee";
+    homepage = "http://john-millikin.com/software/attoparsec-enumerator/";
-    license = "BSD3";
+    description = "Convert an Attoparsec parser into an iteratee";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
-

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

@@ -1,22 +1,26 @@
-{cabal, RSA, SHA, aeson, attoparsec, base64Bytestring,
+{ cabal, RSA, SHA, aeson, attoparsec, base64Bytestring
- blazeBuilder, caseInsensitive, enumerator, failure, httpEnumerator,
+, blazeBuilder, caseInsensitive, enumerator, failure
- httpTypes, network, tagsoup, text, tls, transformers,
+, httpEnumerator, httpTypes, network, tagsoup, text, time, tls
- xmlEnumerator} :
+, transformers, xmlEnumerator
+}:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "authenticate";
   version = "0.9.2.2";
   sha256 = "0rn1f458ag9mmh55hi873xg5iqypwl6vf6blyaxwbgbp6nm327iz";
-  propagatedBuildInputs = [
+  buildDepends = [
     RSA SHA aeson attoparsec base64Bytestring blazeBuilder
     caseInsensitive enumerator failure httpEnumerator httpTypes network
-    tagsoup text tls transformers xmlEnumerator
+    tagsoup text time tls transformers xmlEnumerator
   ];
   meta = {
     homepage = "http://github.com/snoyberg/authenticate/tree/master";
     description = "Authentication methods for Haskell web applications.";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

pkgs/development/libraries/haskell/base-unicode-symbols/default.nix

@@ -1,17 +1,17 @@
-{cabal} :
+{ cabal }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "base-unicode-symbols";
-  version = "0.2.2";
+  version = "0.2.2.1";
-  sha256 = "06m31fzy387ylk9yw4lbba8fwzql1d2q774251870z8xgqfc52gk";
+  sha256 = "095x4mlkn7i9byg6kdp2f7z0x7sizmy4lgsi0rsabazyd3d8rr9l";
   meta = {
     homepage = "http://haskell.org/haskellwiki/Unicode-symbols";
     description = "Unicode alternatives for common functions and operators";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [
-      self.stdenv.lib.maintainers.simons
       self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
     ];
   };
 })

pkgs/development/libraries/haskell/base64-bytestring/default.nix

@@ -1,6 +1,6 @@
-{cabal} :
+{ cabal }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "base64-bytestring";
   version = "0.1.0.3";
   sha256 = "0d4j8b1d8z9qr1y446bfkj764xgilk8gw2frj0wn0717y8knvmx3";
@@ -9,6 +9,9 @@ cabal.mkDerivation (self : {
     description = "Fast base64 encoding and deconding for ByteStrings";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.simons ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

pkgs/development/libraries/haskell/base64-string/default.nix

@@ -1,6 +1,6 @@
-{cabal} :
+{ cabal }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "base64-string";
   version = "0.2";
   sha256 = "0pkhrimabacsjalzq0y3a197fqfbspsbv8xszzg4vbb1fb59dj1y";
@@ -9,6 +9,9 @@ cabal.mkDerivation (self : {
     description = "Base64 implementation for String's.";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.simons ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

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

@@ -1,15 +1,18 @@
-{cabal, mtl, time} :
+{ cabal, mtl, time }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "benchpress";
   version = "0.2.2.4";
   sha256 = "0cabjx0gkbk5blqkm9pmnz8kmi3573367365gny4r3m431iwxgnf";
-  propagatedBuildInputs = [ mtl time ];
+  buildDepends = [ mtl time ];
   meta = {
     homepage = "http://github.com/tibbe/benchpress";
     description = "Micro-benchmarking with detailed statistics.";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.simons ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

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

@@ -1,13 +1,17 @@
-{cabal}:
+{ cabal }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "bimap";
   version = "0.2.4";
   sha256 = "d991ae393ade2191f42d8a0d659d2b9a749675735eb5b57872f577ede82565c5";
   meta = {
+    homepage = "http://code.haskell.org/bimap";
     description = "Bidirectional mapping between two key types";
-    license = "BSD";
+    license = self.stdenv.lib.licenses.bsd3;
-    maintainers = [self.stdenv.lib.maintainers.andres];
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
-

pkgs/development/libraries/haskell/binary-shared/default.nix

@@ -1,13 +1,18 @@
-{cabal, binary, mtl}:
+{ cabal, binary, mtl }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "binary-shared";
   version = "0.8.1";
   sha256 = "0niq6hgsawsdg3kkjgkwyrgy8w7pfkqfph5d1x5bzcjrcl982jrg";
-  propagatedBuildInputs = [binary mtl];
+  buildDepends = [ binary mtl ];
   meta = {
-    description = "Binary serialization with support for sharing identical elements";
+    homepage = "http://www.leksah.org";
+    description = "Sharing for the binary package";
     license = "GPL";
-    maintainers = [self.stdenv.lib.maintainers.andres];
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

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

@@ -1,10 +1,17 @@
-{cabal}:
+{ cabal }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "binary";
   version = "0.5.0.2";
   sha256 = "02qkybh11psmggkqcs7f8kh4izfj44gq1wk23xhv3jbxc7gdxhp0";
   meta = {
-    description = "Efficient, pure binary serialisation using lazy ByteStrings";
+    homepage = "http://code.haskell.org/binary/";
+    description = "Binary serialisation for Haskell values using lazy ByteStrings";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

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

@@ -1,13 +1,17 @@
-{cabal}:
+{ cabal }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "bitmap";
   version = "0.0.1";
   sha256 = "281ad4d9234349cfd14f91977b48e2d1861c037f4b6562aa138cddd25c801a7e";
   meta = {
-    description = "A library for handling and manipulating bitmaps";
+    homepage = "http://code.haskell.org/~bkomuves/";
-    license = "BSD";
+    description = "A library for handling and manipulating bitmaps.";
-    maintainers = [self.stdenv.lib.maintainers.andres];
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
-

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

@@ -1,6 +1,6 @@
-{cabal} :
+{ cabal }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "bktrees";
   version = "0.3.1";
   sha256 = "1d2iz48n0ayn0hi9xa110pxy1mv5a4m21rmbpvs6ki1a7cv4ghn9";
@@ -8,6 +8,9 @@ cabal.mkDerivation (self : {
     description = "A set data structure with approximate searching";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.simons ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix

@@ -1,12 +1,19 @@
-{cabal, blazeBuilder, enumerator, transformers}:
+{ cabal, blazeBuilder, enumerator, transformers }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "blaze-builder-enumerator";
   version = "0.2.0.2";
   sha256 = "0as4mjh695jpxp9qfhpsxyr1448l0pk94sh5kk8sgxv5hfiy41k9";
-  propagatedBuildInputs = [blazeBuilder enumerator transformers];
+  buildDepends = [ blazeBuilder enumerator transformers ];
   meta = {
-    description = "Enumeratees for the incremental conversion of builders to bytestrings";
+    homepage = "https://github.com/meiersi/blaze-builder-enumerator";
-    license = "BSD3";
+    description = "Enumeratees for the incremental conversion of builders to
+bytestrings.";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

pkgs/development/libraries/haskell/blaze-builder/default.nix

@@ -1,13 +1,18 @@
-{cabal, text}:
+{ cabal, text }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "blaze-builder";
   version = "0.3.0.1";
   sha256 = "1p3xlifcr7v987zx8l2sppn9yydph332mn1xxk0yfi78a6386nfb";
-  propagatedBuildInputs = [text];
+  buildDepends = [ text ];
   meta = {
-    description = "Builder to efficiently append text";
+    homepage = "http://github.com/meiersi/blaze-builder";
-    license = "BSD";
+    description = "Efficient buffered output.";
-    maintainers = [self.stdenv.lib.maintainers.andres];
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

pkgs/development/libraries/haskell/blaze-html/default.nix

@@ -1,17 +1,17 @@
-{cabal, blazeBuilder, text} :
+{ cabal, blazeBuilder, text }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "blaze-html";
   version = "0.4.1.6";
   sha256 = "084phxxdy12vi2q084k8w693m94v0pjf29zx2fk1y0n80k05ii4z";
-  propagatedBuildInputs = [ blazeBuilder text ];
+  buildDepends = [ blazeBuilder text ];
   meta = {
     homepage = "http://jaspervdj.be/blaze";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [
-      self.stdenv.lib.maintainers.simons
       self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
     ];
   };
 })

pkgs/development/libraries/haskell/blaze-textual/default.nix

@@ -1,18 +1,18 @@
-{cabal, blazeBuilder, text, vector} :
+{ cabal, blazeBuilder, text, time, vector }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "blaze-textual";
   version = "0.1.0.0";
   sha256 = "0ql25b0r4xbshqsjfndl7glq0hp2ncxb3h5zd541vsqrqrf8y4gk";
-  propagatedBuildInputs = [ blazeBuilder text vector ];
+  buildDepends = [ blazeBuilder text time vector ];
   meta = {
     homepage = "http://github.com/mailrank/blaze-textual";
     description = "Fast rendering of common datatypes";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [
-      self.stdenv.lib.maintainers.simons
       self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
     ];
   };
 })

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

@@ -1,18 +1,18 @@
-{cabal, binary} :
+{ cabal, binary }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "bmp";
   version = "1.1.2.1";
   sha256 = "01w0fbfzdmrfnmnkjkg9paagfkzsjn57rx7lf2npzp95rmljplkb";
-  propagatedBuildInputs = [ binary ];
+  buildDepends = [ binary ];
   meta = {
     homepage = "http://code.ouroborus.net/bmp";
     description = "Read and write uncompressed BMP image files.";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
     maintainers = [
-      self.stdenv.lib.maintainers.simons
       self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
     ];
   };
 })

pkgs/development/libraries/haskell/bytestring-mmap/default.nix

@@ -1,6 +1,6 @@
-{cabal} :
+{ cabal }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "bytestring-mmap";
   version = "0.2.2";
   sha256 = "1bv9xf4cpph1cbdwv6rbmq8ppi5wjpgd97lwln5l9ky5rvnaxg3v";
@@ -8,5 +8,10 @@ cabal.mkDerivation (self : {
     homepage = "http://code.haskell.org/~dons/code/bytestring-mmap/";
     description = "mmap support for strict ByteStrings";
     license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

pkgs/development/libraries/haskell/bytestring-nums/default.nix

@@ -1,14 +1,19 @@
-{cabal} :
+{ cabal }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "bytestring-nums";
   version = "0.3.3";
   sha256 = "09gdbyj5qw98j57cs9phzsbmvdm7y6j07wg908i34jklwm24nxfd";
+  isLibrary = true;
+  isExecutable = true;
   meta = {
     homepage = "http://github.com/solidsnack/bytestring-nums";
     description = "Parse numeric literals from ByteStrings.";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.simons ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

pkgs/development/libraries/haskell/bytestring-trie/default.nix

@@ -1,14 +1,18 @@
-{cabal, binary}:
+{ cabal, binary }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "bytestring-trie";
   version = "0.2.3";
   sha256 = "1zb4s7fd951swc648szrpx0ldailmdinapgbcg1zajb5c5jq57ga";
-  propagatedBuildInputs = [binary];
+  buildDepends = [ binary ];
   meta = {
-    description = "An efficient finite map from (byte)strings to values";
+    homepage = "http://code.haskell.org/~wren/";
-    license = "BSD3";
+    description = "An efficient finite map from (byte)strings to values.";
-    maintainers = [self.stdenv.lib.maintainers.andres];
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
-

pkgs/development/libraries/haskell/case-insensitive/0.2.0.2.nix

@@ -1,14 +1,17 @@
-{cabal, text}:
+{ cabal, text }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "case-insensitive";
   version = "0.2.0.2";
   sha256 = "0qn2scaxxbqi4770nwvcmb1ldj0ipa2ljxcavcn0kv48xzs519l7";
-  propagatedBuildInputs = [text];
+  buildDepends = [ text ];
   meta = {
     description = "Case insensitive string comparison";
-    license = "BSD3";
+    license = self.stdenv.lib.licenses.bsd3;
-    maintainers = [self.stdenv.lib.maintainers.andres];
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
-

pkgs/development/libraries/haskell/case-insensitive/0.3.nix

@@ -1,17 +1,17 @@
-{cabal, hashable, text} :
+{ cabal, hashable, text }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "case-insensitive";
   version = "0.3";
   sha256 = "0k3y09ak4k0jwx7bh5awcznw064xgf6yzidq3jalif7m3c9bv5q7";
-  propagatedBuildInputs = [ hashable text ];
+  buildDepends = [ hashable text ];
   meta = {
     description = "Case insensitive string comparison";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [
-      self.stdenv.lib.maintainers.simons
       self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
     ];
   };
 })

pkgs/development/libraries/haskell/cautious-file/default.nix

@@ -1,6 +1,6 @@
-{cabal} :
+{ cabal }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "cautious-file";
   version = "1.0";
   sha256 = "1s2la91vk9c99bj0ipzc4r6w81rcs4jfmn0xr1cgjab00bzj880q";
@@ -9,8 +9,8 @@ cabal.mkDerivation (self : {
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [
-      self.stdenv.lib.maintainers.simons
       self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
     ];
   };
 })

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

@@ -1,12 +1,16 @@
-{cabal}:
+{ cabal }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "cereal";
   version = "0.3.3.0";
   sha256 = "0bqd5qfvbz77mq0zxgafj011hrxcanrfzvlwhf4j4dzr6yryk53y";
   meta = {
     description = "A binary serialization library";
-    license = "BSD";
+    license = self.stdenv.lib.licenses.bsd3;
-    maintainers = [self.stdenv.lib.maintainers.andres];
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

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

@@ -1,15 +1,20 @@
-{cabal, asn1Data, base64Bytestring, mtl} :
+{ cabal, asn1Data, base64Bytestring, mtl, time }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "certificate";
   version = "0.9.1";
   sha256 = "0hq9a0vz72kk1n3hdza36rji8vc95y667iwcsmsh5habyh6q8228";
-  propagatedBuildInputs = [ asn1Data base64Bytestring mtl ];
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ asn1Data base64Bytestring mtl time ];
   meta = {
     homepage = "http://github.com/vincenthz/hs-certificate";
     description = "Certificates and Key Reader/Writer";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

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

@@ -1,13 +1,19 @@
-{cabal}:
+{ cabal }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "clientsession";
   version = "0.6.0";
   sha256 = "0h92jjkhldn7f9b78cajfda8rprsj5scdsyl3pjpzicpvvy9g00y";
+  isLibrary = true;
+  isExecutable = true;
   meta = {
-    description = "Store session data in a cookie";
+    homepage = "http://github.com/snoyberg/clientsession/tree/master";
-    license = "BSD3";
+    description = "Store session data in a cookie.";
-    maintainers = [self.stdenv.lib.maintainers.andres];
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
-

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

@@ -1,14 +1,20 @@
-{cabal, filepath, mtl}:
+{ cabal, transformers }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "cmdargs";
   version = "0.7";
   sha256 = "0qijfdc66f0r2k272sl41nxfymmsk7naw5is3b4zyxsgm147c0vq";
-  propagatedBuildInputs = [filepath mtl];
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ transformers ];
   meta = {
+    homepage = "http://community.haskell.org/~ndm/cmdargs/";
     description = "Command line argument processing";
-    license = "BSD";
+    license = self.stdenv.lib.licenses.bsd3;
-    maintainers = [self.stdenv.lib.maintainers.andres];
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
-

pkgs/development/libraries/haskell/colorize-haskell/default.nix

@@ -1,15 +1,20 @@
-{cabal, ansiTerminal, haskellLexer} :
+{ cabal, ansiTerminal, haskellLexer }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "colorize-haskell";
   version = "1.0.1";
   sha256 = "1v4spa6vw9igjpd1dr595z5raz5fr8f485q5w9imrv8spms46xh3";
-  propagatedBuildInputs = [ ansiTerminal haskellLexer ];
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ ansiTerminal haskellLexer ];
   meta = {
     homepage = "http://github.com/yav/colorize-haskell";
     description = "Highligt Haskell source";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.simons ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

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

@@ -1,12 +1,17 @@
-{cabal}:
+{ cabal }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "colour";
   version = "2.3.1";
   sha256 = "58cf12b8abf7d01a752b1b778b64cc406903874702e3475d65c2aa35689fa49b";
   meta = {
-    description = "Data type, conversion and composition of colours";
+    homepage = "http://www.haskell.org/haskellwiki/Colour";
-    license = "OtherLicense";
+    description = "A model for human colour/color perception";
+    license = "unknown";
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
-

pkgs/development/libraries/haskell/continued-fractions/default.nix

@@ -1,6 +1,6 @@
-{cabal} :
+{ cabal }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "continued-fractions";
   version = "0.9.1.0";
   sha256 = "07g6ms68xfzd25zr2k2fpg4f4pynmq4mn7djkzrg3gbfh9gfq37q";
@@ -8,5 +8,10 @@ cabal.mkDerivation (self : {
     homepage = "/dev/null";
     description = "Continued fractions.";
     license = self.stdenv.lib.licenses.publicDomain;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

pkgs/development/libraries/haskell/control-monad-attempt/default.nix

@@ -1,15 +1,18 @@
-{cabal, attempt, transformers} :
+{ cabal, attempt, transformers }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "control-monad-attempt";
   version = "0.3.0";
   sha256 = "1l0bqb5h2fs7vx2r8nd6kscyyrrqc0gshnxwdz9p6clfnknyqbqw";
-  propagatedBuildInputs = [ attempt transformers ];
+  buildDepends = [ attempt transformers ];
   meta = {
     homepage = "http://github.com/snoyberg/control-monad-attempt";
     description = "Monad transformer for attempt.";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

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

@@ -1,6 +1,6 @@
-{cabal} :
+{ cabal }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "converge";
   version = "0.1";
   sha256 = "01n5xnzb769rflgzk1f2v2y3yik9q2cmpq3b2pw68pxl1z3qfvpw";
@@ -8,5 +8,10 @@ cabal.mkDerivation (self : {
     homepage = "/dev/null";
     description = "Limit operations for converging sequences";
     license = self.stdenv.lib.licenses.publicDomain;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

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

@@ -1,12 +1,20 @@
-{cabal, mtl, time, text}:
+{ cabal, mtl, text, time }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "convertible";
-  version = "1.0.10.0";
+  version = "1.0.11.0";
-  sha256 = "1phjxd40mfxzp2ma1yif5f2wrjqg21a5bwz05mh38lxrw68vm711";
+  sha256 = "0qkz760ddshmglmrf47a01978c9zhxfss44b6vmfkwwfcjb7da2b";
-  propagatedBuildInputs = [mtl time text];
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ mtl text time ];
   meta = {
+    homepage = "http://hackage.haskell.org/cgi-bin/hackage-scripts/package/convertible";
     description = "Typeclasses and instances for converting between types";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })
-

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

@@ -1,18 +1,18 @@
-{cabal, blazeBuilder, text} :
+{ cabal, blazeBuilder, text, time }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "cookie";
   version = "0.3.0";
   sha256 = "0ix7g29a7kj48yx2dqjj1g6vy89rmidsnjfnfj7mali86q9i7bdw";
-  propagatedBuildInputs = [ blazeBuilder text ];
+  buildDepends = [ blazeBuilder text time ];
   meta = {
     homepage = "http://github.com/snoyberg/cookie";
     description = "HTTP cookie parsing and rendering";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [
-      self.stdenv.lib.maintainers.simons
       self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
     ];
   };
 })

pkgs/development/libraries/haskell/cprng-aes/default.nix

@@ -1,15 +1,18 @@
-{cabal, cereal, cryptoApi, cryptocipher} :
+{ cabal, cereal, cryptoApi, cryptocipher }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "cprng-aes";
   version = "0.2.1";
   sha256 = "0q6qkvha7cckz3zjnzfsrx298arzbdavy1f73hygrd8f7n74442j";
-  propagatedBuildInputs = [ cereal cryptoApi cryptocipher ];
+  buildDepends = [ cereal cryptoApi cryptocipher ];
   meta = {
     homepage = "http://github.com/vincenthz/hs-cprng-aes";
     description = "Crypto Pseudo Random Number Generator using AES in counter mode.";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })

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

@@ -1,12 +1,14 @@
-{cabal, deepseq, mtl, mwcRandom, parsec, statistics, vector,
+{ cabal, deepseq, mtl, mwcRandom, parsec, statistics, time, vector
- vectorAlgorithms} :
+, vectorAlgorithms
+}:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "criterion";
   version = "0.5.0.10";
   sha256 = "0sd289s7wnyg0p37j327hv55aw4a18bdv56z26v4qi3j8p2fbpbj";
-  propagatedBuildInputs = [
+  buildDepends = [
-    deepseq mtl mwcRandom parsec statistics vector vectorAlgorithms
+    deepseq mtl mwcRandom parsec statistics time vector
+    vectorAlgorithms
   ];
   meta = {
     homepage = "http://bitbucket.org/bos/criterion";
@@ -14,8 +16,8 @@ cabal.mkDerivation (self : {
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [
-      self.stdenv.lib.maintainers.simons
       self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
     ];
   };
 })

pkgs/development/libraries/haskell/crypto-api/default.nix

@@ -1,15 +1,18 @@
-{cabal, cereal, entropy, largeword, tagged} :
+{ cabal, cereal, entropy, largeword, tagged }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "crypto-api";
   version = "0.6.4";
   sha256 = "1v3nnfw13r514a723lsx8d1awlad6fmv27bgp76f1ssv1garraf3";
-  propagatedBuildInputs = [ cereal entropy largeword tagged ];
+  buildDepends = [ cereal entropy largeword tagged ];
   meta = {
     homepage = "http://trac.haskell.org/crypto-api/wiki";
     description = "A generic interface for cryptographic operations";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
   };
 })