9 files changed, 84 insertions, 38 deletions
diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix
index b6d9365446d6..c0f5e4c14689 100644
--- a/pkgs/development/libraries/haskell/hspec/default.nix
+++ b/pkgs/development/libraries/haskell/hspec/default.nix
@@ -1,22 +1,22 @@
-{ cabal, ansiTerminal, deepseq, doctest, filepath, ghcPaths
+{ cabal, ansiTerminal, async, deepseq, doctest, filepath, ghcPaths
 , hspecExpectations, hspecMeta, HUnit, QuickCheck, quickcheckIo
 , random, setenv, silently, tfRandom, time, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "hspec";
-  version = "1.9.5";
-  sha256 = "0y9gbm5rwwn80yzdllh1amaih4vxa61i9dzym88jr2kkwjrhxay4";
+  version = "1.10.0";
+  sha256 = "0lqc4sxl2c1rgnmp4a2fikc78f9caxswkmxfi8wajxlwaj58sy8p";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    ansiTerminal deepseq filepath hspecExpectations HUnit QuickCheck
-    quickcheckIo random setenv tfRandom time transformers
+    ansiTerminal async deepseq filepath hspecExpectations HUnit
+    QuickCheck quickcheckIo random setenv tfRandom time transformers
   ];
   testDepends = [
-    ansiTerminal deepseq doctest filepath ghcPaths hspecExpectations
-    hspecMeta HUnit QuickCheck quickcheckIo random setenv silently
-    tfRandom time transformers
+    ansiTerminal async deepseq doctest filepath ghcPaths
+    hspecExpectations hspecMeta HUnit QuickCheck quickcheckIo random
+    setenv silently tfRandom time transformers
   ];
   doCheck = false;
   meta = {
diff --git a/pkgs/development/libraries/haskell/hspec2/default.nix b/pkgs/development/libraries/haskell/hspec2/default.nix
new file mode 100644
index 000000000000..be49f612aaac
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hspec2/default.nix
@@ -0,0 +1,29 @@
+{ cabal, ansiTerminal, async, deepseq, doctest, filepath, ghcPaths
+, hspecExpectations, hspecMeta, HUnit, ioMemoize, QuickCheck
+, quickcheckIo, random, setenv, silently, tfRandom, time
+, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "hspec2";
+  version = "0.3.0";
+  sha256 = "0ia19jraz2di31c48lh0kswkb2573jxm7msf33i8d5a5yq8y9wwp";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    ansiTerminal async deepseq filepath hspecExpectations HUnit
+    ioMemoize QuickCheck quickcheckIo random setenv tfRandom time
+    transformers
+  ];
+  testDepends = [
+    ansiTerminal async deepseq doctest filepath ghcPaths
+    hspecExpectations hspecMeta HUnit ioMemoize QuickCheck quickcheckIo
+    random setenv silently tfRandom time transformers
+  ];
+  meta = {
+    homepage = "http://hspec.github.io/";
+    description = "Alpha version of Hspec 2.0";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/io-memoize/default.nix b/pkgs/development/libraries/haskell/io-memoize/default.nix
new file mode 100644
index 000000000000..bba2cd3b1e0f
--- /dev/null
+++ b/pkgs/development/libraries/haskell/io-memoize/default.nix
@@ -0,0 +1,13 @@
+{ cabal, spawn }:
+
+cabal.mkDerivation (self: {
+  pname = "io-memoize";
+  version = "1.0.0.0";
+  sha256 = "1z6aimyg7wasaqmacpch7skfm9iyl7khd54lfmb8iwghyfvah5d0";
+  buildDepends = [ spawn ];
+  meta = {
+    description = "Memoize IO actions";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/libmpd/default.nix b/pkgs/development/libraries/haskell/libmpd/default.nix
index 54f358547bd1..e760421d4ebf 100644
--- a/pkgs/development/libraries/haskell/libmpd/default.nix
+++ b/pkgs/development/libraries/haskell/libmpd/default.nix
@@ -13,6 +13,7 @@ cabal.mkDerivation (self: {
     dataDefault hspec HUnit mtl network QuickCheck text time utf8String
   ];
   jailbreak = true;
+  doCheck = false;
   meta = {
     homepage = "http://github.com/joachifm/libmpd-haskell#readme";
     description = "An MPD client library";
diff --git a/pkgs/development/libraries/haskell/pipes-text/default.nix b/pkgs/development/libraries/haskell/pipes-text/default.nix
new file mode 100644
index 000000000000..ac4a57348feb
--- /dev/null
+++ b/pkgs/development/libraries/haskell/pipes-text/default.nix
@@ -0,0 +1,19 @@
+{ cabal, pipes, pipesBytestring, pipesGroup, pipesParse, pipesSafe
+, profunctors, text, textStreamDecode, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "pipes-text";
+  version = "0.0.0.10";
+  sha256 = "05lrxfy6cma7g5h41c74sc22p1y38kzbmiagr3grxk5a5110vhr1";
+  buildDepends = [
+    pipes pipesBytestring pipesGroup pipesParse pipesSafe profunctors
+    text textStreamDecode transformers
+  ];
+  meta = {
+    homepage = "https://github.com/michaelt/text-pipes";
+    description = "Text pipes";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/spawn/default.nix b/pkgs/development/libraries/haskell/spawn/default.nix
new file mode 100644
index 000000000000..a69b7fd26419
--- /dev/null
+++ b/pkgs/development/libraries/haskell/spawn/default.nix
@@ -0,0 +1,12 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "spawn";
+  version = "0.3";
+  sha256 = "0xkkl0w30rqif2jwdzjv239raly4yaf0116vkqcwh1i41jqn7ij8";
+  meta = {
+    description = "Tiny library for concurrent computations";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/syb/0.2.2.nix b/pkgs/development/libraries/haskell/syb/0.2.2.nix
deleted file mode 100644
index b03cb947d27d..000000000000
--- a/pkgs/development/libraries/haskell/syb/0.2.2.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "syb";
-  version = "0.2.2";
-  sha256 = "0m29vnqkkmpf4m3gi42kcbr2gfyxgkcw85xsyrq0mgbxb0zg6ky9";
-  meta = {
-    homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB";
-    description = "Scrap Your Boilerplate";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/syb/0.3.6.2.nix b/pkgs/development/libraries/haskell/syb/0.3.6.2.nix
deleted file mode 100644
index a37e238ff710..000000000000
--- a/pkgs/development/libraries/haskell/syb/0.3.6.2.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "syb";
-  version = "0.3.6.2";
-  sha256 = "0n1h0zlq2ygwkh7s914gfy4rg4b5kg6msd65id84c5412sri3mk4";
-  meta = {
-    homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB";
-    description = "Scrap Your Boilerplate";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/syb/0.4.1.nix b/pkgs/development/libraries/haskell/syb/0.4.2.nix
index 38c4f2cae3f9..fd67f63ced5c 100644
--- a/pkgs/development/libraries/haskell/syb/0.4.1.nix
+++ b/pkgs/development/libraries/haskell/syb/0.4.2.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "syb";
-  version = "0.4.1";
-  sha256 = "1lkh4rrqdzvb8kyry07x2z88v478hrw5cp8wmhjgpg0ck8ywncma";
+  version = "0.4.2";
+  sha256 = "1gvyw2gbccip24wpp9xi6qgwvg4m5cijhzz1v51wvyamqv4p2b8l";
   testDepends = [ HUnit mtl ];
   doCheck = self.stdenv.lib.versionOlder self.ghc.version "7.9";
   meta = {