Revert "Remove now-unneeded old version of haskell-tls"

It's used by smtps-gmail

This reverts commit 70d73236e8.
This commit is contained in:
Shea Levy 2014-02-11 13:47:34 -05:00
parent 70d73236e8
commit b2d0c27d0a
4 changed files with 53 additions and 1 deletions

View File

@ -0,0 +1,21 @@
{ cabal, certificate, cipherAes, cipherRc4, cryptohash
, cryptoPubkey, cryptoRandom, mtl, network, pem, time, tls, vector
}:
cabal.mkDerivation (self: {
pname = "tls-extra";
version = "0.6.6";
sha256 = "0k0sj3nq1lrvbmd582mjj8cxbxigivz1hm8hhij1ncl2pgnq5xyv";
isLibrary = true;
isExecutable = true;
buildDepends = [
certificate cipherAes cipherRc4 cryptohash cryptoPubkey
cryptoRandom mtl network pem time tls vector
];
meta = {
homepage = "http://github.com/vincenthz/hs-tls";
description = "TLS extra default values and helpers";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View File

@ -0,0 +1,25 @@
{ cabal, cereal, certificate, cprngAes, cryptohash, cryptoPubkey
, cryptoRandom, mtl, network, QuickCheck, testFramework
, testFrameworkQuickcheck2, time
}:
cabal.mkDerivation (self: {
pname = "tls";
version = "1.1.5";
sha256 = "1ja03x3i7dgjpy22h4shnni1xslph8i8q4accqq8njpqpz54c84c";
buildDepends = [
cereal certificate cryptohash cryptoPubkey cryptoRandom mtl network
];
testDepends = [
cereal certificate cprngAes cryptoPubkey cryptoRandom mtl
QuickCheck testFramework testFrameworkQuickcheck2 time
];
doCheck = false;
meta = {
homepage = "http://github.com/vincenthz/hs-tls";
description = "TLS/SSL protocol native implementation (Server and Client)";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

View File

@ -2386,7 +2386,13 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
timeCompat = callPackage ../development/libraries/haskell/time-compat {};
tls = callPackage ../development/libraries/haskell/tls {};
tls_1_1_5 = callPackage ../development/libraries/haskell/tls/1.1.5.nix {};
tls_1_2_2 = callPackage ../development/libraries/haskell/tls/1.2.2.nix {};
tls = self.tls_1_2_2;
tlsExtra = callPackage ../development/libraries/haskell/tls-extra {
tls = self.tls_1_1_5;
};
transformers_0_2_2_0 = callPackage ../development/libraries/haskell/transformers/0.2.2.0.nix {};
transformers_0_3_0_0 = if (pkgs.stdenv.lib.versionOlder ghc.version "7.7") then