Added happstack and dependencies.

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

11 files changed, 157 insertions, 5 deletions

diff --git a/pkgs/development/libraries/haskell/MaybeT/default.nix b/pkgs/development/libraries/haskell/MaybeT/default.nix
new file mode 100644
index 00000000000..783ff85d0c2
--- /dev/null
+++ b/pkgs/development/libraries/haskell/MaybeT/default.nix
@@ -0,0 +1,14 @@
+{cabal, mtl}:
+
+cabal.mkDerivation (self : {
+  pname = "MaybeT";
+  version = "0.1.2";
+  sha256 = "995e61165122656807d84174e5c1516340fd7ddeba6571c20751352a8476b632";
+  propagatedBuildInputs = [mtl];
+  meta = {
+    description = "MaybeT monad transformer";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/SMTPClient/default.nix b/pkgs/development/libraries/haskell/SMTPClient/default.nix
new file mode 100644
index 00000000000..2da9beea525
--- /dev/null
+++ b/pkgs/development/libraries/haskell/SMTPClient/default.nix
@@ -0,0 +1,14 @@
+{cabal, hsemail, network}:
+
+cabal.mkDerivation (self : {
+  pname = "SMTPClient";
+  version = "1.0.2";
+  sha256 = "b835cebf22e9281778deeec3ceffeb95aa8ae9c0e1f97e8e9734cf5d87ecba5f";
+  propagatedBuildInputs = [hsemail network];
+  meta = {
+    description = "A simple SMTP client library";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/happstack/happstack-data.nix b/pkgs/development/libraries/haskell/happstack/happstack-data.nix
new file mode 100644
index 00000000000..9b18652642f
--- /dev/null
+++ b/pkgs/development/libraries/haskell/happstack/happstack-data.nix
@@ -0,0 +1,13 @@
+{cabal, mtl, sybWithClass, HaXml, happstackUtil, binary}:
+
+cabal.mkDerivation (self : {
+    pname = "happstack-data";
+    version = "0.4.1";
+    sha256 = "0d1f96472a4e13b9a5218bce8bf819a50d1773b7e110141ab235d1d7701e39f6";
+    propagatedBuildInputs = [mtl sybWithClass HaXml happstackUtil binary];
+    meta = {
+        description = "Happstack data manipulation libraries";
+        license = "BSD";
+        maintainers = [self.stdenv.lib.maintainers.andres];
+    };
+})
diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
new file mode 100644
index 00000000000..c1d66c0fabc
--- /dev/null
+++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
@@ -0,0 +1,16 @@
+{cabal, HUnit, HaXml, MaybeT, parsec, sendfile, utf8String, mtl, network, hslogger, happstackData, happstackUtil, xhtml, html, zlib}:
+
+cabal.mkDerivation (self : {
+    pname = "happstack-server";
+    version = "0.4.1";
+    sha256 = "2a5d32b4e635160ffab8a90891d9c5ca0433969944ae4013ec8cebe25ba63658";
+    propagatedBuildInputs = [
+      HUnit HaXml MaybeT happstackData happstackUtil hslogger html
+      mtl network parsec sendfile utf8String xhtml zlib
+    ];
+    meta = {
+        description = "Web related tools and services";
+        license = "BSD";
+        maintainers = [self.stdenv.lib.maintainers.andres];
+    };
+})
diff --git a/pkgs/development/libraries/haskell/happstack/happstack-util.nix b/pkgs/development/libraries/haskell/happstack/happstack-util.nix
new file mode 100644
index 00000000000..4ba0854d37a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/happstack/happstack-util.nix
@@ -0,0 +1,17 @@
+{cabal, mtl, hslogger, HUnit, QuickCheck, strictConcurrency,
+ unixCompat, SMTPClient}:
+
+cabal.mkDerivation (self : {
+    pname = "happstack-util";
+    version = "0.4.1";
+    sha256 = "bb254140c30c39c420bc5a649da645f59df950f0a712c2dac4de1cc6572f05f9";
+    propagatedBuildInputs = [
+      mtl hslogger HUnit QuickCheck strictConcurrency unixCompat
+      SMTPClient
+    ];
+    meta = {
+        description = "Miscellaneous utilities for Happstack packages";
+        license = "BSD";
+        maintainers = [self.stdenv.lib.maintainers.andres];
+    };
+})
diff --git a/pkgs/development/libraries/haskell/hsemail/default.nix b/pkgs/development/libraries/haskell/hsemail/default.nix
new file mode 100644
index 00000000000..bce28aa71fa
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hsemail/default.nix
@@ -0,0 +1,14 @@
+{cabal, mtl, parsec}:
+
+cabal.mkDerivation (self : {
+  pname = "hsemail";
+  version = "1.6";
+  sha256 = "a8ba7e8cfb9213bb2ee61166bc8352e4353560d06f418a0c729aeb1d50b3a1fd";
+  propagatedBuildInputs = [mtl parsec];
+  meta = {
+    description = "Internet Message Parsers";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/sendfile/default.nix b/pkgs/development/libraries/haskell/sendfile/default.nix
new file mode 100644
index 00000000000..f35719d75f4
--- /dev/null
+++ b/pkgs/development/libraries/haskell/sendfile/default.nix
@@ -0,0 +1,14 @@
+{cabal, network}:
+
+cabal.mkDerivation (self : {
+  pname = "sendfile";
+  version = "0.6.1";
+  sha256 = "c21b7f0f9a03a5e6d9b0691f5f0be9969d175f0514becdc199f0fd49097e51a2";
+  propagatedBuildInputs = [network];
+  meta = {
+    description = "A portable sendfile library";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/strictConcurrency/default.nix b/pkgs/development/libraries/haskell/strictConcurrency/default.nix
index 6e43e157c37..5e90fd74e1a 100644
--- a/pkgs/development/libraries/haskell/strictConcurrency/default.nix
+++ b/pkgs/development/libraries/haskell/strictConcurrency/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self : {
   pname = "strict-concurrency";
-  version = "0.2.1";
-  sha256 = "8838600033bde2ce7ca6bd95a3815412da67244b57dfc0e2246a8f2469f5fd9c";
+  version = "0.2.3";
+  sha256 = "21641b983b226e47727ff565184a5f2b312c7979ff487a5e478f5cfc82f78f18";
   propagatedBuildInputs = [parallel];
   meta = {
     description = "Strict concurrency abstractions";
diff --git a/pkgs/development/libraries/haskell/syb/syb-with-class.nix b/pkgs/development/libraries/haskell/syb/syb-with-class.nix
index 5e9c4dff083..e6ea92a169e 100644
--- a/pkgs/development/libraries/haskell/syb/syb-with-class.nix
+++ b/pkgs/development/libraries/haskell/syb/syb-with-class.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self : {
   pname = "syb-with-class";
-  version = "0.5.1";
-  sha256 = "71f8ada3f5c3a41cbbc73f11ba4d1ffd51509716657564f12856f94f041ecbd6";
+  version = "0.6";
+  sha256 = "8ee836b491b0f64ab0920d1a7314323439665a7b1afa78810cbbc95dc658bfdc";
   meta = {
     description = "Scrap Your Boilerplate With Class";
   };
diff --git a/pkgs/development/libraries/haskell/unix-compat/default.nix b/pkgs/development/libraries/haskell/unix-compat/default.nix
new file mode 100644
index 00000000000..ae1c54ec973
--- /dev/null
+++ b/pkgs/development/libraries/haskell/unix-compat/default.nix
@@ -0,0 +1,13 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "unix-compat";
+  version = "0.1.2.1";
+  sha256 = "553326e140f71f09cedeec5f74666171c2ad2b3d9ba4312da97da02cbf8a2e85";
+  meta = {
+    description = "Portable POSIX-compatibility layer";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})  
+
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index b731bef93a9..aebadc3cb2b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -224,6 +224,20 @@ rec {
     inherit cabal HaXml mtl network stm hslogger HAppSUtil HAppSData bytestring binary hspread;
   };
 
+  /* cannot yet get this to work with 6.12.1 */
+  happstackData = import ../development/libraries/haskell/happstack/happstack-data.nix {
+    inherit cabal mtl sybWithClass HaXml happstackUtil binary;
+  };
+
+  happstackUtil = import ../development/libraries/haskell/happstack/happstack-util.nix {
+    inherit cabal mtl hslogger QuickCheck HUnit strictConcurrency unixCompat SMTPClient;
+  };
+
+  happstackServer = import ../development/libraries/haskell/happstack/happstack-server.nix {
+    inherit cabal HUnit HaXml MaybeT parsec sendfile utf8String mtl hslogger happstackData happstackUtil xhtml html zlib;
+    network = network2217;
+  };
+
   hashedStorage = import ../development/libraries/haskell/hashed-storage {
     inherit cabal mtl zlib mmap;
   };
@@ -340,6 +354,10 @@ rec {
     inherit cabal;
   };
 
+  hsemail = import ../development/libraries/haskell/hsemail {
+    inherit cabal mtl parsec;
+  };
+
   HStringTemplate = import ../development/libraries/haskell/HStringTemplate {
     inherit cabal parsec time;
   };
@@ -388,6 +406,10 @@ rec {
     inherit cabal benchpress;
   };
 
+  MaybeT = import ../development/libraries/haskell/MaybeT {
+    inherit cabal mtl;
+  };
+
   MaybeTTransformers = import ../development/libraries/haskell/MaybeT-transformers {
     inherit cabal transformers monadsFd;
   };
@@ -567,6 +589,11 @@ rec {
     inherit cabal ghcPaths ghcSyb hslogger json multiset time uniplate;
   };
 
+  sendfile = import ../development/libraries/haskell/sendfile {
+    inherit cabal;
+    network = network2217;
+  };
+
   syb = import ../development/libraries/haskell/syb {
     inherit cabal;
   };
@@ -611,6 +638,11 @@ rec {
     inherit cabal Shellac readline;
   };
 
+  SMTPClient = import ../development/libraries/haskell/SMTPClient {
+    inherit cabal hsemail;
+    network = network2217;
+  };
+
   split = import ../development/libraries/haskell/split {
     inherit cabal;
   };
@@ -665,6 +697,10 @@ rec {
     inherit cabal;
   };
 
+  unixCompat = import ../development/libraries/haskell/unix-compat {
+    inherit cabal;
+  };
+
   utf8String = import ../development/libraries/haskell/utf8-string {
     inherit cabal;
   };
@@ -843,7 +879,8 @@ rec {
   };
 
   hslogger = import ../development/tools/haskell/hslogger {
-    inherit cabal mtl network time;
+    inherit cabal mtl time;
+    network = network2217;
   };
 
   mkcabal = import ../development/tools/haskell/mkcabal {