Added Hakyll and dependencies.

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

9 files changed, 98 insertions, 6 deletions

diff --git a/pkgs/development/libraries/haskell/blaze-builder/default.nix b/pkgs/development/libraries/haskell/blaze-builder/default.nix
new file mode 100644
index 00000000000..3a9e8b8e4cb
--- /dev/null
+++ b/pkgs/development/libraries/haskell/blaze-builder/default.nix
@@ -0,0 +1,13 @@
+{cabal, text}:
+
+cabal.mkDerivation (self : {
+  pname = "blaze-builder";
+  version = "0.1";
+  sha256 = "dc4c542a39cf9e82b6a7ca99d6f460d6fa8dc4c8f648224368eac3fe054127c5";
+  propagatedBuildInputs = [text];
+  meta = {
+    description = "Builder to efficiently append text";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/failure/default.nix b/pkgs/development/libraries/haskell/failure/default.nix
new file mode 100644
index 00000000000..74f9f0c4626
--- /dev/null
+++ b/pkgs/development/libraries/haskell/failure/default.nix
@@ -0,0 +1,12 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "failure";
+  version = "0.1.0";
+  sha256 = "08c4e51dbbc0852836ff5bf791e9c62dca748aed8554bb6271618ab3d6a04b2c";
+  meta = {
+    description = "A simple type class for success/failure computations";
+    license = "Public Domain";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix
new file mode 100644
index 00000000000..c5b0339fae7
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hakyll/default.nix
@@ -0,0 +1,13 @@
+{cabal, binary, hamlet, mtl, network, pandoc, regexBase, regexTDFA, time}:
+
+cabal.mkDerivation (self : {
+  pname = "hakyll";
+  version = "2.3";
+  sha256 = "40e57c5cf5be3c6fdc270d00ff765a2b3e11ba7e302f40146d83048aa4436116";
+  propagatedBuildInputs = [hamlet mtl network pandoc regexBase regexTDFA time];
+  meta = {
+    description = "A simple static site generator library";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix
index 08f7fd7b6a2..90bbb999d18 100644
--- a/pkgs/development/libraries/haskell/hamlet/default.nix
+++ b/pkgs/development/libraries/haskell/hamlet/default.nix
@@ -1,10 +1,12 @@
-{cabal, blazeHtml, parsec, utf8String}:
+{cabal, blazeHtml, blazeBuilder, parsec, utf8String, failure, neither}:
 
 cabal.mkDerivation (self : {
   pname = "hamlet";
-  version = "0.4.0";
-  sha256 = "5e05879e734fc193acc48eda48dadbf53659e937543068bcc77dc7c394f6adcd";
-  propagatedBuildInputs = [blazeHtml parsec utf8String];
+  version = "0.5.0";
+  sha256 = "92d8e099fa63fe218e2c8c4da56ac86b0b0bb49139467b8f12595c4436d1ad0b";
+  propagatedBuildInputs = [
+    blazeHtml blazeBuilder parsec utf8String failure neither
+  ];
   meta = {
     description = "Haml-like template files that are compile-time checked";
     license = "BSD";
diff --git a/pkgs/development/libraries/haskell/neither/default.nix b/pkgs/development/libraries/haskell/neither/default.nix
new file mode 100644
index 00000000000..1dfd1ca533d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/neither/default.nix
@@ -0,0 +1,15 @@
+{cabal, failure, mtl, transformers, MonadCatchIOMtl, MonadCatchIOTransformers}:
+
+cabal.mkDerivation (self : {
+  pname = "neither";
+  version = "0.0.2";
+  sha256 = "1e1b934d9d1918bd762bb8d6cde35c56883543c2d0c165a661f096c2ce5ab139";
+  propagatedBuildInputs = [
+    failure mtl transformers MonadCatchIOMtl MonadCatchIOTransformers
+  ];
+  meta = {
+    description = "A simple type class for success/failure computations";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix
index 57b6cec24b5..3f0b7b09d72 100644
--- a/pkgs/development/libraries/haskell/pandoc/default.nix
+++ b/pkgs/development/libraries/haskell/pandoc/default.nix
@@ -1,12 +1,12 @@
 {cabal, mtl, network, parsec, utf8String, xhtml, zipArchive, HTTP, xml,
- texmath}:
+ texmath, random}:
 
 cabal.mkDerivation (self : {
   pname = "pandoc";
   version = "1.6";
   sha256 = "9b825233293edf1ea414b0e7ea821d6a914711dc2c60546566ab5a97512b079b";
   propagatedBuildInputs = [
-    mtl network parsec utf8String xhtml zipArchive HTTP xml texmath
+    mtl network parsec utf8String xhtml zipArchive HTTP xml texmath random
   ];
   meta = {
     description = "Conversion between markup formats";
diff --git a/pkgs/development/libraries/haskell/random/default.nix b/pkgs/development/libraries/haskell/random/default.nix
new file mode 100644
index 00000000000..370f054dc1e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/random/default.nix
@@ -0,0 +1,13 @@
+{cabal, time}:
+
+cabal.mkDerivation (self : {
+  pname = "random";
+  version = "1.0.0.2";
+  sha256 = "5433aebb4bbfb999f1d02410c8ca3769c63cd8b02109d2771a37c12918f92dd5";
+  propagatedBuildInputs = [time];
+  meta = {
+    description = "random number library";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/regex-tdfa/default.nix b/pkgs/development/libraries/haskell/regex-tdfa/default.nix
new file mode 100644
index 00000000000..76b30404495
--- /dev/null
+++ b/pkgs/development/libraries/haskell/regex-tdfa/default.nix
@@ -0,0 +1,13 @@
+{cabal, mtl, parsec, regexBase}:
+
+cabal.mkDerivation (self : {
+  pname = "regex-tdfa";
+  version = "1.1.4";
+  sha256 = "382c7ed1ee75448574b42e9ecb9228b25f55143f3008ecd6f5d3a30471337b39";
+  propagatedBuildInputs = [mtl parsec regexBase];
+  meta = {
+    description = "Replaces/Enhances Text.Regex";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/time/1.2.0.3.nix b/pkgs/development/libraries/haskell/time/1.2.0.3.nix
new file mode 100644
index 00000000000..7ddbdcc2fa9
--- /dev/null
+++ b/pkgs/development/libraries/haskell/time/1.2.0.3.nix
@@ -0,0 +1,11 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "time";
+  version = "1.2.0.3";
+  sha256 = "acb1e3cf2b98a73632d35b0665808b05df6c03fcefd62796fe291f5b2ef4348e";
+  meta = {
+    description = "A time library";
+  };
+})  
+