From 69a9901b9c49ff3644d2cd9a5b51fa9a40a6fcbc Mon Sep 17 00:00:00 2001
From: Ryan Scott <ryan.gl.scott@gmail.com>
Date: Sat, 26 Oct 2024 16:44:22 -0400
Subject: [PATCH] Work around https://github.com/jaspervdj/websockets/pull/254

---
 .github/workflows/haskell-ci.yml | 6 +++---
 cabal.project                    | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml
index ce97328..07564ba 100644
--- a/.github/workflows/haskell-ci.yml
+++ b/.github/workflows/haskell-ci.yml
@@ -8,9 +8,9 @@
 #
 # For more information, see https://github.com/haskell-CI/haskell-ci
 #
-# version: 0.19.20241021
+# version: 0.19.20240708
 #
-# REGENDATA ("0.19.20241021",["github","cabal.project"])
+# REGENDATA ("0.19.20240708",["github","cabal.project"])
 #
 name: Haskell-CI
 on:
@@ -87,7 +87,6 @@ jobs:
           mkdir -p "$HOME/.ghcup/bin"
           curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
           chmod a+x "$HOME/.ghcup/bin/ghcup"
-          "$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
           "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
           "$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
         env:
@@ -197,6 +196,7 @@ jobs:
           echo "package javascript-bridge-benchmarks" >> cabal.project
           echo "    ghc-options: -Werror=missing-methods" >> cabal.project
           cat >> cabal.project <<EOF
+          allow-newer: websockets:containers
           EOF
           $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(javascript-bridge|javascript-bridge-benchmarks)$/; }' >> cabal.project.local
           cat cabal.project
diff --git a/cabal.project b/cabal.project
index a2004f8..80669be 100644
--- a/cabal.project
+++ b/cabal.project
@@ -1,2 +1,5 @@
 packages: .
           ./benchmarks
+
+-- Workaround until https://github.com/jaspervdj/websockets/pull/254 is merged
+allow-newer: websockets:containers