From 132c4c459763c81ddf60aeedf5b87b619bb5f1ce Mon Sep 17 00:00:00 2001 From: jao Date: Thu, 7 Feb 2019 04:49:32 +0000 Subject: Always require http-conduit for weather (fixes #378) --- xmobar.cabal | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'xmobar.cabal') diff --git a/xmobar.cabal b/xmobar.cabal index d7cf9ea..b0c6cf6 100644 --- a/xmobar.cabal +++ b/xmobar.cabal @@ -87,10 +87,6 @@ flag with_weather description: Enable weather plugin. default: True -flag with_conduit - description: Use http-conduits for weather data, used only if with_weather. - default: False - library hs-source-dirs: src @@ -251,15 +247,11 @@ library cpp-options: -DXPM if flag(with_weather) || flag(all_extensions) - build-depends: HTTP >= 4000.2.4 exposed-modules: Xmobar.Plugins.Monitors.Weather cpp-options: -DWEATHER - if flag(with_conduit) - -- use http-conduit instead of simple-http - build-depends: http-conduit, http-types - cpp-options: -DHTTP_CONDUIT + build-depends: http-conduit, http-types - if flag(with_uvmeter) && flag(with_conduit) + if flag(with_uvmeter) exposed-modules: Xmobar.Plugins.Monitors.UVMeter build-depends: http-conduit, http-types cpp-options: -DUVMETER -- cgit v1.2.3