Updated Haskell packages.

 - cabal2nix: updated to version 1.30
 - cmdargs: updated to version 0.9.5
 - derive: updated to version 2.5.6
 - hlint: updated to version 1.8.25
 - io-choice: added version 0.0.1

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

6 files changed, 26 insertions, 8 deletions

diff --git a/pkgs/development/libraries/haskell/cmdargs/default.nix b/pkgs/development/libraries/haskell/cmdargs/default.nix
index adc3c10c851ab..55c50cb99fb10 100644
--- a/pkgs/development/libraries/haskell/cmdargs/default.nix
+++ b/pkgs/development/libraries/haskell/cmdargs/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cmdargs";
-  version = "0.9.3";
-  sha256 = "1mm16249nprclmgplw5bmmzsnmfm8dlkc5janrwvmlssbxw5hgnk";
+  version = "0.9.5";
+  sha256 = "0ihanswhq5d29d9ll5q4grkbaq64dwfsayws7y4xa387d5s9p3iv";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ filepath transformers ];
diff --git a/pkgs/development/libraries/haskell/derive/default.nix b/pkgs/development/libraries/haskell/derive/default.nix
index d3ed9b4c954e9..b6c560f70acb5 100644
--- a/pkgs/development/libraries/haskell/derive/default.nix
+++ b/pkgs/development/libraries/haskell/derive/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "derive";
-  version = "2.5.5";
-  sha256 = "1vv7y2jfyxq2abh4avyjwia309a6rylbyiqia1m0ka7zwv2rxd6y";
+  version = "2.5.6";
+  sha256 = "1ckxm6s2y9dvlj1785b27a2zvah4radypxjpq7sxn970r6m5dv0h";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix
index c9de0ef46c20e..c03484b93f514 100644
--- a/pkgs/development/libraries/haskell/hoogle/default.nix
+++ b/pkgs/development/libraries/haskell/hoogle/default.nix
@@ -19,5 +19,6 @@ cabal.mkDerivation (self: {
     description = "Haskell API Search";
     license = "GPL";
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/io-choice/default.nix b/pkgs/development/libraries/haskell/io-choice/default.nix
new file mode 100644
index 0000000000000..85e49f5a67f18
--- /dev/null
+++ b/pkgs/development/libraries/haskell/io-choice/default.nix
@@ -0,0 +1,17 @@
+{ cabal, liftedBase, monadControl, transformers, transformersBase
+}:
+
+cabal.mkDerivation (self: {
+  pname = "io-choice";
+  version = "0.0.1";
+  sha256 = "0jwxqs65g88q9l0w4xzllj7svz3qr2zgiaq2fyq5jmh33lz74r63";
+  buildDepends = [
+    liftedBase monadControl transformers transformersBase
+  ];
+  meta = {
+    description = "Choice for IO and lifted IO";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix
index f00c45ee33b7a..d81d92c5cfae4 100644
--- a/pkgs/development/tools/haskell/cabal2nix/default.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cabal2nix";
-  version = "1.29";
-  sha256 = "1gqrl8085i7g64q085knjawqb3ynk13swrmry077ygw42hpvp2wg";
+  version = "1.30";
+  sha256 = "1qkrdxqvasm0q4sh98c50qwpm7nff6yzp4yjhx8sdy39v4gvbw2b";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ];
diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix
index 0b5d53c3efaf9..074695a8247c0 100644
--- a/pkgs/development/tools/haskell/hlint/default.nix
+++ b/pkgs/development/tools/haskell/hlint/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hlint";
-  version = "1.8.24";
-  sha256 = "1crxhpgy49xg3j225cyfxflnc8zgck2xa8hb04chd0yh9n03h6kx";
+  version = "1.8.25";
+  sha256 = "1pxdkwqg04hjynck06ib94spjviri3y1ivhagc8icwjwlizbn5ib";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [