Merge branch 'lts-19.32'

client-haskell/src/Icepeak/Client.hs

@@ -43,7 +43,6 @@ import Control.Retry (RetryPolicyM, recovering)
 import Data.Aeson (ToJSON)
 import Data.ByteString (ByteString)
 import Data.Foldable (toList)
-import Data.Semigroup ((<>))
 import Data.Text (Text)
 import Data.Word (Word16)
 

client-haskell/stack.yaml

@@ -1,4 +1,4 @@
-resolver: lts-19.17
+resolver: lts-19.32
 
 # Note: This section will be ignored by stack, on non-NixOS systems.
 # It can be explicitly enabled on non-NixOS systems by passing --nix.

nix/sources.json

@@ -5,10 +5,10 @@
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "80fc83ad314fe701766ee66ac8286307d65b39e3",
-        "sha256": "0axxkwpkxy2c45acm257l510p3kbc7vbfxlddz78q5bvvr5l70rc",
+        "rev": "72d8853228c9758820c39b8659415b6d89279493",
+        "sha256": "10r5zh0052apd90riimaly2xc9d4w5p9g81s9nhjk12kirf6ihcs",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/80fc83ad314fe701766ee66ac8286307d65b39e3.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/72d8853228c9758820c39b8659415b6d89279493.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }

server/app/Icepeak/Main.hs

@@ -5,7 +5,6 @@ module Main (main) where
 import Control.Exception (fromException, catch, handle, AsyncException, SomeException)
 import Control.Monad (forM, void, when)
 import Data.Foldable (forM_)
-import Data.Semigroup ((<>))
 import Options.Applicative (execParser)
 import System.Environment (getEnvironment)
 import System.IO (BufferMode (..), hSetBuffering, stdout)

server/app/IcepeakTokenGen/Main.hs

@@ -1,7 +1,6 @@
 {-# LANGUAGE OverloadedStrings #-}
 module Main where
 
-import           Data.Semigroup      ((<>))
 import qualified Data.Text           as Text
 import qualified Data.Text.IO        as Text
 import           Options.Applicative

server/package.yaml

@@ -16,7 +16,7 @@ ghc-options:
 dependencies:
 - aeson                             >= 1.4.6 && < 2.1
 - async                             >= 2.2.2 && < 2.3
-- base                              >= 4.12.0 && < 4.16
+- base                              >= 4.15.0 && < 4.16
 - bytestring                        >= 0.10.8 && < 0.11
 - containers                        >= 0.6.0 && < 0.7
 - directory                         >= 1.3.3 && < 1.4
@@ -26,7 +26,7 @@ dependencies:
 - monad-logger                      >= 0.3.31 && < 0.4
 - mtl                               >= 2.2.2 && < 2.3
 - network                           >= 2.8.0 && < 3.2
-- optparse-applicative              >= 0.15.0 && < 0.17
+- optparse-applicative              >= 0.16.0 && < 0.17
 - prometheus-client                 >= 1.0.0 && < 1.2
 - prometheus-metrics-ghc            >= 1.0.0 && < 1.1
 - random                            >= 1.1 && < 1.3

server/src/Config.hs

@@ -6,9 +6,9 @@ module Config (
   configInfo,
 ) where
 
-import Control.Applicative (optional)
-import Data.Semigroup ((<>))
-import Options.Applicative
+import Options.Applicative ((<|>), auto, eitherReader, flag, flag', fullDesc, header, help, helper,
+                            info, long, metavar, option, optional, strOption, switch, value,
+                            Parser, ParserInfo, ReadM)
 import qualified Network.Wai.Handler.Warp as Warp
 import qualified Text.Read as Read
 import qualified Data.Char as Char

server/src/MetricsServer.hs

@@ -2,7 +2,6 @@
 module MetricsServer where
 
 import           Data.Function                     ((&))
-import           Data.Monoid                       ((<>))
 import qualified Data.Text                         as Text
 import qualified Network.Wai.Handler.Warp          as Warp
 import qualified Network.Wai.Middleware.Prometheus as PrometheusWai

server/src/Server.hs

@@ -5,7 +5,6 @@ module Server
 )
 where
 
-import Data.Semigroup ((<>))
 import Data.Text (pack)
 
 import Network.Wai (Application)

server/stack.yaml

@@ -1,4 +1,4 @@
-resolver: lts-19.17
+resolver: lts-19.32
 
 extra-deps:
   - raven-haskell-0.1.4.1