WIP: Update for GHC 9.6

compose.yml

@@ -1,6 +1,6 @@
 services:
   dev:
-    image: ghcr.io/flipstone/haskell-tools:debian-unstable-ghc-9.4.5-2023-07-18-1d8bf61
+    image: haskell-tools-beta
     environment:
       STACK_ROOT: /stack-root
       IN_DEV_CONTAINER: 'true'

package.yaml

@@ -1,5 +1,5 @@
 name:                rollbar
-version:             2.1.0
+version:             2.1.1
 synopsis:            error tracking through rollbar.com
 homepage:            https://github.com/flipstone/rollbar-haskell
 license:             MIT
@@ -27,7 +27,7 @@ dependencies:
   - vector >=0.12 && < 0.14
   - network >=2.6 && < 3.2
   - monad-control >=1.0.2 && < 1.0.4
-  - resourcet >=1.1 && < 1.3
+  - resourcet >=1.1 && < 1.4
   - http-conduit >=2.2 && < 2.4
   - lifted-base == 0.2.3.*
   - network-bsd == 2.8.*

rollbar.cabal

@@ -1,11 +1,11 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
 
 name:           rollbar
-version:        2.1.0
+version:        2.1.1
 synopsis:       error tracking through rollbar.com
 category:       Logging
 homepage:       https://github.com/flipstone/rollbar-haskell
@@ -34,7 +34,7 @@ library
     , monad-control >=1.0.2 && <1.0.4
     , network >=2.6 && <3.2
     , network-bsd ==2.8.*
-    , resourcet >=1.1 && <1.3
+    , resourcet >=1.1 && <1.4
     , text >=1.2 && <2.1
     , vector >=0.12 && <0.14
   default-language: Haskell2010

scripts/lib/run-in-container.sh

@@ -11,6 +11,6 @@ else
 
   # Script was run from outside the container, re-exec inside the container
   # with the same arguments
-  docker-compose build
-  exec docker-compose run --rm "${EXTRA_ARGS[@]}" dev $0 "$@"
+  docker compose build
+  exec docker compose run --rm "${EXTRA_ARGS[@]}" dev $0 "$@"
 fi

stack.yaml

@@ -1,4 +1,4 @@
-resolver: lts-21.4
+resolver: lts-22.21
 system-ghc: true
 install-ghc: false
 

stack.yaml.lock

@@ -6,7 +6,7 @@
 packages: []
 snapshots:
 - completed:
-    sha256: caa77fdbc5b9f698262b21ee78030133272ec53116ad6ddbefdc4c321f668e0c
-    size: 640014
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/4.yaml
-  original: lts-21.4
+    sha256: b146f371d1a90abbd2aeae1da10f776951046be50eae55a6fe93548a74fcc0dd
+    size: 713338
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/21.yaml
+  original: lts-22.21