about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2014-01-29 18:40:09 +0100
committerPeter Simons <simons@cryp.to>2014-01-29 20:04:02 +0100
commit5375237ba946fedd882a0dcbaf024b77b9437db6 (patch)
tree388ff29b89dc3c984368a1ef22ca3b965a38e752 /pkgs/top-level
parent2fce900513bbd89238c81cb7ed1aa9149a99ad28 (diff)
downloadnixlib-5375237ba946fedd882a0dcbaf024b77b9437db6.tar
nixlib-5375237ba946fedd882a0dcbaf024b77b9437db6.tar.gz
nixlib-5375237ba946fedd882a0dcbaf024b77b9437db6.tar.bz2
nixlib-5375237ba946fedd882a0dcbaf024b77b9437db6.tar.lz
nixlib-5375237ba946fedd882a0dcbaf024b77b9437db6.tar.xz
nixlib-5375237ba946fedd882a0dcbaf024b77b9437db6.tar.zst
nixlib-5375237ba946fedd882a0dcbaf024b77b9437db6.zip
haskell-tls-extra: remove obsolete package
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/haskell-packages.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 7de8c4ab8184..d2cb93deabb6 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 {};