summary refs log tree commit diff
path: root/pkgs/development/libraries
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2011-08-07 23:21:50 +0000
committerPeter Simons <simons@cryp.to>2011-08-07 23:21:50 +0000
commitf99a91628c78998bb9283c83ff5653898ba356db (patch)
tree941397fa66e7257dc53b1e02016afecc5654443d /pkgs/development/libraries
parentfd258d6fe10547f8258b1610c3efed410aae0f37 (diff)
downloadnixlib-f99a91628c78998bb9283c83ff5653898ba356db.tar
nixlib-f99a91628c78998bb9283c83ff5653898ba356db.tar.gz
nixlib-f99a91628c78998bb9283c83ff5653898ba356db.tar.bz2
nixlib-f99a91628c78998bb9283c83ff5653898ba356db.tar.lz
nixlib-f99a91628c78998bb9283c83ff5653898ba356db.tar.xz
nixlib-f99a91628c78998bb9283c83ff5653898ba356db.tar.zst
nixlib-f99a91628c78998bb9283c83ff5653898ba356db.zip
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
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r--pkgs/development/libraries/haskell/SMTPClient/default.nix17
-rw-r--r--pkgs/development/libraries/haskell/hsemail/1.6.nix14
-rw-r--r--pkgs/development/libraries/haskell/hsemail/default.nix (renamed from pkgs/development/libraries/haskell/hsemail/1.7.1.nix)0
3 files changed, 10 insertions, 21 deletions
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
index 8d3bd3b311b4..8d3bd3b311b4 100644
--- a/pkgs/development/libraries/haskell/hsemail/1.7.1.nix
+++ b/pkgs/development/libraries/haskell/hsemail/default.nix