Updated gitit plus dependencies.

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

15 files changed, 161 insertions, 33 deletions

diff --git a/pkgs/development/libraries/haskell/ConfigFile/default.nix b/pkgs/development/libraries/haskell/ConfigFile/default.nix
new file mode 100644
index 00000000000..3ad1f545067
--- /dev/null
+++ b/pkgs/development/libraries/haskell/ConfigFile/default.nix
@@ -0,0 +1,14 @@
+{cabal, mtl, parsec, MissingH}:
+
+cabal.mkDerivation (self : {
+  pname = "ConfigFile";
+  version = "1.0.6";
+  sha256 = "339722184b86d53d8b361933e572b6e1478824c7eba3fb66b67d0eb5245cd038";
+  propagatedBuildInputs = [mtl parsec MissingH];
+  meta = {
+    description = "Configuration file reading & writing";
+    license = "LGPL";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/HStringTemplate/default.nix b/pkgs/development/libraries/haskell/HStringTemplate/default.nix
index 0d2d723ef08..ddf5740d95a 100644
--- a/pkgs/development/libraries/haskell/HStringTemplate/default.nix
+++ b/pkgs/development/libraries/haskell/HStringTemplate/default.nix
@@ -1,10 +1,10 @@
-{cabal, parsec, time}:
+{cabal, parsec, time, text, utf8String, parallel}:
 
 cabal.mkDerivation (self : {
   pname = "HStringTemplate";
-  version = "0.5.1.3";
-  sha256 = "1f9da3afcb2441d450051ea9836f25df69430eaf17593c39199ad686a828e044";
-  propagatedBuildInputs = [parsec time];
+  version = "0.6.2";
+  sha256 = "1d8ae847cb2b92f6d083ee1ed5db00c719e51fe43017d4289dea61335a116103";
+  propagatedBuildInputs = [parsec time text utf8String parallel];
   meta = {
     description = "StringTemplate implementation in Haskell";
   };
diff --git a/pkgs/development/libraries/haskell/MissingH/default.nix b/pkgs/development/libraries/haskell/MissingH/default.nix
new file mode 100644
index 00000000000..252eb88c929
--- /dev/null
+++ b/pkgs/development/libraries/haskell/MissingH/default.nix
@@ -0,0 +1,14 @@
+{cabal, HUnit, hslogger, network, parsec, regexCompat}:
+
+cabal.mkDerivation (self : {
+  pname = "MissingH";
+  version = "1.1.0.3";
+  sha256 = "2d566511e8a347189cf864188d97f8406c6958c6f0a6fcf8cb1593c6bae13dbf";
+  propagatedBuildInputs = [HUnit hslogger network parsec regexCompat];
+  meta = {
+    description = "Large utility library";
+    license = "GPL";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/SHA/default.nix b/pkgs/development/libraries/haskell/SHA/default.nix
index 2d51cddca74..f958ec713a1 100644
--- a/pkgs/development/libraries/haskell/SHA/default.nix
+++ b/pkgs/development/libraries/haskell/SHA/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self : {
   pname = "SHA";
-  version = "1.4.0";
-  sha256 = "7f08042fddadd8e3795d627a042d1884b33e066ab67d03b6de92551a4ad9fc7d";
+  version = "1.4.1.1";
+  sha256 = "8ecdc91679d1aa1d4050e1124cf5af79ae2ece66aee3b907e1078d71bf03169a";
   propagatedBuildInputs = [binary];
   meta = {
     description = "Implementations of the SHA suite of message digest functions";
diff --git a/pkgs/development/libraries/haskell/cautious-file/default.nix b/pkgs/development/libraries/haskell/cautious-file/default.nix
new file mode 100644
index 00000000000..16fe6672bc7
--- /dev/null
+++ b/pkgs/development/libraries/haskell/cautious-file/default.nix
@@ -0,0 +1,13 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "cautious-file";
+  version = "0.1.5";
+  sha256 = "0d7b7bf530476b89ffc22bf6e586402b0fd6fd5571cc941df08838c5a890ad01";
+  meta = {
+    description = "Ways to write a file cautiously";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/feed/default.nix b/pkgs/development/libraries/haskell/feed/default.nix
new file mode 100644
index 00000000000..7ba92613c5e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/feed/default.nix
@@ -0,0 +1,14 @@
+{cabal, utf8String, xml}:
+
+cabal.mkDerivation (self : {
+  pname = "feed";
+  version = "0.3.7";
+  sha256 = "c2d539f763cdce1b1498f1fd0707b12078337aff690f01e41db0b6e3569c08aa";
+  propagatedBuildInputs = [utf8String xml];
+  meta = {
+    description = "Interfacing with RSS and Atom feeds";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/filestore/default.nix b/pkgs/development/libraries/haskell/filestore/default.nix
index db84d059782..2d3fc926857 100644
--- a/pkgs/development/libraries/haskell/filestore/default.nix
+++ b/pkgs/development/libraries/haskell/filestore/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self : {
   pname = "filestore";
-  version = "0.3.1";
-  sha256 = "f18baafb50367d8d0a0e8da2873fd97033bb763d8776473e594c84c079017aa0";
+  version = "0.3.4.1";
+  sha256 = "ad04333fae938ae7de747457a6bdee30c6e4b700733265dbd1f4f8ee363c8230";
   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
index bee6f3fb564..5bebdf7de35 100644
--- a/pkgs/development/libraries/haskell/gitit/default.nix
+++ b/pkgs/development/libraries/haskell/gitit/default.nix
@@ -1,17 +1,23 @@
-{cabal, HAppSServer, HStringTemplate, HTTP, SHA, cgi, datetime,
- filestore, highlightingKate, mtl, network, pandoc, parsec,
- recaptcha, utf8String, xhtml, zlib}:
+{cabal, happstackServer, happstackUtil, HStringTemplate, HTTP,
+ SHA, cgi, datetime,
+ filestore, highlightingKate, safe, mtl, network, pandoc, parsec,
+ recaptcha, utf8String, xhtml, zlib, ConfigFile, url,
+ cautiousFile, feed}:
 
 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];
+  version = "0.7.3.5";
+  sha256 = "50cf6b853d439904e54884660eba6ffdc31b938e077fd0d9457fba972d4bde9f";
+  propagatedBuildInputs = [
+    HStringTemplate happstackServer happstackUtil HTTP SHA cgi datetime
+    filestore highlightingKate safe
+    mtl network pandoc parsec recaptcha utf8String xhtml zlib ConfigFile
+    url cautiousFile feed
+  ];
   meta = {
     description = "Wiki using HAppS, git or darcs, and pandoc";
+    license = "GPL";
+    maintainers = [self.stdenv.lib.maintainers.andres];
   };
 })  
 
diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix
index f94f768febb..d6d69f398ba 100644
--- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix
+++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self : {
   pname = "highlighting-kate";
-  version = "0.2.5";
-  sha256 = "0a11f29a61b9c907d3b79540e0b2ac3b6194bd4bc37b6405973cd9eeb7a9a868";
+  version = "0.2.6.2";
+  sha256 = "3ed163888d45d5bf5ee5c2931e894f6ca2eb167a79ac8274d7f57341c4c5dca7";
   propagatedBuildInputs = [parsec pcreLight xhtml];
   meta = {
     description = "Syntax highlighting";
diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix
index 1e7ab185bd7..de77d27c8b0 100644
--- a/pkgs/development/libraries/haskell/pandoc/default.nix
+++ b/pkgs/development/libraries/haskell/pandoc/default.nix
@@ -1,10 +1,13 @@
-{cabal, mtl, network, parsec, utf8String, xhtml, zipArchive}:
+{cabal, mtl, network, parsec, utf8String, xhtml, zipArchive, HTTP, xml,
+ texmath}:
 
 cabal.mkDerivation (self : {
   pname = "pandoc";
-  version = "1.2";
-  sha256 = "e922c8f4765a8d105abf30dbe21a73961357929cd2fb8dfd323f0f62ca0723b4";
-  propagatedBuildInputs = [mtl network parsec utf8String xhtml zipArchive];
+  version = "1.5.1.1";
+  sha256 = "6d2283cb618fcaea5ee5cb885ef6532bc34628b351f14a6bd85b098d7a4128d9";
+  propagatedBuildInputs = [
+    mtl network parsec utf8String xhtml zipArchive HTTP xml texmath
+  ];
   meta = {
     description = "Conversion between markup formats";
   };
diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix
new file mode 100644
index 00000000000..66369cb60ba
--- /dev/null
+++ b/pkgs/development/libraries/haskell/texmath/default.nix
@@ -0,0 +1,14 @@
+{cabal, cgi, json, parsec, xml}:
+
+cabal.mkDerivation (self : {
+  pname = "texmath";
+  version = "0.2.0.3";
+  sha256 = "d355a298d28b9f5356926c2d2942f28ed07afa9d944cadfa47d8cdec73725b55";
+  propagatedBuildInputs = [cgi json parsec xml];
+  meta = {
+    description = "Conversion of LaTeX math formulas to MathML";
+    license = "GPL";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/url/default.nix b/pkgs/development/libraries/haskell/url/default.nix
new file mode 100644
index 00000000000..d82af144515
--- /dev/null
+++ b/pkgs/development/libraries/haskell/url/default.nix
@@ -0,0 +1,14 @@
+{cabal, utf8String}:
+
+cabal.mkDerivation (self : {
+  pname = "url";
+  version = "2.1.2";
+  sha256 = "2cf5c4296418afe3940ae4de66d867897b1382cc4d37a0b9a5ccffa16743ef91";
+  propagatedBuildInputs = [utf8String];
+  meta = {
+    description = "A library for working with URLs";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/xml/default.nix b/pkgs/development/libraries/haskell/xml/default.nix
index 275f6e6d5b0..096934dfeae 100644
--- a/pkgs/development/libraries/haskell/xml/default.nix
+++ b/pkgs/development/libraries/haskell/xml/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self : {
   pname = "xml";
-  version = "1.3.4";
-  sha256 = "87da09814e79d8d1f31eba4936b291d4522224187d44e1e085839726f0e7a0dd";
+  version = "1.3.5";
+  sha256 = "d61abd617e6e4d5b384e19403486ecc0e5dccf412a235acce2a7b7072e97c3ab";
   meta = {
     description = "A simple XML library";
   };
diff --git a/pkgs/development/libraries/haskell/zip-archive/default.nix b/pkgs/development/libraries/haskell/zip-archive/default.nix
index 11a7675c0d2..23fb5045cd4 100644
--- a/pkgs/development/libraries/haskell/zip-archive/default.nix
+++ b/pkgs/development/libraries/haskell/zip-archive/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self : {
   pname = "zip-archive";
-  version = "0.1.1.3";
-  sha256 = "2caa3e6020c394c740b942685306c71e91bebf6e499627dc20fdf0ac7925a57a";
+  version = "0.1.1.6";
+  sha256 = "16aafc5f74c880398413a7c2adaaf90cae86006dcda58f663c1e1d795add90aa";
   propagatedBuildInputs = [binary mtl utf8String zlib digest];
   meta = {
     description = "Library for creating and modifying zip archives";
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index aebadc3cb2b..8c48865a634 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -65,6 +65,10 @@ rec {
     inherit cabal bytestring network;
   };
 
+  cautiousFile = import ../development/libraries/haskell/cautious-file {
+    inherit cabal;
+  };
+
   cgi3001172 = import ../development/libraries/haskell/cgi/3001.1.7.2.nix {
     inherit cabal mtl parsec xhtml;
     network = network2217;
@@ -78,6 +82,10 @@ rec {
     inherit cabal ansiTerminal haskellLexer;
   };
 
+  ConfigFile = import ../development/libraries/haskell/ConfigFile {
+    inherit cabal mtl parsec MissingH;
+  };
+
   convertible = import ../development/libraries/haskell/convertible {
     inherit cabal mtl;
     time = time113;
@@ -148,6 +156,10 @@ rec {
     inherit cabal monadsFd;
   };
 
+  feed = import ../development/libraries/haskell/feed {
+    inherit cabal utf8String xml;
+  };
+
   filestore = import ../development/libraries/haskell/filestore {
     inherit cabal datetime parsec regexPosix split time utf8String xml Diff;
   };
@@ -179,9 +191,15 @@ rec {
   };
 
   gitit = import ../development/libraries/haskell/gitit {
-    inherit cabal HAppSServer HStringTemplate HTTP SHA cgi datetime
-      filestore highlightingKate mtl network pandoc parsec recaptcha
-      utf8String xhtml zlib;
+    inherit cabal happstackServer happstackUtil
+      HStringTemplate SHA datetime
+      filestore highlightingKate safe
+      mtl pandoc parsec recaptcha
+      utf8String xhtml zlib ConfigFile url
+      cautiousFile feed;
+    cgi = cgi3001172;
+    HTTP = HTTP400009;
+    network = network2217;
   };
 
   GLUT2121 = import ../development/libraries/haskell/GLUT/2.1.2.1.nix {
@@ -359,7 +377,7 @@ rec {
   };
 
   HStringTemplate = import ../development/libraries/haskell/HStringTemplate {
-    inherit cabal parsec time;
+    inherit cabal parsec time text utf8String parallel;
   };
 
   hspread = import ../development/libraries/haskell/hspread {
@@ -414,6 +432,11 @@ rec {
     inherit cabal transformers monadsFd;
   };
 
+  MissingH = import ../development/libraries/haskell/MissingH {
+    inherit cabal HUnit hslogger parsec regexCompat;
+    network = network2217;
+  };
+
   mmap = import ../development/libraries/haskell/mmap {
     inherit cabal;
   };
@@ -480,7 +503,10 @@ rec {
   };
 
   pandoc = import ../development/libraries/haskell/pandoc {
-    inherit cabal mtl network parsec utf8String xhtml zipArchive;
+    inherit cabal mtl parsec utf8String xhtml zipArchive
+      xml texmath;
+    HTTP = HTTP400009;
+    network = network2217;
   };
 
   parallel2201 = import ../development/libraries/haskell/parallel/2.2.0.1.nix {
@@ -536,7 +562,9 @@ rec {
   };
 
   recaptcha = import ../development/libraries/haskell/recaptcha {
-    inherit cabal HTTP network xhtml;
+    inherit cabal xhtml;
+    HTTP = HTTP400009;
+    network = network2217;
   };
 
   regexBase0931 = import ../development/libraries/haskell/regex-base/0.93.1.nix {
@@ -668,6 +696,10 @@ rec {
     inherit cabal HUnit QuickCheck mtl;
   };
 
+  texmath = import ../development/libraries/haskell/texmath {
+    inherit cabal cgi json parsec xml;
+  };
+
   text = import ../development/libraries/haskell/text {
     inherit cabal deepseq;
   };
@@ -701,6 +733,10 @@ rec {
     inherit cabal;
   };
 
+  url = import ../development/libraries/haskell/url {
+    inherit cabal utf8String;
+  };
+
   utf8String = import ../development/libraries/haskell/utf8-string {
     inherit cabal;
   };