Added HAppS and gitit plus dependencies.

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

18 files changed, 272 insertions, 4 deletions

diff --git a/pkgs/development/libraries/haskell/Diff/default.nix b/pkgs/development/libraries/haskell/Diff/default.nix
new file mode 100644
index 00000000000..ae408f69d4c
--- /dev/null
+++ b/pkgs/development/libraries/haskell/Diff/default.nix
@@ -0,0 +1,11 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "Diff";
+  version = "0.1.2";
+  sha256 = "f831ce6029a75b54dd69801d865ed45284f7dacf723fe5fd81758ad03f8eef5e";
+  meta = {
+    description = "O(ND) diff algorithm in Haskell";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/HAppS/HAppS-Data.nix b/pkgs/development/libraries/haskell/HAppS/HAppS-Data.nix
new file mode 100644
index 00000000000..e41cd9515a8
--- /dev/null
+++ b/pkgs/development/libraries/haskell/HAppS/HAppS-Data.nix
@@ -0,0 +1,25 @@
+{cabal, mtl, sybWithClass, HaXml, HAppSUtil, bytestring, binary}:
+
+cabal.mkDerivation (self : {
+    pname = "HAppS-Data";
+    version = "0.9.3";
+    sha256 = "b23c6f4a949927194e47f9781edc3b7d38513210de4a24987859d68b375bc335";
+    propagatedBuildInputs = [mtl sybWithClass HaXml HAppSUtil bytestring binary];
+    meta = {
+        description = ''HAppS data manipulation libraries'';
+        longDescription = ''
+          This package provides libraries for:
+
+            * Deriving instances for your datatypes.
+
+            * Producing default values of Haskell datatypes.
+
+            * Normalizing values of Haskell datatypes.
+
+            * Marshalling Haskell values to and from XML.
+
+            * Marshalling Haskell values to and from HTML forms.
+        '';
+        license = "free";
+    };
+})
diff --git a/pkgs/development/libraries/haskell/HAppS/HAppS-IxSet.nix b/pkgs/development/libraries/haskell/HAppS/HAppS-IxSet.nix
new file mode 100644
index 00000000000..57aafa82eb4
--- /dev/null
+++ b/pkgs/development/libraries/haskell/HAppS/HAppS-IxSet.nix
@@ -0,0 +1,12 @@
+{cabal, mtl, hslogger, HAppSUtil, HAppSState, HAppSData, sybWithClass}:
+
+cabal.mkDerivation (self : {
+    pname = "HAppS-IxSet";
+    version = "0.9.3";
+    sha256 = "ebacd72e153bbcafb18bf4fa607550de98f8a991e9cfd8314b572cacf155a372";
+    propagatedBuildInputs = [mtl hslogger HAppSUtil HAppSState HAppSData sybWithClass];
+    meta = {
+        longDescription = ''Web framework'';
+        license = "free";
+    };
+})
diff --git a/pkgs/development/libraries/haskell/HAppS/HAppS-Server.nix b/pkgs/development/libraries/haskell/HAppS/HAppS-Server.nix
new file mode 100644
index 00000000000..02b3b58f73a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/HAppS/HAppS-Server.nix
@@ -0,0 +1,13 @@
+{cabal, HaXml, parsec, mtl, network, hslogger, HAppSData, HAppSUtil, HAppSState, HAppSIxSet, HTTP, xhtml, html, bytestring}:
+
+cabal.mkDerivation (self : {
+    pname = "HAppS-Server";
+    version = "0.9.3.1";
+    sha256 = "b03129f332c35cd558b0f32bc626321dcfa2647dd7ddf67f3403eca8c4c52038";
+    propagatedBuildInputs = [HaXml parsec mtl network hslogger HAppSData HAppSUtil HAppSState HAppSIxSet HTTP xhtml html bytestring];
+    meta = {
+        description = ''Web related tools and services.'';
+        longDescription = ''Web framework'';
+        license = "free";
+    };
+})
diff --git a/pkgs/development/libraries/haskell/HAppS/HAppS-State.nix b/pkgs/development/libraries/haskell/HAppS/HAppS-State.nix
new file mode 100644
index 00000000000..04fea3f778a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/HAppS/HAppS-State.nix
@@ -0,0 +1,13 @@
+{cabal, HaXml, mtl, network, stm, hslogger, HAppSUtil, HAppSData, bytestring, binary, hspread}:
+
+cabal.mkDerivation (self : {
+    pname = "HAppS-State";
+    version = "0.9.3";
+    sha256 = "5099e635f8fcf56f775947a241a24e1aab6eb6d9fee0406e6a2169c4c8b331e4";
+    propagatedBuildInputs = [HaXml mtl network stm hslogger HAppSUtil HAppSData bytestring binary hspread];
+    meta = {
+        description = ''Event-based distributed state.'';
+        longDescription = ''Web framework'';
+        license = "free";
+    };
+})
diff --git a/pkgs/development/libraries/haskell/HAppS/HAppS-Util.nix b/pkgs/development/libraries/haskell/HAppS/HAppS-Util.nix
new file mode 100644
index 00000000000..9f55cc2fa6d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/HAppS/HAppS-Util.nix
@@ -0,0 +1,12 @@
+{cabal, mtl, hslogger, bytestring}:
+
+cabal.mkDerivation (self : {
+    pname = "HAppS-Util";
+    version = "0.9.3";
+    sha256 = "f9120d256e37111b6203dfc4eb598dd438c87e53bb9eb37258c999dd49b8e655";
+    propagatedBuildInputs = [mtl hslogger bytestring];
+    meta = {
+        description = ''Web framework'';
+        license = "free";
+    };
+})
diff --git a/pkgs/development/libraries/haskell/HStringTemplate/default.nix b/pkgs/development/libraries/haskell/HStringTemplate/default.nix
new file mode 100644
index 00000000000..0d2d723ef08
--- /dev/null
+++ b/pkgs/development/libraries/haskell/HStringTemplate/default.nix
@@ -0,0 +1,12 @@
+{cabal, parsec, time}:
+
+cabal.mkDerivation (self : {
+  pname = "HStringTemplate";
+  version = "0.5.1.3";
+  sha256 = "1f9da3afcb2441d450051ea9836f25df69430eaf17593c39199ad686a828e044";
+  propagatedBuildInputs = [parsec time];
+  meta = {
+    description = "StringTemplate implementation in Haskell";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/datetime/default.nix b/pkgs/development/libraries/haskell/datetime/default.nix
new file mode 100644
index 00000000000..45ec971ce8a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/datetime/default.nix
@@ -0,0 +1,11 @@
+{cabal, QuickCheck, time}:
+
+cabal.mkDerivation (self : {
+  pname = "datetime";
+  version = "0.1";
+  sha256 = "931acc70cb45922c95f2c3225d04619e19fd9c5947a66ae69e96d6e693195048";
+  propagatedBuildInputs = [QuickCheck time];
+  meta = {
+    description = "Utilities to make Data.Time.* easier to use";
+  };
+})
diff --git a/pkgs/development/libraries/haskell/filestore/default.nix b/pkgs/development/libraries/haskell/filestore/default.nix
new file mode 100644
index 00000000000..db84d059782
--- /dev/null
+++ b/pkgs/development/libraries/haskell/filestore/default.nix
@@ -0,0 +1,12 @@
+{cabal, datetime, parsec, regexPosix, split, time, utf8String, xml, Diff}:
+
+cabal.mkDerivation (self : {
+  pname = "filestore";
+  version = "0.3.1";
+  sha256 = "f18baafb50367d8d0a0e8da2873fd97033bb763d8776473e594c84c079017aa0";
+  propagatedBuildInputs = [datetime parsec regexPosix split time utf8String xml Diff];
+  meta = {
+    description = "Interface for versioning file stores";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix
new file mode 100644
index 00000000000..bee6f3fb564
--- /dev/null
+++ b/pkgs/development/libraries/haskell/gitit/default.nix
@@ -0,0 +1,17 @@
+{cabal, HAppSServer, HStringTemplate, HTTP, SHA, cgi, datetime,
+ filestore, highlightingKate, mtl, network, pandoc, parsec,
+ recaptcha, utf8String, xhtml, zlib}:
+
+cabal.mkDerivation (self : {
+  pname = "gitit";
+  version = "0.5.3";
+  sha256 = "d8e1c319e52edc6f2e92d1d22b8995f38b31f6aa0b6649aa73877e889ff45851";
+  propagatedBuildInputs =
+    [HAppSServer HStringTemplate HTTP SHA cgi datetime filestore
+     highlightingKate mtl network pandoc parsec recaptcha utf8String
+     xhtml zlib];
+  meta = {
+    description = "Wiki using HAppS, git or darcs, and pandoc";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix
new file mode 100644
index 00000000000..f94f768febb
--- /dev/null
+++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix
@@ -0,0 +1,11 @@
+{cabal, parsec, pcreLight, xhtml}:
+
+cabal.mkDerivation (self : {
+  pname = "highlighting-kate";
+  version = "0.2.5";
+  sha256 = "0a11f29a61b9c907d3b79540e0b2ac3b6194bd4bc37b6405973cd9eeb7a9a868";
+  propagatedBuildInputs = [parsec pcreLight xhtml];
+  meta = {
+    description = "Syntax highlighting";
+  };
+})  
diff --git a/pkgs/development/libraries/haskell/hspread/default.nix b/pkgs/development/libraries/haskell/hspread/default.nix
new file mode 100644
index 00000000000..cab021d1524
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hspread/default.nix
@@ -0,0 +1,11 @@
+{cabal, binary, network}:
+
+cabal.mkDerivation (self : {
+  pname = "hspread";
+  version = "0.3.3";
+  sha256 = "6e8a9ecc1a6b1cc767aa188e2f4c04b77b321fd14000cac8f71dd6a7b82afbfc";
+  propagatedBuildInputs = [binary network];
+  meta = {
+    description = "A client library for the spread toolkit";
+  };
+})
diff --git a/pkgs/development/libraries/haskell/recaptcha/default.nix b/pkgs/development/libraries/haskell/recaptcha/default.nix
new file mode 100644
index 00000000000..9e2f7c8391b
--- /dev/null
+++ b/pkgs/development/libraries/haskell/recaptcha/default.nix
@@ -0,0 +1,12 @@
+{cabal, HTTP, network, xhtml}:
+
+cabal.mkDerivation (self : {
+  pname = "recaptcha";
+  version = "0.1";
+  sha256 = "de00e6e3aadd99a1cd036ce4b413ebe02d59c1b9cfd3032f122735cca1f25144";
+  propagatedBuildInputs = [HTTP network xhtml];
+  meta = {
+    description = "Functions for using the reCAPTCHA service in web applications";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/split/default.nix b/pkgs/development/libraries/haskell/split/default.nix
new file mode 100644
index 00000000000..a006cbe072e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/split/default.nix
@@ -0,0 +1,10 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "split";
+  version = "0.1.1";
+  sha256 = "5f6513e717abfaa8eab46d7181093a21d335fed33dff20fa4628008b770a763f";
+  meta = {
+    description = "Combinator library for splitting lists";
+  };
+})
diff --git a/pkgs/development/libraries/haskell/syb/syb-with-class.nix b/pkgs/development/libraries/haskell/syb/syb-with-class.nix
new file mode 100644
index 00000000000..5e9c4dff083
--- /dev/null
+++ b/pkgs/development/libraries/haskell/syb/syb-with-class.nix
@@ -0,0 +1,10 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "syb-with-class";
+  version = "0.5.1";
+  sha256 = "71f8ada3f5c3a41cbbc73f11ba4d1ffd51509716657564f12856f94f041ecbd6";
+  meta = {
+    description = "Scrap Your Boilerplate With Class";
+  };
+})
diff --git a/pkgs/development/libraries/haskell/xml/default.nix b/pkgs/development/libraries/haskell/xml/default.nix
new file mode 100644
index 00000000000..275f6e6d5b0
--- /dev/null
+++ b/pkgs/development/libraries/haskell/xml/default.nix
@@ -0,0 +1,11 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "xml";
+  version = "1.3.4";
+  sha256 = "87da09814e79d8d1f31eba4936b291d4522224187d44e1e085839726f0e7a0dd";
+  meta = {
+    description = "A simple XML library";
+  };
+})  
+
diff --git a/pkgs/development/tools/haskell/hslogger/default.nix b/pkgs/development/tools/haskell/hslogger/default.nix
index dbd0b9ca30b..00f660b6638 100644
--- a/pkgs/development/tools/haskell/hslogger/default.nix
+++ b/pkgs/development/tools/haskell/hslogger/default.nix
@@ -1,12 +1,11 @@
-{cabal, mtl ,network, time}:
+{cabal, mtl, network, time}:
 
 cabal.mkDerivation (self : {
   pname = "hslogger";
   version = "1.0.7";
-  name = self.fname;
   sha256 = "0fb8aagylrr5z19801szj868apcns8lafc4ydx9v0ka2lbmjqvbz";
-  extraBuildInputs = [ mtl time network ];
+  propagatedBuildInputs = [ mtl time network ];
   meta = {
-    description = "logger library modeled after pylogger";
+    description = "Versatile logging framework";
   };
 })
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 841a25b0df4..b9229dec5bd 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -67,6 +67,14 @@ rec {
     inherit cabal;
   };
 
+  datetime = import ../development/libraries/haskell/datetime {
+    inherit cabal QuickCheck time;
+  };
+
+  Diff = import ../development/libraries/haskell/Diff {
+    inherit cabal;
+  };
+
   digest = import ../development/libraries/haskell/digest {
     inherit cabal;
     inherit (pkgs) zlib;
@@ -93,6 +101,10 @@ rec {
     inherit cabal;
   };
 
+  filestore = import ../development/libraries/haskell/filestore {
+    inherit cabal datetime parsec regexPosix split time utf8String xml Diff;
+  };
+
   fgl = import ../development/libraries/haskell/fgl {
     inherit cabal mtl;
   };
@@ -113,6 +125,12 @@ rec {
     inherit cabal syb; inherit (pkgs.bleedingEdgeRepos) sourceByName;
   };
 
+  gitit = import ../development/libraries/haskell/gitit {
+    inherit cabal HAppSServer HStringTemplate HTTP SHA cgi datetime
+      filestore highlightingKate mtl network pandoc parsec recaptcha
+      utf8String xhtml zlib;
+  };
+
   GLUT = import ../development/libraries/haskell/GLUT {
     inherit cabal OpenGL;
     glut = pkgs.freeglut;
@@ -125,6 +143,26 @@ rec {
     inherit (pkgs) stdenv fetchurl pkgconfig gnome cairo;
   };
 
+  HAppSData = import ../development/libraries/haskell/HAppS/HAppS-Data.nix {
+    inherit cabal mtl sybWithClass HaXml HAppSUtil bytestring binary;
+  };
+
+  HAppSIxSet = import ../development/libraries/haskell/HAppS/HAppS-IxSet.nix {
+    inherit cabal mtl hslogger HAppSUtil HAppSState HAppSData sybWithClass;
+  };
+
+  HAppSUtil = import ../development/libraries/haskell/HAppS/HAppS-Util.nix {
+    inherit cabal mtl hslogger bytestring;
+  };
+
+  HAppSServer = import ../development/libraries/haskell/HAppS/HAppS-Server.nix {
+    inherit cabal HaXml parsec mtl network hslogger HAppSData HAppSUtil HAppSState HAppSIxSet HTTP xhtml html bytestring;
+  };
+
+  HAppSState = import ../development/libraries/haskell/HAppS/HAppS-State.nix {
+    inherit cabal HaXml mtl network stm hslogger HAppSUtil HAppSData bytestring binary hspread;
+  };
+
   haskeline = import ../development/libraries/haskell/haskeline {
     inherit cabal extensibleExceptions mtl utf8String;
   };
@@ -179,6 +217,10 @@ rec {
     inherit (pkgs) sqlite;
   };
 
+  highlightingKate = import ../development/libraries/haskell/highlighting-kate {
+    inherit cabal parsec pcreLight xhtml;
+  };
+
   Hipmunk = import ../development/libraries/haskell/Hipmunk {
     inherit cabal;
   };
@@ -187,6 +229,14 @@ rec {
     inherit cabal;
   };
 
+  HStringTemplate = import ../development/libraries/haskell/HStringTemplate {
+    inherit cabal parsec time;
+  };
+
+  hspread = import ../development/libraries/haskell/hspread {
+    inherit cabal binary network;
+  };
+
   html = import ../development/libraries/haskell/html {
     inherit cabal;
   };
@@ -284,6 +334,10 @@ rec {
     inherit (pkgs) readline ncurses;
   };
 
+  recaptcha = import ../development/libraries/haskell/recaptcha {
+    inherit cabal HTTP network xhtml;
+  };
+
   regexBase = import ../development/libraries/haskell/regex-base {
     inherit cabal mtl;
   };
@@ -300,6 +354,10 @@ rec {
     inherit cabal;
   };
 
+  sybWithClass = import ../development/libraries/haskell/syb/syb-with-class.nix {
+    inherit cabal;
+  };
+
   SDLImage = import ../development/libraries/haskell/SDL-image {
     inherit cabal SDL;
     inherit (pkgs) SDL_image;
@@ -336,6 +394,10 @@ rec {
     inherit cabal Shellac readline;
   };
 
+  split = import ../development/libraries/haskell/split {
+    inherit cabal;
+  };
+
   stm = import ../development/libraries/haskell/stm {
     inherit cabal;
   };
@@ -419,6 +481,10 @@ rec {
     inherit cabal;
   };
 
+  xml = import ../development/libraries/haskell/xml {
+    inherit cabal;
+  };
+
   zipArchive = import ../development/libraries/haskell/zip-archive {
     inherit cabal binary mtl utf8String zlib digest;
   };