diff --git a/.github/workflows/install-system-dependencies.sh b/.github/workflows/install-system-dependencies.sh index 4cfb4d03d..7ba5cf438 100755 --- a/.github/workflows/install-system-dependencies.sh +++ b/.github/workflows/install-system-dependencies.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash case "$(uname -s)" in - Linux*) sudo apt install postgresql;; + Linux*) sudo apt install postgresql liblzma-dev;; Darwin*) brew install postgresql openssl;; esac diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index c0c74622d..0be81665f 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -35,6 +35,10 @@ jobs: ghc-version: ${{ matrix.ghc }} cabal-version: 'latest' + - name: Install system dependencies + run: | + ./.github/workflows/install-system-dependencies.sh + - name: Freeze run: | cabal configure --enable-tests --enable-benchmarks --test-show-details=direct @@ -49,9 +53,6 @@ jobs: key: ${{ runner.os }}-ghc-${{ matrix.ghc }}-cabal-${{ hashFiles('**/plan.json') }} restore-keys: ${{ runner.os }}-ghc-${{ matrix.ghc }}- - - name: Install system dependencies - run: | - ./.github/workflows/install-system-dependencies.sh - name: Install doctest run: | cabal install --ignore-project -j2 doctest --constraint='doctest ^>=0.22' diff --git a/doc/cookbook/hoist-server-with-context/HoistServerWithContext.lhs b/doc/cookbook/hoist-server-with-context/HoistServerWithContext.lhs index 472567b03..8d7366615 100644 --- a/doc/cookbook/hoist-server-with-context/HoistServerWithContext.lhs +++ b/doc/cookbook/hoist-server-with-context/HoistServerWithContext.lhs @@ -34,10 +34,9 @@ This recipe uses the following ingredients: import Prelude () import Prelude.Compat -import Control.Monad.IO.Class (liftIO) import Control.Monad.Reader import Data.Aeson -import Data.Default +import Data.Default (def) import Data.Proxy import Data.Text import Data.Time.Clock ( UTCTime, getCurrentTime ) @@ -48,7 +47,7 @@ import Network.Wai.Middleware.RequestLogger import Network.Wai.Middleware.RequestLogger.JSON import Servant as S import Servant.Auth as SA -import Servant.Auth.Server as SAS +import Servant.Auth.Server as SAS hiding (def) import System.Log.FastLogger ( ToLogStr(..) , LoggerSet , defaultBufSize