From df9f4a8696bce0b90e32b3a8724b4ffbfa074b62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Wed, 21 Jul 2010 09:41:12 +0000
Subject: [PATCH] Added a couple of web-programming-related Haskell packages.

svn path=/nixpkgs/trunk/; revision=22683
---
 .../MonadCatchIO-transformers/default.nix     | 12 ++++++++
 .../libraries/haskell/blaze-html/default.nix  | 13 ++++++++
 .../libraries/haskell/cereal/default.nix      | 12 ++++++++
 .../libraries/haskell/hamlet/default.nix      | 13 ++++++++
 .../libraries/haskell/persistent/default.nix  | 17 +++++++++++
 .../haskell/transformers/default.nix          |  6 ++--
 .../haskell/web-routes-quasi/default.nix      | 13 ++++++++
 .../libraries/haskell/web-routes/default.nix  | 13 ++++++++
 pkgs/top-level/haskell-packages.nix           | 30 +++++++++++++++++++
 9 files changed, 126 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix
 create mode 100644 pkgs/development/libraries/haskell/blaze-html/default.nix
 create mode 100644 pkgs/development/libraries/haskell/cereal/default.nix
 create mode 100644 pkgs/development/libraries/haskell/hamlet/default.nix
 create mode 100644 pkgs/development/libraries/haskell/persistent/default.nix
 create mode 100644 pkgs/development/libraries/haskell/web-routes-quasi/default.nix
 create mode 100644 pkgs/development/libraries/haskell/web-routes/default.nix

diff --git a/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix b/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix
new file mode 100644
index 000000000000..665e1687ac08
--- /dev/null
+++ b/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix
@@ -0,0 +1,12 @@
+{cabal, transformers, extensibleExceptions} :
+
+cabal.mkDerivation (self : {
+  pname = "MonadCatchIO-transformers";
+  version = "0.2.2.0";
+  sha256 = "7f3b45ac01ac98476d1305333435005a6876e5c04c562e94ad2426ee7ab6936d";
+  propagatedBuildInputs = [transformers extensibleExceptions];
+  meta = {
+    description = "Monad-transformer compatible version of the Control.Exception module";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/blaze-html/default.nix b/pkgs/development/libraries/haskell/blaze-html/default.nix
new file mode 100644
index 000000000000..5c9cfeb114a8
--- /dev/null
+++ b/pkgs/development/libraries/haskell/blaze-html/default.nix
@@ -0,0 +1,13 @@
+{cabal, text}:
+
+cabal.mkDerivation (self : {
+  pname = "blaze-html";
+  version = "0.1.2";
+  sha256 = "c1e65e3d23e90a3830ceee69ecfac65c7a8a045da06443fb7690609a59480f5f";
+  propagatedBuildInputs = [text];
+  meta = {
+    description = "A blazingly fast HTML combinator library";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/cereal/default.nix b/pkgs/development/libraries/haskell/cereal/default.nix
new file mode 100644
index 000000000000..2cbd4a5fe454
--- /dev/null
+++ b/pkgs/development/libraries/haskell/cereal/default.nix
@@ -0,0 +1,12 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "cereal";
+  version = "0.2";
+  sha256 = "aa00eb88cea5616a0eb9e4b6604cb164b8bef6e86b111cbb67d51d4d3441332b";
+  meta = {
+    description = "A binary serialization 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
new file mode 100644
index 000000000000..08f7fd7b6a28
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hamlet/default.nix
@@ -0,0 +1,13 @@
+{cabal, blazeHtml, parsec, utf8String}:
+
+cabal.mkDerivation (self : {
+  pname = "hamlet";
+  version = "0.4.0";
+  sha256 = "5e05879e734fc193acc48eda48dadbf53659e937543068bcc77dc7c394f6adcd";
+  propagatedBuildInputs = [blazeHtml parsec utf8String];
+  meta = {
+    description = "Haml-like template files that are compile-time checked";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix
new file mode 100644
index 000000000000..f8b733664d5e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/persistent/default.nix
@@ -0,0 +1,17 @@
+{cabal, blazeHtml, MonadCatchIOTransformers, parsec, text, transformers,
+ utf8String, webRoutesQuasi}:
+
+cabal.mkDerivation (self : {
+  pname = "persistent";
+  version = "0.1.0";
+  sha256 = "32379f5ef937da1bf910cfaf9b6cce6326b8fba7554ef81159e6684c7ce2ca45";
+  propagatedBuildInputs = [
+    blazeHtml MonadCatchIOTransformers parsec text transformers
+    utf8String webRoutesQuasi
+  ];
+  meta = {
+    description = "Type-safe, non-relational, multi-backend persistence";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/transformers/default.nix b/pkgs/development/libraries/haskell/transformers/default.nix
index d5c933c78842..ef2c7ed74a75 100644
--- a/pkgs/development/libraries/haskell/transformers/default.nix
+++ b/pkgs/development/libraries/haskell/transformers/default.nix
@@ -2,10 +2,10 @@
 
 cabal.mkDerivation (self : {
   pname = "transformers";
-  version = "0.1.4.0";
-  sha256 = "6d222d1cbed75063753a7c828d7f429f24974d261872c7b70fe90a003c93646d";
+  version = "0.2.1.0";
+  sha256 = "1ff9768e60130810e888452b6052d64998d0651fe2835902f032d8f8182a2c6d";
   meta = {
-    description = "Concrete monad transformers";
+    description = "Concrete functor and monad transformers";
   };
 })  
 
diff --git a/pkgs/development/libraries/haskell/web-routes-quasi/default.nix b/pkgs/development/libraries/haskell/web-routes-quasi/default.nix
new file mode 100644
index 000000000000..8d0303d65bb4
--- /dev/null
+++ b/pkgs/development/libraries/haskell/web-routes-quasi/default.nix
@@ -0,0 +1,13 @@
+{cabal, webRoutes}:
+
+cabal.mkDerivation (self : {
+  pname = "web-routes-quasi";
+  version = "0.5.0";
+  sha256 = "07ef2717b44f92bccee9af4b4d9a173c12ec3b3b1d49a8495811dad0af240673";
+  propagatedBuildInputs = [webRoutes];
+  meta = {
+    description = "Define data types and parse/build functions for web-routes via a quasi-quoted DSL";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/web-routes/default.nix b/pkgs/development/libraries/haskell/web-routes/default.nix
new file mode 100644
index 000000000000..cbd476ff7d00
--- /dev/null
+++ b/pkgs/development/libraries/haskell/web-routes/default.nix
@@ -0,0 +1,13 @@
+{cabal, network, parsec, utf8String}:
+
+cabal.mkDerivation (self : {
+  pname = "web-routes";
+  version = "0.22.0";
+  sha256 = "6482ecba585cf7b1f32c29bfd5cb6f5e06dba72231e38ae5baa15b6b95f7c6c8";
+  propagatedBuildInputs = [network parsec utf8String];
+  meta = {
+    description = "Library for maintaining correctness and composability of URLs within an application";
+    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 dfd207c534cb..2c29cbf2766d 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -61,6 +61,10 @@ rec {
     inherit cabal;
   };
 
+  blazeHtml = import ../development/libraries/haskell/blaze-html {
+    inherit cabal text;
+  };
+
   bytestring = import ../development/libraries/haskell/bytestring {
     inherit cabal;
   };
@@ -73,6 +77,10 @@ rec {
     inherit cabal;
   };
 
+  cereal = import ../development/libraries/haskell/cereal {
+    inherit cabal;
+  };
+
   cgi3001172 = import ../development/libraries/haskell/cgi/3001.1.7.2.nix {
     inherit cabal mtl parsec xhtml;
     network = network2217;
@@ -251,6 +259,10 @@ rec {
     inherit (pkgs) stdenv fetchurl pkgconfig gnome cairo;
   };
 
+  hamlet = import ../development/libraries/haskell/hamlet {
+    inherit cabal blazeHtml parsec utf8String;
+  };
+
   HAppSData = import ../development/libraries/haskell/HAppS/HAppS-Data.nix {
     inherit cabal mtl sybWithClass HaXml HAppSUtil bytestring binary;
   };
@@ -518,6 +530,10 @@ rec {
     inherit cabal mtl extensibleExceptions;
   };
 
+  MonadCatchIOTransformers = import ../development/libraries/haskell/MonadCatchIO-transformers {
+    inherit cabal transformers extensibleExceptions;
+  };
+
   monadlab = import ../development/libraries/haskell/monadlab {
     inherit cabal parsec;
   };
@@ -615,6 +631,11 @@ rec {
     inherit (pkgs) pcre;
   };
 
+  persistent = import ../development/libraries/haskell/persistent {
+    inherit cabal blazeHtml MonadCatchIOTransformers parsec text
+      transformers utf8String webRoutesQuasi;
+  };
+
   polyparse = import ../development/libraries/haskell/polyparse {
     inherit cabal;
   };
@@ -890,6 +911,15 @@ rec {
     inherit cabal utf8String terminfo;
   };
 
+  webRoutes = import ../development/libraries/haskell/web-routes {
+    inherit cabal utf8String parsec;
+    network = network2217;
+  };
+
+  webRoutesQuasi = import ../development/libraries/haskell/web-routes-quasi {
+    inherit cabal webRoutes;
+  };
+
   WebServer = import ../development/libraries/haskell/WebServer {
     inherit cabal network mtl parsec;
     inherit (pkgs) fetchgit;