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 6d63c267c61..00000000000 --- a/pkgs/development/libraries/haskell/tls-extra/default.nix +++ /dev/null @@ -1,23 +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 - ]; - jailbreak = true; - 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; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 7de8c4ab818..d2cb93deabb 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2330,8 +2330,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x tls = callPackage ../development/libraries/haskell/tls {}; - tlsExtra = callPackage ../development/libraries/haskell/tls-extra {}; - 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 (callPackage ../development/libraries/haskell/transformers/0.3.0.0.nix {}) else null; @@ -2574,7 +2572,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x yesodPersistent = callPackage ../development/libraries/haskell/yesod-persistent {}; - yesodPlatform = callPackage ../development/libraries/haskell/yesod-platform {}; + yesodPlatform = callPackage ../development/libraries/haskell/yesod-platform { + tlsExtra = null; # obsolete package, now part of tls + }; yesodRoutes = callPackage ../development/libraries/haskell/yesod-routes {};