* added haskell libraries: webserver, json 0.3.6, http 3001, base64string, CS173Tourney

* added dep on getopt to couchdb


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

2 files changed, 37 insertions, 1 deletions

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1b266c83d410..53ed115e2b20 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4969,7 +4969,7 @@ let
   };
 
   couchdb = import ../servers/http/couchdb {
-    inherit fetchurl stdenv erlang spidermonkey icu;
+    inherit fetchurl stdenv erlang spidermonkey icu getopt; 
   };
 
   fingerd_bsd = import ../servers/fingerd/bsd-fingerd {
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 8ffeeda0e28a..8ee7ccc0697c 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -71,6 +71,13 @@ rec {
     inherit cabal HUnit QuickCheck;
   };
 
+  CS173Tourney = import ../development/libraries/haskell/CS173Tourney {
+    inherit cabal ;
+    inherit (pkgs) fetchgit ;
+    inherit time hslogger Crypto base64string CouchDB WebServer WebServerExtras;
+    json = json_036;
+  };
+
   dataenc = import ../development/libraries/haskell/dataenc {
     inherit cabal;
   };
@@ -215,6 +222,10 @@ rec {
     inherit cabal mtl network parsec;
   };
 
+  HTTP_3001 = import ../development/libraries/haskell/HTTP/3001.nix {
+    inherit cabal mtl network parsec;
+  };
+
   haxr = import ../development/libraries/haskell/haxr {
     inherit cabal HaXml HTTP dataenc time;
   };
@@ -289,6 +300,10 @@ rec {
     inherit cabal mtl;
   };
 
+  json_036 = import ../development/libraries/haskell/json/0.3.6.nix {
+    inherit cabal mtl;
+  };
+
   maybench = import ../development/libraries/haskell/maybench {
     inherit cabal benchpress;
   };
@@ -536,6 +551,27 @@ rec {
     inherit cabal utf8String terminfo;
   };
 
+  WebServer = import ../development/libraries/haskell/WebServer {
+    inherit cabal network mtl parsec;
+    inherit (pkgs) fetchgit;
+  };
+
+  WebServerExtras = import ../development/libraries/haskell/WebServer-Extras {
+    inherit cabal Crypto WebServer base64string hslogger mtl;
+    json = json_036;
+    inherit (pkgs) fetchgit;
+  };
+
+  CouchDB = import ../development/libraries/haskell/CouchDB {
+    inherit cabal network mtl ;
+    HTTP = HTTP_3001;
+    json = json_036;
+  };
+
+  base64string = import ../development/libraries/haskell/base64-string {
+    inherit cabal;
+  };
+
   wx = import ../development/libraries/haskell/wxHaskell/wx.nix {
     inherit cabal stm wxcore;
   };