From 58a07b77bea68b86d5dbdb9589c8ae68c37ee723 Mon Sep 17 00:00:00 2001 From: David Vollbracht Date: Tue, 14 May 2024 15:05:30 -0500 Subject: [PATCH] WIP: Updating to GHC 9.6 --- compose.yml | 2 +- optparse-repl.cabal | 6 +++--- package.yaml | 4 ++-- stack.yaml | 2 +- stack.yaml.lock | 8 ++++---- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/compose.yml b/compose.yml index b0f5bfc..b88bc19 100644 --- a/compose.yml +++ b/compose.yml @@ -1,6 +1,6 @@ services: dev: - image: ghcr.io/flipstone/haskell-tools:debian-stable-ghc-9.4.7-2023-10-31-3286ef4 + image: haskell-tools-beta volumes: - .:${PROJECT_DIR} - flipstone_stack_root:/stack-root diff --git a/optparse-repl.cabal b/optparse-repl.cabal index 94a5a3c..4bc8293 100644 --- a/optparse-repl.cabal +++ b/optparse-repl.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: optparse-repl -version: 0.1.0.0 +version: 0.1.0.1 description: Please see the README on GitHub at homepage: https://github.com/flipstone/optparse-repl#readme bug-reports: https://github.com/flipstone/optparse-repl/issues @@ -37,7 +37,7 @@ library build-depends: base >=4.7 && <5 , isocline ==1.0.* - , optparse-applicative ==0.17.* + , optparse-applicative >=0.17 && <0.19 , safe-exceptions ==0.1.* default-language: Haskell2010 if flag(strict) diff --git a/package.yaml b/package.yaml index 9cb93f3..f5b8cb5 100644 --- a/package.yaml +++ b/package.yaml @@ -1,5 +1,5 @@ name: optparse-repl -version: 0.1.0.0 +version: 0.1.0.1 github: "flipstone/optparse-repl" license: MIT author: "Flipstone Technology Partners" @@ -21,7 +21,7 @@ description: Please see the README on GitHub at = 4.7 && < 5 - isocline >= 1.0 && < 1.1 -- optparse-applicative >= 0.17 && < 0.18 +- optparse-applicative >= 0.17 && < 0.19 - safe-exceptions >= 0.1 && < 0.2 flags: diff --git a/stack.yaml b/stack.yaml index fee64ae..ddb82a3 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,5 +1,5 @@ resolver: - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/19.yaml + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/21.yaml system-ghc: true install-ghc: false diff --git a/stack.yaml.lock b/stack.yaml.lock index 6093dcf..ad6cdeb 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -6,8 +6,8 @@ packages: [] snapshots: - completed: - sha256: fb482b8e2d5d061cdda4ba1da2957c012740c893a5ee1c1b99001adae7b1fbe7 - size: 640046 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/19.yaml + sha256: b146f371d1a90abbd2aeae1da10f776951046be50eae55a6fe93548a74fcc0dd + size: 713338 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/21.yaml original: - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/19.yaml + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/21.yaml