diff options
author | Shea Levy <shea@shealevy.com> | 2014-02-11 11:48:03 -0500 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2014-02-11 11:48:12 -0500 |
commit | 70d73236e866a9157aaa65c0aba7a3e4880a823c (patch) | |
tree | 30c74411065a10221e5d7a81ac183693a7335c13 /pkgs | |
parent | 9c616e3bf4d05430d77e208cd56ef8186bab92d6 (diff) | |
download | nixlib-70d73236e866a9157aaa65c0aba7a3e4880a823c.tar nixlib-70d73236e866a9157aaa65c0aba7a3e4880a823c.tar.gz nixlib-70d73236e866a9157aaa65c0aba7a3e4880a823c.tar.bz2 nixlib-70d73236e866a9157aaa65c0aba7a3e4880a823c.tar.lz nixlib-70d73236e866a9157aaa65c0aba7a3e4880a823c.tar.xz nixlib-70d73236e866a9157aaa65c0aba7a3e4880a823c.tar.zst nixlib-70d73236e866a9157aaa65c0aba7a3e4880a823c.zip |
Remove now-unneeded old version of haskell-tls
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/haskell/tls-extra/default.nix | 21 | ||||
-rw-r--r-- | pkgs/development/libraries/haskell/tls/1.1.5.nix | 25 | ||||
-rw-r--r-- | pkgs/development/libraries/haskell/tls/default.nix (renamed from pkgs/development/libraries/haskell/tls/1.2.2.nix) | 0 | ||||
-rw-r--r-- | pkgs/top-level/haskell-packages.nix | 8 |
4 files changed, 1 insertions, 53 deletions
diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix deleted file mode 100644 index 0fdcaf71d517..000000000000 --- a/pkgs/development/libraries/haskell/tls-extra/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ 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; - }; -}) diff --git a/pkgs/development/libraries/haskell/tls/1.1.5.nix b/pkgs/development/libraries/haskell/tls/1.1.5.nix deleted file mode 100644 index 0f354d8b77e5..000000000000 --- a/pkgs/development/libraries/haskell/tls/1.1.5.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ 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 ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/tls/1.2.2.nix b/pkgs/development/libraries/haskell/tls/default.nix index 638299d4a426..638299d4a426 100644 --- a/pkgs/development/libraries/haskell/tls/1.2.2.nix +++ b/pkgs/development/libraries/haskell/tls/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 8482a7b21479..11c6f9f666c4 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2386,13 +2386,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x timeCompat = callPackage ../development/libraries/haskell/time-compat {}; - 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; - }; + tls = callPackage ../development/libraries/haskell/tls {}; 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 |