Merge branch 'haskell-yesod-test'.

This adds yesodTest to haskellPackages, which is required by default by the
cabal file generated using the Yesod scaffolder. But even if you don't use the
scaffolder it's useful for - well - writing tests, which most people might want
to do if they're not completely insane.

I'm merging this right in because it's non-trivial and just adds packages.

pkgs/development/libraries/haskell/filesystem-conduit/default.nix

@@ -0,0 +1,17 @@
+{ cabal, conduit, systemFileio, systemFilepath, text, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "filesystem-conduit";
+  version = "0.5.0.1";
+  sha256 = "1rpyrvs9hsi86zj6rghv91jn5lcx9wppg1wa4gp976kmagd4wl93";
+  buildDepends = [
+    conduit systemFileio systemFilepath text transformers
+  ];
+  meta = {
+    homepage = "http://github.com/snoyberg/conduit";
+    description = "Use system-filepath data types with conduits";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/hspec-expectations/default.nix

@@ -0,0 +1,14 @@
+{ cabal, HUnit }:
+
+cabal.mkDerivation (self: {
+  pname = "hspec-expectations";
+  version = "0.3.0.2";
+  sha256 = "1jwwi4pbv0pc88vdg5y0ljjq41sha4v4y5qaxi6qms7rl6cp4qkr";
+  buildDepends = [ HUnit ];
+  meta = {
+    homepage = "https://github.com/sol/hspec-expectations#readme";
+    description = "Catchy combinators for HUnit";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})

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

@@ -0,0 +1,21 @@
+{ cabal, ansiTerminal, filepath, hspecExpectations, HUnit
+, QuickCheck, silently, time, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "hspec";
+  version = "1.3.0";
+  sha256 = "0kl9mdksy8bifb37dfb9y8mnnjlq0x1h970cgzv9idq61gafii4n";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    ansiTerminal filepath hspecExpectations HUnit QuickCheck silently
+    time transformers
+  ];
+  meta = {
+    homepage = "http://hspec.github.com/";
+    description = "Behavior Driven Development for Haskell";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

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

@@ -0,0 +1,19 @@
+{ cabal, conduit, filesystemConduit, resourcet, systemFilepath
+, tagstreamConduit, text, transformers, xmlConduit, xmlTypes
+}:
+
+cabal.mkDerivation (self: {
+  pname = "html-conduit";
+  version = "0.1.0.2";
+  sha256 = "0r9bnzz6r5q2fgichg8vfjgwyig33diqvj5pxchk97m3m5rqj5k4";
+  buildDepends = [
+    conduit filesystemConduit resourcet systemFilepath tagstreamConduit
+    text transformers xmlConduit xmlTypes
+  ];
+  meta = {
+    homepage = "https://github.com/snoyberg/xml";
+    description = "Parse HTML documents using xml-conduit datatypes";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})

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

@@ -0,0 +1,14 @@
+{ cabal, deepseq }:
+
+cabal.mkDerivation (self: {
+  pname = "silently";
+  version = "1.2.0.2";
+  sha256 = "0qcprbjnh351hc9v12gww478qd4pw7wgpyjj1gmkx4mr80w0qmm1";
+  buildDepends = [ deepseq ];
+  meta = {
+    homepage = "https://github.com/trystan/silently";
+    description = "Prevent or capture writing to stdout and other handles";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/tagstream-conduit/default.nix

@@ -0,0 +1,18 @@
+{ cabal, attoparsec, blazeBuilder, blazeBuilderConduit, conduit
+, text
+}:
+
+cabal.mkDerivation (self: {
+  pname = "tagstream-conduit";
+  version = "0.5.2";
+  sha256 = "12hg9khc670499c3ymc0s4xd2sg71grlk21ykqmby972dva77vxr";
+  buildDepends = [
+    attoparsec blazeBuilder blazeBuilderConduit conduit text
+  ];
+  meta = {
+    homepage = "http://github.com/yihuang/tagstream-conduit";
+    description = "streamlined html tag parser";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/wai-test/default.nix

@@ -0,0 +1,19 @@
+{ cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive
+, conduit, cookie, httpTypes, HUnit, text, transformers, wai
+}:
+
+cabal.mkDerivation (self: {
+  pname = "wai-test";
+  version = "1.3.0";
+  sha256 = "15y0aw5c4sh1mns4ss39l0wsxrd1b6yq6m5r638x23zl6y7d9j40";
+  buildDepends = [
+    blazeBuilder blazeBuilderConduit caseInsensitive conduit cookie
+    httpTypes HUnit text transformers wai
+  ];
+  meta = {
+    homepage = "http://www.yesodweb.com/book/wai";
+    description = "Unit test framework (built on HUnit) for WAI applications";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})

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

@@ -0,0 +1,22 @@
+{ cabal, attoparsec, blazeHtml, blazeMarkup, caseInsensitive, hspec
+, htmlConduit, httpTypes, HUnit, monadControl, network, persistent
+, poolConduit, text, transformers, wai, waiTest, xmlConduit
+, xmlTypes
+}:
+
+cabal.mkDerivation (self: {
+  pname = "yesod-test";
+  version = "0.3.0";
+  sha256 = "194m4va6am2fmnsvs60jclym6bvjmwp35nyv3srbdnqwg3r983h4";
+  buildDepends = [
+    attoparsec blazeHtml blazeMarkup caseInsensitive hspec htmlConduit
+    httpTypes HUnit monadControl network persistent poolConduit text
+    transformers wai waiTest xmlConduit xmlTypes
+  ];
+  meta = {
+    homepage = "http://www.yesodweb.com";
+    description = "integration testing for WAI/Yesod Applications";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/top-level/haskell-packages.nix

@@ -712,6 +712,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   filestore = callPackage ../development/libraries/haskell/filestore {};
 
+  filesystemConduit = callPackage ../development/libraries/haskell/filesystem-conduit {};
+
   fgl_5_4_2_2 = callPackage ../development/libraries/haskell/fgl/5.4.2.2.nix {};
   fgl_5_4_2_3 = callPackage ../development/libraries/haskell/fgl/5.4.2.3.nix {};
   fgl_5_4_2_4 = callPackage ../development/libraries/haskell/fgl/5.4.2.4.nix {};
@@ -940,11 +942,17 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   hsloggerTemplate = callPackage ../development/libraries/haskell/hslogger-template {};
 
+  hspec = callPackage ../development/libraries/haskell/hspec {};
+
+  hspecExpectations = callPackage ../development/libraries/haskell/hspec-expectations {};
+
   hsyslog = callPackage ../development/libraries/haskell/hsyslog {};
 
   html_1_0_1_2 = callPackage ../development/libraries/haskell/html/1.0.1.2.nix {};
   html = self.html_1_0_1_2;
 
+  htmlConduit = callPackage ../development/libraries/haskell/html-conduit {};
+
   httpConduit = callPackage ../development/libraries/haskell/http-conduit {};
 
   httpdShed = callPackage ../development/libraries/haskell/httpd-shed {};
@@ -1347,6 +1355,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   simpleSendfile = callPackage ../development/libraries/haskell/simple-sendfile {};
 
+  silently = callPackage ../development/libraries/haskell/silently {};
+
   skein = callPackage ../development/libraries/haskell/skein {};
 
   smallcheck = callPackage ../development/libraries/haskell/smallcheck {};
@@ -1459,6 +1469,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   tagsoup = callPackage ../development/libraries/haskell/tagsoup {};
 
+  tagstreamConduit = callPackage ../development/libraries/haskell/tagstream-conduit {};
+
   temporary = callPackage ../development/libraries/haskell/temporary {};
 
   Tensor = callPackage ../development/libraries/haskell/Tensor {};
@@ -1578,6 +1590,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   waiLogger = callPackage ../development/libraries/haskell/wai-logger {};
 
+  waiTest = callPackage ../development/libraries/haskell/wai-test {};
+
   warp = callPackage ../development/libraries/haskell/warp {};
 
   WebBits_1_0 = callPackage ../development/libraries/haskell/WebBits/1.0.nix {
@@ -1659,6 +1673,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   yesodStatic = callPackage ../development/libraries/haskell/yesod-static {};
 
+  yesodTest = callPackage ../development/libraries/haskell/yesod-test {};
+
   yst = callPackage ../development/libraries/haskell/yst {};
 
   zeromqHaskell = callPackage ../development/libraries/haskell/zeromq-haskell {};