From 5eb504674acb03622ae6b361679ce7946363a4fa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 29 Aug 2011 20:26:52 +0000
Subject: [PATCH] haskell-hamlet: added version 0.10.0

svn path=/nixpkgs/trunk/; revision=28887
---
 .../libraries/haskell/hamlet/0.10.0.nix       | 22 +++++++++++++++++++
 .../hamlet/{default.nix => 0.8.2.1.nix}       |  0
 pkgs/top-level/haskell-packages.nix           |  8 +++++--
 3 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/hamlet/0.10.0.nix
 rename pkgs/development/libraries/haskell/hamlet/{default.nix => 0.8.2.1.nix} (100%)

diff --git a/pkgs/development/libraries/haskell/hamlet/0.10.0.nix b/pkgs/development/libraries/haskell/hamlet/0.10.0.nix
new file mode 100644
index 000000000000..280e49ea4354
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hamlet/0.10.0.nix
@@ -0,0 +1,22 @@
+{ cabal, blazeBuilder, blazeHtml, failure, parsec, shakespeare
+, text
+}:
+
+cabal.mkDerivation (self: {
+  pname = "hamlet";
+  version = "0.10.0";
+  sha256 = "0xqlc03g0qnpnrw957108rpjbs88p9wwvcgmz7vc1f0k88lc0h6n";
+  buildDepends = [
+    blazeBuilder blazeHtml failure parsec shakespeare text
+  ];
+  meta = {
+    homepage = "http://www.yesodweb.com/book/templates";
+    description = "Haml-like template files that are compile-time checked";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/0.8.2.1.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/hamlet/default.nix
rename to pkgs/development/libraries/haskell/hamlet/0.8.2.1.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index f9bad22e6ca0..7970de34eed7 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -649,9 +649,13 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   graphviz = callPackage ../development/libraries/haskell/graphviz {};
 
-  hakyll = callPackage ../development/libraries/haskell/hakyll {};
+  hakyll = callPackage ../development/libraries/haskell/hakyll {
+    hamlet = self.hamlet_0_8_2_1;
+  };
 
-  hamlet = callPackage ../development/libraries/haskell/hamlet {};
+  hamlet_0_8_2_1 = callPackage ../development/libraries/haskell/hamlet/0.8.2.1.nix {};
+  hamlet_0_10_0 = callPackage ../development/libraries/haskell/hamlet/0.10.0.nix {};
+  hamlet = self.hamlet_0_10_0;
 
   happstackData = callPackage ../development/libraries/haskell/happstack/happstack-data.nix {};