From 5a7a0298a3e94f49321f7922f987a1a0396850a8 Mon Sep 17 00:00:00 2001
From: jao <jao@gnu.org>
Date: Mon, 27 Jan 2020 00:56:35 +0000
Subject: Revert "Only require http-conduit when absolutely necessary"

This reverts commit efb6d6817c092fe08e9b0f1b8a17bddd29d97cdb.
---
 src/Xmobar/Plugins/Monitors/Common/Types.hs | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'src/Xmobar/Plugins/Monitors/Common')

diff --git a/src/Xmobar/Plugins/Monitors/Common/Types.hs b/src/Xmobar/Plugins/Monitors/Common/Types.hs
index ea61a58..8662ba3 100644
--- a/src/Xmobar/Plugins/Monitors/Common/Types.hs
+++ b/src/Xmobar/Plugins/Monitors/Common/Types.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE CPP #-}
-
 ------------------------------------------------------------------------------
 -- |
 -- Module: Xmobar.Plugins.Monitors.Types
@@ -29,10 +27,7 @@ module Xmobar.Plugins.Monitors.Common.Types ( Monitor
 
 import Data.IORef (IORef, modifyIORef, newIORef, readIORef)
 import Control.Monad.Reader (ReaderT, ask, liftIO)
-#if defined(WEATHER) || defined(UVMETER)
 import Network.HTTP.Conduit (Manager, newManager, tlsManagerSettings)
-#endif
-
 
 type Monitor a = ReaderT MConfig IO a
 
@@ -61,9 +56,7 @@ data MConfig =
        , naString :: IORef String
        , maxTotalWidth :: IORef Int
        , maxTotalWidthEllipsis :: IORef String
-#if defined(WEATHER) || defined(UVMETER)
        , manager :: IORef Manager
-#endif
        }
 
 -- | from 'http:\/\/www.haskell.org\/hawiki\/MonadState'
@@ -111,12 +104,8 @@ mkMConfig tmpl exprts =
        na <- newIORef "N/A"
        mt <- newIORef 0
        mtel <- newIORef ""
-#if defined(WEATHER) || defined(UVMETER)
        man <- newIORef =<< newManager tlsManagerSettings
        return $ MC nc l lc h hc t e p d mn mx mel pc pr bb bf bw up na mt mtel man
-#else
-       return $ MC nc l lc h hc t e p d mn mx mel pc pr bb bf bw up na mt mtel
-#endif
 
 data Opts = HighColor String
           | NormalColor String
-- 
cgit v1.2.3