From a6020a75d4ecd191250c4b85655575ef54d3ef97 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 6 Aug 2011 07:41:44 +0000
Subject: [PATCH] hsemail: added version 1.7.1 parallel to version 1.6

SMTPClient cannot be built with the latest version of hsemail because its Cabal
files enforces 1.6 by an upper version bound. I've asked upstream to release an
update that fixes this, but until that happens we need to keep version 1.6
around to make sure Gitit compiles.

svn path=/nixpkgs/trunk/; revision=28187
---
 .../haskell/hsemail/{default.nix => 1.6.nix}      |  0
 .../libraries/haskell/hsemail/1.7.1.nix           | 15 +++++++++++++++
 pkgs/top-level/haskell-packages.nix               |  8 ++++++--
 3 files changed, 21 insertions(+), 2 deletions(-)
 rename pkgs/development/libraries/haskell/hsemail/{default.nix => 1.6.nix} (100%)
 create mode 100644 pkgs/development/libraries/haskell/hsemail/1.7.1.nix

diff --git a/pkgs/development/libraries/haskell/hsemail/default.nix b/pkgs/development/libraries/haskell/hsemail/1.6.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/hsemail/default.nix
rename to pkgs/development/libraries/haskell/hsemail/1.6.nix
diff --git a/pkgs/development/libraries/haskell/hsemail/1.7.1.nix b/pkgs/development/libraries/haskell/hsemail/1.7.1.nix
new file mode 100644
index 000000000000..8d3bd3b311b4
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hsemail/1.7.1.nix
@@ -0,0 +1,15 @@
+{cabal, mtl, parsec}:
+
+cabal.mkDerivation (self : {
+  pname = "hsemail";
+  version = "1.7.1";
+  sha256 = "0059015ab93d5facf6060404984a295090ebfc667ae5b84b283163e126805a9e";
+  propagatedBuildInputs = [mtl parsec];
+  meta = {
+    homepage = "http://gitorious.org/hsemail";
+    description = "Internet Message Parsers";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.stdenv.lib.platforms.haskellPlatforms;
+    maintainers = [self.stdenv.lib.maintainers.andres self.stdenv.lib.maintainers.simons];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index e19037569b06..0945bc6da0ea 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -684,7 +684,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     inherit (pkgs) adns;
   };
 
-  hsemail = callPackage ../development/libraries/haskell/hsemail {};
+  hsemail_1_6 = callPackage ../development/libraries/haskell/hsemail/1.6.nix {};
+  hsemail_1_7_1 = callPackage ../development/libraries/haskell/hsemail/1.7.1.nix {};
+  hsemail = self.hsemail_1_7_1;
 
   HsSyck = callPackage ../development/libraries/haskell/HsSyck {};
 
@@ -997,7 +999,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   ShellacReadline = callPackage ../development/libraries/haskell/Shellac/Shellac-readline.nix {};
 
-  SMTPClient = callPackage ../development/libraries/haskell/SMTPClient {};
+  SMTPClient = callPackage ../development/libraries/haskell/SMTPClient {
+    hsemail = self.hsemail_1_6;
+  };
 
   split = callPackage ../development/libraries/haskell/split {};