Author: simons
Date: Sat Aug 6 07:41:44 2011
New Revision: 28187
URL: https://svn.nixos.org/websvn/nix/?rev=28187&sc=1
Log:
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.
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/hsemail/1.6.nix
- copied, changed from r28186,
nixpkgs/trunk/pkgs/development/libraries/haskell/hsemail/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/hsemail/1.7.1.nix
Deleted:
nixpkgs/trunk/pkgs/development/libraries/haskell/hsemail/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/hsemail/1.6.nix (from r28186,
nixpkgs/trunk/pkgs/development/libraries/haskell/hsemail/default.nix)
==============================================================================
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/hsemail/1.7.1.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/hsemail/1.7.1.nix Sat Aug
6 07:41:44 2011 (r28187)
@@ -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];
+ };
+})
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sat Aug 6 07:19:47
2011 (r28186)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sat Aug 6 07:41:44
2011 (r28187)
@@ -684,7 +684,9 @@
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 @@
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 {};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
