Author: simons
Date: Sun Aug  7 23:21:50 2011
New Revision: 28365
URL: https://svn.nixos.org/websvn/nix/?rev=28365&sc=1

Log:
haskell-packages.nix: updated SMTPClient to version 1.0.4

This update lifts the restriction on hsemail version 1.6.

Added:
   nixpkgs/trunk/pkgs/development/libraries/haskell/hsemail/default.nix
      - copied, changed from r28364, 
nixpkgs/trunk/pkgs/development/libraries/haskell/hsemail/1.7.1.nix
Deleted:
   nixpkgs/trunk/pkgs/development/libraries/haskell/hsemail/1.6.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/hsemail/1.7.1.nix
Modified:
   nixpkgs/trunk/pkgs/development/libraries/haskell/SMTPClient/default.nix
   nixpkgs/trunk/pkgs/top-level/haskell-packages.nix

Modified: 
nixpkgs/trunk/pkgs/development/libraries/haskell/SMTPClient/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/SMTPClient/default.nix     
Sun Aug  7 22:51:22 2011        (r28364)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/SMTPClient/default.nix     
Sun Aug  7 23:21:50 2011        (r28365)
@@ -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
+    ];
   };
 })
-

Copied and modified: 
nixpkgs/trunk/pkgs/development/libraries/haskell/hsemail/default.nix (from 
r28364, nixpkgs/trunk/pkgs/development/libraries/haskell/hsemail/1.7.1.nix)
==============================================================================

Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix   Sun Aug  7 22:51:22 
2011        (r28364)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix   Sun Aug  7 23:21:50 
2011        (r28365)
@@ -734,9 +734,7 @@
     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 @@
 
   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 {};
 
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to