From f99a91628c78998bb9283c83ff5653898ba356db Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 7 Aug 2011 23:21:50 +0000
Subject: [PATCH] haskell-packages.nix: updated SMTPClient to version 1.0.4

This update lifts the restriction on hsemail version 1.6.

svn path=/nixpkgs/trunk/; revision=28365
---
 .../libraries/haskell/SMTPClient/default.nix    | 17 ++++++++++-------
 .../libraries/haskell/hsemail/1.6.nix           | 14 --------------
 .../haskell/hsemail/{1.7.1.nix => default.nix}  |  0
 pkgs/top-level/haskell-packages.nix             |  8 ++------
 4 files changed, 12 insertions(+), 27 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/hsemail/1.6.nix
 rename pkgs/development/libraries/haskell/hsemail/{1.7.1.nix => default.nix} (100%)

diff --git a/pkgs/development/libraries/haskell/SMTPClient/default.nix b/pkgs/development/libraries/haskell/SMTPClient/default.nix
index bac471ee90fc..ff275c14e094 100644
--- a/pkgs/development/libraries/haskell/SMTPClient/default.nix
+++ b/pkgs/development/libraries/haskell/SMTPClient/default.nix
@@ -1,14 +1,17 @@
-{cabal, hsemail, network}:
+{cabal, hsemail, network} :
 
 cabal.mkDerivation (self : {
   pname = "SMTPClient";
-  version = "1.0.3";
-  sha256 = "c9907834565b5b712d50c50823513675b982c8b51e7b95680a3495eccb73ce66";
-  propagatedBuildInputs = [hsemail network];
+  version = "1.0.4";
+  sha256 = "12m0qv8bf0s52yz07sipxlvas8k3xvi1d4lw6960q0nxr40ijyy2";
+  propagatedBuildInputs = [ hsemail network ];
   meta = {
     description = "A simple SMTP client library";
-    license = "BSD";
-    maintainers = [self.stdenv.lib.maintainers.andres];
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.stdenv.lib.platforms.haskellPlatforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.simons
+      self.stdenv.lib.maintainers.andres
+    ];
   };
 })
-
diff --git a/pkgs/development/libraries/haskell/hsemail/1.6.nix b/pkgs/development/libraries/haskell/hsemail/1.6.nix
deleted file mode 100644
index f9315e43c3e5..000000000000
--- a/pkgs/development/libraries/haskell/hsemail/1.6.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{cabal, mtl, parsec}:
-
-cabal.mkDerivation (self : {
-  pname = "hsemail";
-  version = "1.6";
-  sha256 = "a8ba7e8cfb9213bb2ee61166bc8352e4353560d06f418a0c729aeb1d50b3a1fd";
-  propagatedBuildInputs = [mtl parsec];
-  meta = {
-    description = "Internet Message Parsers";
-    license = "BSD";
-    maintainers = [self.stdenv.lib.maintainers.andres];
-  };
-})
-
diff --git a/pkgs/development/libraries/haskell/hsemail/1.7.1.nix b/pkgs/development/libraries/haskell/hsemail/default.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/hsemail/1.7.1.nix
rename to pkgs/development/libraries/haskell/hsemail/default.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 61c074531711..131fba75d054 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -734,9 +734,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     inherit (pkgs) adns;
   };
 
-  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;
+  hsemail = callPackage ../development/libraries/haskell/hsemail {};
 
   HsSyck = callPackage ../development/libraries/haskell/HsSyck {};
 
@@ -1084,9 +1082,7 @@ 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 {
-    hsemail = self.hsemail_1_6;
-  };
+  SMTPClient = callPackage ../development/libraries/haskell/SMTPClient {};
 
   split = callPackage ../development/libraries/haskell/split {};