Fix CI (#1801)

* Install missing liblzma
* Fix imports in cookbook

.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

.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'

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