From bbd82a736f38f5b9446e73e2fa0bf178698dfb2f Mon Sep 17 00:00:00 2001
From: Janus Troelsen <janus@flipstone.com>
Date: Wed, 9 Mar 2022 12:58:50 -0600
Subject: [PATCH] Use Stack 2.7.5, cleanup

---
 .github/workflows/master.yml | 5 +----
 cabal.project                | 4 ----
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 329ff302..beeca4a5 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -58,9 +58,6 @@ jobs:
         cabal test all
 
     - name: Run doctests
-      # doctests are broken on GHC 9 due to compiler bug:
-      # https://gitlab.haskell.org/ghc/ghc/-/issues/19460
-      continue-on-error: ${{ matrix.ghc == '9.0.1' }}
       run: |
         # Necessary for doctest to be found in $PATH
         export PATH="$HOME/.cabal/bin:$PATH"
@@ -82,7 +79,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        stack: ["2.7.3"]
+        stack: ["2.7.5"]
         ghc: ["8.10.7"]
 
     steps:
diff --git a/cabal.project b/cabal.project
index cbef1e41..42e8057b 100644
--- a/cabal.project
+++ b/cabal.project
@@ -51,7 +51,3 @@ packages:
 tests: True
 optimization: False
 -- reorder-goals: True
-
--- https://github.com/chordify/haskell-servant-pagination/pull/12
-allow-newer: servant-pagination-2.2.2:servant
-allow-newer: servant-pagination-2.2.2:servant-server