From 4b709da1fa9d2e0e81918b9c60c0f36ff91c0e86 Mon Sep 17 00:00:00 2001
From: Jan Beinke <git@janbeinke.com>
Date: Mon, 24 Feb 2020 18:56:34 +0100
Subject: [PATCH] Update stack snapshot to lts-15.1
---
src/QBar/Cli.hs | 2 +-
src/QBar/ControlSocket.hs | 8 +++-----
src/QBar/TagParser.hs | 2 --
stack.yaml | 2 +-
4 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/src/QBar/Cli.hs b/src/QBar/Cli.hs
index 82d2720..e8c6d50 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 9a78398..27fa9b7 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 b02ca58..75c1127 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 c8625ac..d2d8b71 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.
--
GitLab