summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2014-06-14 11:43:26 -0400
committerShea Levy <shea@shealevy.com>2014-06-14 11:43:26 -0400
commit564c4515b10e995e4ad8f37a17598af73f3e3de4 (patch)
tree0ad76011e755582d0202b2326d9b8862515fb013 /pkgs/development
parentdcfdab62c9fd46c0046f3f1aa6a2b192054f972a (diff)
parent8a396ee56a6d832fee3450d3b64300c6cbc311d4 (diff)
downloadnixpkgs-564c4515b10e995e4ad8f37a17598af73f3e3de4.tar
nixpkgs-564c4515b10e995e4ad8f37a17598af73f3e3de4.tar.gz
nixpkgs-564c4515b10e995e4ad8f37a17598af73f3e3de4.tar.bz2
nixpkgs-564c4515b10e995e4ad8f37a17598af73f3e3de4.tar.lz
nixpkgs-564c4515b10e995e4ad8f37a17598af73f3e3de4.tar.xz
nixpkgs-564c4515b10e995e4ad8f37a17598af73f3e3de4.tar.zst
nixpkgs-564c4515b10e995e4ad8f37a17598af73f3e3de4.zip
Merge pull request #2936 from sol/master
Add haskell-hspec-wai
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/libraries/haskell/aeson-qq/default.nix4
-rw-r--r--pkgs/development/libraries/haskell/hspec-wai/default.nix23
2 files changed, 25 insertions, 2 deletions
diff --git a/pkgs/development/libraries/haskell/aeson-qq/default.nix b/pkgs/development/libraries/haskell/aeson-qq/default.nix
index 1da43428f12..36cb42d0b7f 100644
--- a/pkgs/development/libraries/haskell/aeson-qq/default.nix
+++ b/pkgs/development/libraries/haskell/aeson-qq/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "aeson-qq";
-  version = "0.7.0";
-  sha256 = "1sq34pnwiyf5lngqph4m463ijr185akzbrdi3i40zmqlrymssv3c";
+  version = "0.7.1";
+  sha256 = "1b2ham1h6mlm49ax9k2agf8yymbgkk094nq2apn703i2d9v00im6";
   buildDepends = [ aeson haskellSrcMeta parsec text vector ];
   testDepends = [ aeson hspec ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/hspec-wai/default.nix b/pkgs/development/libraries/haskell/hspec-wai/default.nix
new file mode 100644
index 00000000000..639aa484dfa
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hspec-wai/default.nix
@@ -0,0 +1,23 @@
+{ cabal, aeson, aesonQq, caseInsensitive, doctest, hspec2
+, hspecMeta, httpTypes, markdownUnlit, scotty, text, transformers
+, wai, waiExtra
+}:
+
+cabal.mkDerivation (self: {
+  pname = "hspec-wai";
+  version = "0.2.0";
+  sha256 = "1hykc6k3kkjzz0x16i6ijcavsxfc003sp7fwvg2v9pzpmf9rfhhd";
+  buildDepends = [
+    aeson aesonQq caseInsensitive hspec2 httpTypes text transformers
+    wai waiExtra
+  ];
+  testDepends = [
+    aeson caseInsensitive doctest hspec2 hspecMeta httpTypes
+    markdownUnlit scotty text transformers wai waiExtra
+  ];
+  meta = {
+    description = "Experimental Hspec support for testing WAI applications (depends on hspec2!)";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})