diff --git a/src/QBar/Cli.hs b/src/QBar/Cli.hs index 82d272037a042ee783dc1a4706261ec66386af39..e8c6d50dba612f6f09d154b52ab875e4eccbed00 100644 --- a/src/QBar/Cli.hs +++ b/src/QBar/Cli.hs @@ -10,7 +10,7 @@ import QBar.DefaultConfig import QBar.Server import QBar.Theme -import Control.Monad (join, sequence_) +import Control.Monad (join) import qualified Data.Text.Lazy as T import Options.Applicative diff --git a/src/QBar/ControlSocket.hs b/src/QBar/ControlSocket.hs index 9a783984a87b44c281201b1fdfd3d5d4c669ebbb..27fa9b72efa7bfc71f9a4be74645ee3b6ca32707 100644 --- a/src/QBar/ControlSocket.hs +++ b/src/QBar/ControlSocket.hs @@ -18,13 +18,10 @@ import Control.Concurrent (forkFinally) import Control.Concurrent.Async import Data.Aeson (FromJSON, ToJSON) import Data.Aeson.TH -import Data.ByteString (ByteString) import qualified Data.ByteString.Char8 as BSC import System.FilePath ((</>)) import System.IO -import Data.Either (either) -import Data.Maybe (maybe) -import Data.Text.Lazy (Text, pack) +import Data.Text.Lazy (pack) import qualified Data.Text.Lazy as T import Network.Socket import Pipes @@ -220,7 +217,8 @@ listenUnixSocket options@MainOptions{verbose} bar commandHandler = do socketExists <- doesFileExist socketPath when socketExists $ removeFile socketPath sock <- socket AF_UNIX Stream defaultProtocol - setCloseOnExecIfNeeded $ fdSocket sock + -- TODO: unsafe probably not what we want + setCloseOnExecIfNeeded =<< unsafeFdSocket sock bind sock (SockAddrUnix socketPath) listen sock 5 forever $ do diff --git a/src/QBar/TagParser.hs b/src/QBar/TagParser.hs index b02ca58581fe23ecdf5a757b256baf627717d0db..75c11270f1c3baf70f10356fb317b0a0695c736a 100644 --- a/src/QBar/TagParser.hs +++ b/src/QBar/TagParser.hs @@ -4,9 +4,7 @@ import QBar.BlockOutput import QBar.Color import Control.Applicative ((<|>)) -import Control.Monad (void) import Data.Attoparsec.Text.Lazy as A -import Data.Either (either) import Data.Functor (($>)) import Data.Maybe (catMaybes) import qualified Data.Text as TS diff --git a/stack.yaml b/stack.yaml index c8625ac679e02698b2f434026c906955f656d1c1..d2d8b714674782dde8415171b5eb25213dbb83e0 100644 --- a/stack.yaml +++ b/stack.yaml @@ -17,7 +17,7 @@ # # resolver: ./custom-snapshot.yaml # resolver: https://example.com/snapshots/2018-01-01.yaml -resolver: lts-14.20 +resolver: lts-15.1 # User packages to be built. # Various formats can be used as shown in the example below.