From 384b72cbc1e9e78b8ea5f766dffba231a69adfe4 Mon Sep 17 00:00:00 2001 From: Markus Schirp Date: Tue, 28 Oct 2025 22:17:22 +0000 Subject: [PATCH] Add support for GHC 9.10/9.12 --- .github/workflows/ci.yaml | 4 +- aws-checkip/aws-checkip.cabal | 5 +- aws-rds/aws-rds.cabal | 5 +- aws-secrets/aws-secrets.cabal | 5 +- .../aws-temporary-ingress-rule.cabal | 5 +- bounded/bounded.cabal | 5 +- bounded/src/Data/Bounded/Integral.hs | 2 +- bounded/src/Data/Bounded/Text.hs | 2 +- bounded/test/Test/TypedSpec.hs | 1 - cbt/cbt.cabal | 5 +- cli-utils/cli-utils.cabal | 5 +- common/package.yaml | 3 + conversions/conversions.cabal | 5 +- conversions/src/Data/Conversions.hs | 1 - dbt/dbt.cabal | 5 +- dbt/src/DBT/Connection.hs | 33 ++- devtools/devtools.cabal | 5 +- devtools/src/Devtools/HLint.hs | 2 - http-mclient/http-mclient.cabal | 5 +- lambda-alb/lambda-alb.cabal | 5 +- lambda-runtime/lambda-runtime.cabal | 5 +- lht/lht.cabal | 5 +- mio-amazonka/mio-amazonka.cabal | 5 +- mio-core/mio-core.cabal | 5 +- mio-log/mio-log.cabal | 5 +- mprelude/mprelude.cabal | 5 +- oauth/oauth.cabal | 5 +- oauth/src/OAuth/OAuth2.hs | 3 +- openapi/openapi.cabal | 5 +- pgt/pgt.cabal | 5 +- source-constraints/source-constraints.cabal | 5 +- source-constraints/src/SourceConstraints.hs | 19 ++ stack-9.10.yaml | 106 ++++++++ stack-9.10.yaml.lock | 246 ++++++++++++++++++ stack-9.12.yaml | 106 ++++++++ stack-9.12.yaml.lock | 246 ++++++++++++++++++ stack-9.4.yaml.lock | 2 +- stack-deploy/stack-deploy.cabal | 5 +- tasty-mgolden/src/Test/Tasty/MGolden.hs | 5 +- work-pool/work-pool.cabal | 5 +- xray/src/XRay/Prelude.hs | 7 +- xray/xray.cabal | 5 +- 42 files changed, 867 insertions(+), 46 deletions(-) create mode 100644 stack-9.10.yaml create mode 100644 stack-9.10.yaml.lock create mode 100644 stack-9.12.yaml create mode 100644 stack-9.12.yaml.lock diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3bea0d78..71f74614 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - ghc: ['9.4', '9.6', '9.8'] + ghc: ['9.4', '9.6', '9.8', '9.10', '9.12'] os: [ubuntu-latest] steps: - uses: actions/checkout@v4 @@ -34,7 +34,7 @@ jobs: strategy: fail-fast: false matrix: - ghc: ['9.4', '9.6', '9.8'] + ghc: ['9.4', '9.6', '9.8', '9.10', '9.12'] os: [ubuntu-latest] project: - aws-checkip diff --git a/aws-checkip/aws-checkip.cabal b/aws-checkip/aws-checkip.cabal index e1ca9da0..c66ef7dc 100644 --- a/aws-checkip/aws-checkip.cabal +++ b/aws-checkip/aws-checkip.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.36.0. +-- This file has been generated from package.yaml by hpack version 0.38.1. -- -- see: https://github.com/sol/hpack @@ -16,6 +16,9 @@ build-type: Simple tested-with: GHC == 9.4 , GHC == 9.6 + , GHC == 9.8 + , GHC == 9.10 + , GHC == 9.12 source-repository head type: git diff --git a/aws-rds/aws-rds.cabal b/aws-rds/aws-rds.cabal index 296a4cb2..8131d338 100644 --- a/aws-rds/aws-rds.cabal +++ b/aws-rds/aws-rds.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.36.0. +-- This file has been generated from package.yaml by hpack version 0.38.1. -- -- see: https://github.com/sol/hpack @@ -16,6 +16,9 @@ build-type: Simple tested-with: GHC == 9.4 , GHC == 9.6 + , GHC == 9.8 + , GHC == 9.10 + , GHC == 9.12 extra-source-files: global-bundle.pem diff --git a/aws-secrets/aws-secrets.cabal b/aws-secrets/aws-secrets.cabal index c8305bed..b96cd0eb 100644 --- a/aws-secrets/aws-secrets.cabal +++ b/aws-secrets/aws-secrets.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.36.0. +-- This file has been generated from package.yaml by hpack version 0.38.1. -- -- see: https://github.com/sol/hpack @@ -16,6 +16,9 @@ build-type: Simple tested-with: GHC == 9.4 , GHC == 9.6 + , GHC == 9.8 + , GHC == 9.10 + , GHC == 9.12 source-repository head type: git diff --git a/aws-temporary-ingress-rule/aws-temporary-ingress-rule.cabal b/aws-temporary-ingress-rule/aws-temporary-ingress-rule.cabal index 8d5ae146..12d89eee 100644 --- a/aws-temporary-ingress-rule/aws-temporary-ingress-rule.cabal +++ b/aws-temporary-ingress-rule/aws-temporary-ingress-rule.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.36.0. +-- This file has been generated from package.yaml by hpack version 0.38.1. -- -- see: https://github.com/sol/hpack @@ -16,6 +16,9 @@ build-type: Simple tested-with: GHC == 9.4 , GHC == 9.6 + , GHC == 9.8 + , GHC == 9.10 + , GHC == 9.12 source-repository head type: git diff --git a/bounded/bounded.cabal b/bounded/bounded.cabal index 3757588b..9a574e15 100644 --- a/bounded/bounded.cabal +++ b/bounded/bounded.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.36.0. +-- This file has been generated from package.yaml by hpack version 0.38.1. -- -- see: https://github.com/sol/hpack @@ -18,6 +18,9 @@ build-type: Simple tested-with: GHC == 9.4 , GHC == 9.6 + , GHC == 9.8 + , GHC == 9.10 + , GHC == 9.12 source-repository head type: git diff --git a/bounded/src/Data/Bounded/Integral.hs b/bounded/src/Data/Bounded/Integral.hs index d8e3acc6..a6af858d 100644 --- a/bounded/src/Data/Bounded/Integral.hs +++ b/bounded/src/Data/Bounded/Integral.hs @@ -18,7 +18,7 @@ import qualified Language.Haskell.TH.Syntax as TH newtype BoundNumber' (integral :: Type) (label :: Symbol) (range :: (Nat, Nat)) = BoundNumber { unBoundNumber :: integral } deriving newtype (JSON.ToJSON) - deriving stock (Eq, Ord, Show, TH.Lift, Typeable) + deriving stock (Eq, Ord, Show, TH.Lift) type BoundNumber = BoundNumber' Natural diff --git a/bounded/src/Data/Bounded/Text.hs b/bounded/src/Data/Bounded/Text.hs index fccc539f..81485956 100644 --- a/bounded/src/Data/Bounded/Text.hs +++ b/bounded/src/Data/Bounded/Text.hs @@ -23,7 +23,7 @@ type BoundText (label :: Symbol) = BoundText' label '(1, 128) newtype BoundText' (a :: k) (range :: (Nat, Nat)) = BoundText Text deriving (Conversion Text) via Text deriving newtype (JSON.FromJSONKey, JSON.ToJSON, JSON.ToJSONKey) - deriving stock (Eq, Ord, Show, TH.Lift, Typeable) + deriving stock (Eq, Ord, Show, TH.Lift) data BoundTextError = BoundTextError { actual :: Natural diff --git a/bounded/test/Test/TypedSpec.hs b/bounded/test/Test/TypedSpec.hs index cf1a4fdb..e8b931ca 100644 --- a/bounded/test/Test/TypedSpec.hs +++ b/bounded/test/Test/TypedSpec.hs @@ -10,7 +10,6 @@ import Test.TypeSpec.Core newtype TypeSpecTasty expectation = TypeSpecTasty (TypeSpec expectation) deriving newtype Show - deriving stock Typeable instance (PrettyTypeSpec a, Typeable (TypeSpecTasty a)) => IsTest (TypeSpecTasty a) where run _ (TypeSpecTasty assertion) _ = pure $ case assertion of diff --git a/cbt/cbt.cabal b/cbt/cbt.cabal index 8eaa62b7..cba609d3 100644 --- a/cbt/cbt.cabal +++ b/cbt/cbt.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.36.0. +-- This file has been generated from package.yaml by hpack version 0.38.1. -- -- see: https://github.com/sol/hpack @@ -18,6 +18,9 @@ build-type: Simple tested-with: GHC == 9.4 , GHC == 9.6 + , GHC == 9.8 + , GHC == 9.10 + , GHC == 9.12 source-repository head type: git diff --git a/cli-utils/cli-utils.cabal b/cli-utils/cli-utils.cabal index 55101bc1..d080bc42 100644 --- a/cli-utils/cli-utils.cabal +++ b/cli-utils/cli-utils.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.36.0. +-- This file has been generated from package.yaml by hpack version 0.38.1. -- -- see: https://github.com/sol/hpack @@ -16,6 +16,9 @@ build-type: Simple tested-with: GHC == 9.4 , GHC == 9.6 + , GHC == 9.8 + , GHC == 9.10 + , GHC == 9.12 source-repository head type: git diff --git a/common/package.yaml b/common/package.yaml index 9ef950a0..59932021 100644 --- a/common/package.yaml +++ b/common/package.yaml @@ -9,6 +9,9 @@ tested-with: - GHC == 9.4 - GHC == 9.6 + - GHC == 9.8 + - GHC == 9.10 + - GHC == 9.12 when: - condition: flag(development) diff --git a/conversions/conversions.cabal b/conversions/conversions.cabal index a28f502a..c9c2636f 100644 --- a/conversions/conversions.cabal +++ b/conversions/conversions.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.36.0. +-- This file has been generated from package.yaml by hpack version 0.38.1. -- -- see: https://github.com/sol/hpack @@ -17,6 +17,9 @@ build-type: Simple tested-with: GHC == 9.4 , GHC == 9.6 + , GHC == 9.8 + , GHC == 9.10 + , GHC == 9.12 source-repository head type: git diff --git a/conversions/src/Data/Conversions.hs b/conversions/src/Data/Conversions.hs index 1f2bd143..65841c15 100644 --- a/conversions/src/Data/Conversions.hs +++ b/conversions/src/Data/Conversions.hs @@ -32,7 +32,6 @@ instance Show.Show (BoundError a b) where instance (Typeable a, Typeable b) => Exception (BoundError a b) data UserBoundError a b = UserBoundError a b b - deriving stock (Typeable) instance (Show a, Show b) => Show.Show (UserBoundError a b) where show (UserBoundError value min max) = boundError value min max diff --git a/dbt/dbt.cabal b/dbt/dbt.cabal index 1c81c61a..372aeede 100644 --- a/dbt/dbt.cabal +++ b/dbt/dbt.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.36.0. +-- This file has been generated from package.yaml by hpack version 0.38.1. -- -- see: https://github.com/sol/hpack @@ -17,6 +17,9 @@ build-type: Simple tested-with: GHC == 9.4 , GHC == 9.6 + , GHC == 9.8 + , GHC == 9.10 + , GHC == 9.12 source-repository head type: git diff --git a/dbt/src/DBT/Connection.hs b/dbt/src/DBT/Connection.hs index b26e0528..0d3a012c 100644 --- a/dbt/src/DBT/Connection.hs +++ b/dbt/src/DBT/Connection.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE CPP #-} module DBT.Connection ( toSettings , withConnection @@ -14,6 +15,10 @@ import qualified Data.Maybe as Maybe import qualified Data.Text as Text import qualified Data.Text.Encoding as Text import qualified Hasql.Connection as Hasql +#if MIN_VERSION_hasql(1,9,0) +import qualified Hasql.Connection.Setting as HasqlSetting +import qualified Hasql.Connection.Setting.Connection as HasqlConnection +#endif import qualified Hasql.Session as Hasql import qualified UnliftIO.Exception as Exception @@ -49,9 +54,28 @@ withConnectionSession config session = withConnection config $ either Exception.throwIO pure <=< (liftIO . Hasql.run session) -toSettings :: ClientConfig -> Hasql.Settings +#if MIN_VERSION_hasql(1,9,0) +toSettings :: ClientConfig -> [HasqlSetting.Setting] toSettings config@ClientConfig{..} - = render + = [HasqlSetting.connection $ HasqlConnection.string $ Text.decodeUtf8 $ renderToByteString + [ required "dbname" databaseName + , required "host" hostName + , required "port" (effectiveHostPort config) + , required "user" userName + , optional "password" password + , optional "sslmode" sslMode + , optional "sslrootcert" sslRootCert + ]] + where + required :: ToText a => Text -> a -> Maybe Parameter + required name = pure . Parameter name . toText + + optional :: ToText a => Text -> Maybe a -> Maybe Parameter + optional name value = Parameter name . toText <$> value +#else +toSettings :: ClientConfig -> BS.ByteString +toSettings config@ClientConfig{..} + = renderToByteString [ required "dbname" databaseName , required "host" hostName , required "port" (effectiveHostPort config) @@ -66,9 +90,10 @@ toSettings config@ClientConfig{..} optional :: ToText a => Text -> Maybe a -> Maybe Parameter optional name value = Parameter name . toText <$> value +#endif -render :: [Maybe Parameter] -> BS.ByteString -render parameters +renderToByteString :: [Maybe Parameter] -> BS.ByteString +renderToByteString parameters = Text.encodeUtf8 . Text.intercalate " " $ renderParameter <$> Maybe.catMaybes parameters diff --git a/devtools/devtools.cabal b/devtools/devtools.cabal index c727be3e..66ad2e5d 100644 --- a/devtools/devtools.cabal +++ b/devtools/devtools.cabal @@ -1,6 +1,6 @@ cabal-version: 1.18 --- This file has been generated from package.yaml by hpack version 0.36.0. +-- This file has been generated from package.yaml by hpack version 0.38.1. -- -- see: https://github.com/sol/hpack @@ -21,6 +21,9 @@ build-type: Simple tested-with: GHC == 9.4 , GHC == 9.6 + , GHC == 9.8 + , GHC == 9.10 + , GHC == 9.12 extra-doc-files: README.md diff --git a/devtools/src/Devtools/HLint.hs b/devtools/src/Devtools/HLint.hs index c0d6502a..4cc2b0e1 100644 --- a/devtools/src/Devtools/HLint.hs +++ b/devtools/src/Devtools/HLint.hs @@ -3,7 +3,6 @@ module Devtools.HLint (testTree) where import Control.Applicative (empty, pure) import Data.Function (($), (.), const) import Data.Functor (void) -import Data.Typeable (Typeable) import System.IO import qualified Data.Foldable as Foldable @@ -14,7 +13,6 @@ import qualified Test.Tasty.Providers as Tasty import qualified Test.Tasty.Providers.ConsoleFormat as Tasty data HLintTest = HLintTest - deriving stock Typeable instance Tasty.IsTest HLintTest where run _options HLintTest _callback = runHLintTest diff --git a/http-mclient/http-mclient.cabal b/http-mclient/http-mclient.cabal index 1ef12dac..b9950503 100644 --- a/http-mclient/http-mclient.cabal +++ b/http-mclient/http-mclient.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.36.0. +-- This file has been generated from package.yaml by hpack version 0.38.1. -- -- see: https://github.com/sol/hpack @@ -20,6 +20,9 @@ build-type: Simple tested-with: GHC == 9.4 , GHC == 9.6 + , GHC == 9.8 + , GHC == 9.10 + , GHC == 9.12 extra-source-files: README.md diff --git a/lambda-alb/lambda-alb.cabal b/lambda-alb/lambda-alb.cabal index aa6b9112..1b6d3c37 100644 --- a/lambda-alb/lambda-alb.cabal +++ b/lambda-alb/lambda-alb.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.36.0. +-- This file has been generated from package.yaml by hpack version 0.38.1. -- -- see: https://github.com/sol/hpack @@ -20,6 +20,9 @@ build-type: Simple tested-with: GHC == 9.4 , GHC == 9.6 + , GHC == 9.8 + , GHC == 9.10 + , GHC == 9.12 extra-source-files: README.md diff --git a/lambda-runtime/lambda-runtime.cabal b/lambda-runtime/lambda-runtime.cabal index b55308b4..0d492113 100644 --- a/lambda-runtime/lambda-runtime.cabal +++ b/lambda-runtime/lambda-runtime.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.36.0. +-- This file has been generated from package.yaml by hpack version 0.38.1. -- -- see: https://github.com/sol/hpack @@ -20,6 +20,9 @@ build-type: Simple tested-with: GHC == 9.4 , GHC == 9.6 + , GHC == 9.8 + , GHC == 9.10 + , GHC == 9.12 extra-source-files: README.md diff --git a/lht/lht.cabal b/lht/lht.cabal index 4071625a..2630f91e 100644 --- a/lht/lht.cabal +++ b/lht/lht.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.36.0. +-- This file has been generated from package.yaml by hpack version 0.38.1. -- -- see: https://github.com/sol/hpack @@ -18,6 +18,9 @@ build-type: Simple tested-with: GHC == 9.4 , GHC == 9.6 + , GHC == 9.8 + , GHC == 9.10 + , GHC == 9.12 source-repository head type: git diff --git a/mio-amazonka/mio-amazonka.cabal b/mio-amazonka/mio-amazonka.cabal index aac2e0bd..f255f5e0 100644 --- a/mio-amazonka/mio-amazonka.cabal +++ b/mio-amazonka/mio-amazonka.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.36.0. +-- This file has been generated from package.yaml by hpack version 0.38.1. -- -- see: https://github.com/sol/hpack @@ -17,6 +17,9 @@ build-type: Simple tested-with: GHC == 9.4 , GHC == 9.6 + , GHC == 9.8 + , GHC == 9.10 + , GHC == 9.12 source-repository head type: git diff --git a/mio-core/mio-core.cabal b/mio-core/mio-core.cabal index 8323f5a0..f98a79b9 100644 --- a/mio-core/mio-core.cabal +++ b/mio-core/mio-core.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.36.0. +-- This file has been generated from package.yaml by hpack version 0.38.1. -- -- see: https://github.com/sol/hpack @@ -17,6 +17,9 @@ build-type: Simple tested-with: GHC == 9.4 , GHC == 9.6 + , GHC == 9.8 + , GHC == 9.10 + , GHC == 9.12 source-repository head type: git diff --git a/mio-log/mio-log.cabal b/mio-log/mio-log.cabal index bd9500d5..b58fc3ff 100644 --- a/mio-log/mio-log.cabal +++ b/mio-log/mio-log.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.36.0. +-- This file has been generated from package.yaml by hpack version 0.38.1. -- -- see: https://github.com/sol/hpack @@ -17,6 +17,9 @@ build-type: Simple tested-with: GHC == 9.4 , GHC == 9.6 + , GHC == 9.8 + , GHC == 9.10 + , GHC == 9.12 source-repository head type: git diff --git a/mprelude/mprelude.cabal b/mprelude/mprelude.cabal index 7909def9..6527c9b2 100644 --- a/mprelude/mprelude.cabal +++ b/mprelude/mprelude.cabal @@ -1,6 +1,6 @@ cabal-version: 1.18 --- This file has been generated from package.yaml by hpack version 0.36.0. +-- This file has been generated from package.yaml by hpack version 0.38.1. -- -- see: https://github.com/sol/hpack @@ -24,6 +24,9 @@ build-type: Simple tested-with: GHC == 9.4 , GHC == 9.6 + , GHC == 9.8 + , GHC == 9.10 + , GHC == 9.12 extra-doc-files: README.md diff --git a/oauth/oauth.cabal b/oauth/oauth.cabal index 23af999a..e7a986ce 100644 --- a/oauth/oauth.cabal +++ b/oauth/oauth.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.36.0. +-- This file has been generated from package.yaml by hpack version 0.38.1. -- -- see: https://github.com/sol/hpack @@ -20,6 +20,9 @@ build-type: Simple tested-with: GHC == 9.4 , GHC == 9.6 + , GHC == 9.8 + , GHC == 9.10 + , GHC == 9.12 extra-source-files: README.md diff --git a/oauth/src/OAuth/OAuth2.hs b/oauth/src/OAuth/OAuth2.hs index 703ecae2..ee1d1d6d 100644 --- a/oauth/src/OAuth/OAuth2.hs +++ b/oauth/src/OAuth/OAuth2.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE PackageImports #-} {-# LANGUAGE TupleSections #-} module OAuth.OAuth2 @@ -15,9 +16,9 @@ module OAuth.OAuth2 ) where +import "bounded" Data.Bounded import Control.Monad (replicateM) import Data.Bifunctor (second) -import Data.Bounded import Data.ByteString (ByteString) import Data.Word (Word8) import OAuth.Prelude diff --git a/openapi/openapi.cabal b/openapi/openapi.cabal index 790a0295..4d65ccb6 100644 --- a/openapi/openapi.cabal +++ b/openapi/openapi.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.36.0. +-- This file has been generated from package.yaml by hpack version 0.38.1. -- -- see: https://github.com/sol/hpack @@ -18,6 +18,9 @@ build-type: Simple tested-with: GHC == 9.4 , GHC == 9.6 + , GHC == 9.8 + , GHC == 9.10 + , GHC == 9.12 source-repository head type: git diff --git a/pgt/pgt.cabal b/pgt/pgt.cabal index bf236f9c..bf3c6a56 100644 --- a/pgt/pgt.cabal +++ b/pgt/pgt.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.36.0. +-- This file has been generated from package.yaml by hpack version 0.38.1. -- -- see: https://github.com/sol/hpack @@ -17,6 +17,9 @@ build-type: Simple tested-with: GHC == 9.4 , GHC == 9.6 + , GHC == 9.8 + , GHC == 9.10 + , GHC == 9.12 extra-source-files: examples/failure.test.sql examples/success.test.sql diff --git a/source-constraints/source-constraints.cabal b/source-constraints/source-constraints.cabal index de291879..fe15c1f1 100644 --- a/source-constraints/source-constraints.cabal +++ b/source-constraints/source-constraints.cabal @@ -1,6 +1,6 @@ cabal-version: 1.18 --- This file has been generated from package.yaml by hpack version 0.36.0. +-- This file has been generated from package.yaml by hpack version 0.38.1. -- -- see: https://github.com/sol/hpack @@ -21,6 +21,9 @@ build-type: Simple tested-with: GHC == 9.4 , GHC == 9.6 + , GHC == 9.8 + , GHC == 9.10 + , GHC == 9.12 extra-source-files: test/UnsortedIE.hs test/UnsortedIEThingWith.hs diff --git a/source-constraints/src/SourceConstraints.hs b/source-constraints/src/SourceConstraints.hs index 1fc322c2..e706a7d9 100644 --- a/source-constraints/src/SourceConstraints.hs +++ b/source-constraints/src/SourceConstraints.hs @@ -130,13 +130,19 @@ locatedWarnings context node sortedMultipleDeriving :: HsDecl GhcPs -> Maybe Message sortedMultipleDeriving = \case (TyClD _xIE DataDecl{tcdDataDefn = HsDataDefn {..}}) -> +#if MIN_VERSION_base(4,20,0) + sortedLocated "deriving clauses" context (render context) (reLoc <$> dd_derivs) +#else sortedLocated "deriving clauses" context (render context) (mkLocated <$> dd_derivs) +#endif _ -> Nothing where +#if !MIN_VERSION_base(4,20,0) mkLocated :: GenLocated (SrcAnn NoEpAnns) (HsDerivingClause GhcPs) -> Located (HsDerivingClause GhcPs) mkLocated value = L (locA $ getLoc value) (unLoc value) +#endif sortedIEs :: [LIE GhcPs] -> Maybe Message sortedIEs lie = @@ -149,7 +155,11 @@ locatedWarnings context node sortedIEThingWith :: IE GhcPs -> Maybe Message sortedIEThingWith = \case +#if MIN_VERSION_base(4,20,0) + (IEThingWith _xIE _name _ieWildcard ieWith _) -> +#else (IEThingWith _xIE _name _ieWildcard ieWith) -> +#endif sortedLocated "import/export item with list" context @@ -163,12 +173,21 @@ locatedWarnings context node ieClass :: IE GhcPs -> IEClass ieClass = \case +#if MIN_VERSION_base(4,20,0) + (IEVar _xIE name _) -> mkClass classify name + (IEThingAbs _xIE name _) -> mkClass Type name + (IEThingAll _xIE name _) -> mkClass Type name + (IEModuleContents _xIE name) -> mkClass Module name + (IEThingWith _xIE name _ieWildcard _ieFieldLabels _) -> + mkClass Type name +#else (IEVar _xIE name) -> mkClass classify name (IEThingAbs _xIE name) -> mkClass Type name (IEThingAll _xIE name) -> mkClass Type name (IEModuleContents _xIE name) -> mkClass Module name (IEThingWith _xIE name _ieWildcard _ieFieldLabels) -> mkClass Type name +#endif ie -> error $ "Unsupported: " ++ gshow ie where mkClass diff --git a/stack-9.10.yaml b/stack-9.10.yaml new file mode 100644 index 00000000..2dd101e5 --- /dev/null +++ b/stack-9.10.yaml @@ -0,0 +1,106 @@ +resolver: lts-24.16 +extra-deps: +- mprelude +- github: mbj/stratosphere + commit: e4f5c97814b7a4f73ee9125d4980ccd68b5a4ed2 + subdirs: + - . + - services/cloudwatch + - services/ecs + - services/events + - services/iam + - services/lambda + - services/logs + - services/s3 + - services/secretsmanager +- github: brendanhay/amazonka + commit: 30b200d487bccd2568de1257a812a464270d0096 + subdirs: + - lib/amazonka + - lib/amazonka-core + - lib/services/amazonka-cloudformation + - lib/services/amazonka-ec2 + - lib/services/amazonka-lambda + - lib/services/amazonka-s3 + - lib/services/amazonka-secretsmanager + - lib/services/amazonka-sso + - lib/services/amazonka-sts +flags: + aws-checkip: + development: true + aws-rds: + development: true + aws-secrets: + development: true + aws-temporary-ingress-rule: + development: true + bounded: + development: true + cbt: + development: true + cli-utils: + development: true + conversions: + development: true + dbt: + development: true + devtools: + development: true + http-mclient: + development: true + lambda-alb: + development: true + lambda-runtime: + development: true + lht: + development: true + mio-amazonka: + development: true + mio-core: + development: true + mio-log: + development: true + mprelude: + development: true + oauth: + development: true + openapi: + development: true + pgt: + development: true + source-constraints: + development: true + stack-deploy: + development: true + tasty-mgolden: + development: true + work-pool: + development: true + xray: + development: true +packages: +- aws-checkip +- aws-rds +- aws-secrets +- aws-temporary-ingress-rule +- bounded +- cbt +- cli-utils +- conversions +- dbt +- devtools +- http-mclient +- lambda-alb +- lambda-runtime +- lht +- mio-amazonka +- mio-core +- mio-log +- oauth +- openapi +- pgt +- source-constraints +- stack-deploy +- tasty-mgolden +- work-pool +- xray diff --git a/stack-9.10.yaml.lock b/stack-9.10.yaml.lock new file mode 100644 index 00000000..17878ce3 --- /dev/null +++ b/stack-9.10.yaml.lock @@ -0,0 +1,246 @@ +# This file was autogenerated by Stack. +# You should not edit this file by hand. +# For more information, please see the documentation at: +# https://docs.haskellstack.org/en/stable/topics/lock_files + +packages: +- completed: + name: stratosphere + pantry-tree: + sha256: 6820628f1109fcb43ae11d52ea7b5bfc5e54a8b2c89409298116fd7c50cdc518 + size: 1546448 + sha256: 80eb75e2d333363300ad42dd44c67b452906ac66dbb9648ab4d0c963ef1e83d2 + size: 2877978 + subdir: . + url: https://github.com/mbj/stratosphere/archive/e4f5c97814b7a4f73ee9125d4980ccd68b5a4ed2.tar.gz + version: 1.0.0 + original: + subdir: . + url: https://github.com/mbj/stratosphere/archive/e4f5c97814b7a4f73ee9125d4980ccd68b5a4ed2.tar.gz +- completed: + name: stratosphere-cloudwatch + pantry-tree: + sha256: 40a5dcf6d4178747e82763b53c0b2ddc28cf734eeaa6189a84c6b31bbc68c219 + size: 4591 + sha256: 80eb75e2d333363300ad42dd44c67b452906ac66dbb9648ab4d0c963ef1e83d2 + size: 2877978 + subdir: services/cloudwatch + url: https://github.com/mbj/stratosphere/archive/e4f5c97814b7a4f73ee9125d4980ccd68b5a4ed2.tar.gz + version: 1.0.0 + original: + subdir: services/cloudwatch + url: https://github.com/mbj/stratosphere/archive/e4f5c97814b7a4f73ee9125d4980ccd68b5a4ed2.tar.gz +- completed: + name: stratosphere-ecs + pantry-tree: + sha256: ebbc05caf08ee0a4b7ea914f2714f2f188786a3b6b50cfe7ebcf0b0ff994b6e6 + size: 15900 + sha256: 80eb75e2d333363300ad42dd44c67b452906ac66dbb9648ab4d0c963ef1e83d2 + size: 2877978 + subdir: services/ecs + url: https://github.com/mbj/stratosphere/archive/e4f5c97814b7a4f73ee9125d4980ccd68b5a4ed2.tar.gz + version: 1.0.0 + original: + subdir: services/ecs + url: https://github.com/mbj/stratosphere/archive/e4f5c97814b7a4f73ee9125d4980ccd68b5a4ed2.tar.gz +- completed: + name: stratosphere-events + pantry-tree: + sha256: f0cf061f223db62b5358e1936ed22d5e4568ad2124e6b4c025467d241b8319b8 + size: 8860 + sha256: 80eb75e2d333363300ad42dd44c67b452906ac66dbb9648ab4d0c963ef1e83d2 + size: 2877978 + subdir: services/events + url: https://github.com/mbj/stratosphere/archive/e4f5c97814b7a4f73ee9125d4980ccd68b5a4ed2.tar.gz + version: 1.0.0 + original: + subdir: services/events + url: https://github.com/mbj/stratosphere/archive/e4f5c97814b7a4f73ee9125d4980ccd68b5a4ed2.tar.gz +- completed: + name: stratosphere-iam + pantry-tree: + sha256: 500913420a9c02962dc46ae5fae6fe4130cc91b74756b2d565f91d2291b3a66a + size: 2041 + sha256: 80eb75e2d333363300ad42dd44c67b452906ac66dbb9648ab4d0c963ef1e83d2 + size: 2877978 + subdir: services/iam + url: https://github.com/mbj/stratosphere/archive/e4f5c97814b7a4f73ee9125d4980ccd68b5a4ed2.tar.gz + version: 1.0.0 + original: + subdir: services/iam + url: https://github.com/mbj/stratosphere/archive/e4f5c97814b7a4f73ee9125d4980ccd68b5a4ed2.tar.gz +- completed: + name: stratosphere-lambda + pantry-tree: + sha256: 72240d291d7ac9ff3ebb702e82f68c6eacbd3f85edbfeb0f0a5e554c1b1982d3 + size: 8901 + sha256: 80eb75e2d333363300ad42dd44c67b452906ac66dbb9648ab4d0c963ef1e83d2 + size: 2877978 + subdir: services/lambda + url: https://github.com/mbj/stratosphere/archive/e4f5c97814b7a4f73ee9125d4980ccd68b5a4ed2.tar.gz + version: 1.0.0 + original: + subdir: services/lambda + url: https://github.com/mbj/stratosphere/archive/e4f5c97814b7a4f73ee9125d4980ccd68b5a4ed2.tar.gz +- completed: + name: stratosphere-logs + pantry-tree: + sha256: 697bc810da47b6fd9ccc73d9d57794a23db06c53bf44d92af20a6e85392ef3f6 + size: 1990 + sha256: 80eb75e2d333363300ad42dd44c67b452906ac66dbb9648ab4d0c963ef1e83d2 + size: 2877978 + subdir: services/logs + url: https://github.com/mbj/stratosphere/archive/e4f5c97814b7a4f73ee9125d4980ccd68b5a4ed2.tar.gz + version: 1.0.0 + original: + subdir: services/logs + url: https://github.com/mbj/stratosphere/archive/e4f5c97814b7a4f73ee9125d4980ccd68b5a4ed2.tar.gz +- completed: + name: stratosphere-s3 + pantry-tree: + sha256: 59c1a0fbd32527e97e58edba45fe5b7e95d1725bee60c20e658e3323307479ad + size: 19007 + sha256: 80eb75e2d333363300ad42dd44c67b452906ac66dbb9648ab4d0c963ef1e83d2 + size: 2877978 + subdir: services/s3 + url: https://github.com/mbj/stratosphere/archive/e4f5c97814b7a4f73ee9125d4980ccd68b5a4ed2.tar.gz + version: 1.0.0 + original: + subdir: services/s3 + url: https://github.com/mbj/stratosphere/archive/e4f5c97814b7a4f73ee9125d4980ccd68b5a4ed2.tar.gz +- completed: + name: stratosphere-secretsmanager + pantry-tree: + sha256: f8a3693025008e2c3620881c28a5b8fee8d77204a6636a4f514cdc50bf84483f + size: 1408 + sha256: 80eb75e2d333363300ad42dd44c67b452906ac66dbb9648ab4d0c963ef1e83d2 + size: 2877978 + subdir: services/secretsmanager + url: https://github.com/mbj/stratosphere/archive/e4f5c97814b7a4f73ee9125d4980ccd68b5a4ed2.tar.gz + version: 1.0.0 + original: + subdir: services/secretsmanager + url: https://github.com/mbj/stratosphere/archive/e4f5c97814b7a4f73ee9125d4980ccd68b5a4ed2.tar.gz +- completed: + name: amazonka + pantry-tree: + sha256: 449e5e0777359ebb56ead5fca6aeef5ec4f5bdd82a810ad3ba30432055efaa8b + size: 1528 + sha256: 95fd96d76c74894b9d2a2553b58934501270f1cf37418a4d42da6e16b46d8cd3 + size: 34732287 + subdir: lib/amazonka + url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz + version: '2.0' + original: + subdir: lib/amazonka + url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz +- completed: + name: amazonka-core + pantry-tree: + sha256: e560d220c73068da280e8532d27f4cee341c2c05efd2f5d5b1b0336cb24ccb1b + size: 3222 + sha256: 95fd96d76c74894b9d2a2553b58934501270f1cf37418a4d42da6e16b46d8cd3 + size: 34732287 + subdir: lib/amazonka-core + url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz + version: '2.0' + original: + subdir: lib/amazonka-core + url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz +- completed: + name: amazonka-cloudformation + pantry-tree: + sha256: 25e860bcbfaba5317b0e5567aceffbb10b7314400437e0f8a999551c0fa2f216 + size: 27257 + sha256: 95fd96d76c74894b9d2a2553b58934501270f1cf37418a4d42da6e16b46d8cd3 + size: 34732287 + subdir: lib/services/amazonka-cloudformation + url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz + version: '2.0' + original: + subdir: lib/services/amazonka-cloudformation + url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz +- completed: + name: amazonka-ec2 + pantry-tree: + sha256: 51aee8c10460ea60030dd9c3ae09dfdd78ae71c20e304f8824ba2275ec16a20d + size: 234434 + sha256: 95fd96d76c74894b9d2a2553b58934501270f1cf37418a4d42da6e16b46d8cd3 + size: 34732287 + subdir: lib/services/amazonka-ec2 + url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz + version: '2.0' + original: + subdir: lib/services/amazonka-ec2 + url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz +- completed: + name: amazonka-lambda + pantry-tree: + sha256: e99dc2ab8f03c47702d3ba13cd416942e2143b4e494136d482749d2d47ee09ac + size: 21343 + sha256: 95fd96d76c74894b9d2a2553b58934501270f1cf37418a4d42da6e16b46d8cd3 + size: 34732287 + subdir: lib/services/amazonka-lambda + url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz + version: '2.0' + original: + subdir: lib/services/amazonka-lambda + url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz +- completed: + name: amazonka-s3 + pantry-tree: + sha256: 50bb47db3771d94ee26711bad9d91b1dc32e6466a9a580e9333af434728052b1 + size: 38690 + sha256: 95fd96d76c74894b9d2a2553b58934501270f1cf37418a4d42da6e16b46d8cd3 + size: 34732287 + subdir: lib/services/amazonka-s3 + url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz + version: '2.0' + original: + subdir: lib/services/amazonka-s3 + url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz +- completed: + name: amazonka-secretsmanager + pantry-tree: + sha256: e3fff44d0288efd08e15cf06fd1f2116519ea626fdddbebd07102839e18dd85f + size: 7039 + sha256: 95fd96d76c74894b9d2a2553b58934501270f1cf37418a4d42da6e16b46d8cd3 + size: 34732287 + subdir: lib/services/amazonka-secretsmanager + url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz + version: '2.0' + original: + subdir: lib/services/amazonka-secretsmanager + url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz +- completed: + name: amazonka-sso + pantry-tree: + sha256: f8897d82072d662605f60dc3d18e921c04bbb337b5d7caaeaece36fc8aee7fb9 + size: 1817 + sha256: 95fd96d76c74894b9d2a2553b58934501270f1cf37418a4d42da6e16b46d8cd3 + size: 34732287 + subdir: lib/services/amazonka-sso + url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz + version: '2.0' + original: + subdir: lib/services/amazonka-sso + url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz +- completed: + name: amazonka-sts + pantry-tree: + sha256: b2a18c0a04c999f9f32e114ad94bf76a89e463dbb16063ebf0899ee28808f898 + size: 2880 + sha256: 95fd96d76c74894b9d2a2553b58934501270f1cf37418a4d42da6e16b46d8cd3 + size: 34732287 + subdir: lib/services/amazonka-sts + url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz + version: '2.0' + original: + subdir: lib/services/amazonka-sts + url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz +snapshots: +- completed: + sha256: 309392e77af949aff34933aff53070c774d274b0f2f7e314df665c0d322c7715 + size: 726103 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/24/16.yaml + original: lts-24.16 diff --git a/stack-9.12.yaml b/stack-9.12.yaml new file mode 100644 index 00000000..382d4986 --- /dev/null +++ b/stack-9.12.yaml @@ -0,0 +1,106 @@ +resolver: nightly-2025-10-26 +extra-deps: +- mprelude +- github: mbj/stratosphere + commit: e4f5c97814b7a4f73ee9125d4980ccd68b5a4ed2 + subdirs: + - . + - services/cloudwatch + - services/ecs + - services/events + - services/iam + - services/lambda + - services/logs + - services/s3 + - services/secretsmanager +- github: brendanhay/amazonka + commit: 30b200d487bccd2568de1257a812a464270d0096 + subdirs: + - lib/amazonka + - lib/amazonka-core + - lib/services/amazonka-cloudformation + - lib/services/amazonka-ec2 + - lib/services/amazonka-lambda + - lib/services/amazonka-s3 + - lib/services/amazonka-secretsmanager + - lib/services/amazonka-sso + - lib/services/amazonka-sts +flags: + aws-checkip: + development: true + aws-rds: + development: true + aws-secrets: + development: true + aws-temporary-ingress-rule: + development: true + bounded: + development: true + cbt: + development: true + cli-utils: + development: true + conversions: + development: true + dbt: + development: true + devtools: + development: true + http-mclient: + development: true + lambda-alb: + development: true + lambda-runtime: + development: true + lht: + development: true + mio-amazonka: + development: true + mio-core: + development: true + mio-log: + development: true + mprelude: + development: true + oauth: + development: true + openapi: + development: true + pgt: + development: true + source-constraints: + development: true + stack-deploy: + development: true + tasty-mgolden: + development: true + work-pool: + development: true + xray: + development: true +packages: +- aws-checkip +- aws-rds +- aws-secrets +- aws-temporary-ingress-rule +- bounded +- cbt +- cli-utils +- conversions +- dbt +- devtools +- http-mclient +- lambda-alb +- lambda-runtime +- lht +- mio-amazonka +- mio-core +- mio-log +- oauth +- openapi +- pgt +- source-constraints +- stack-deploy +- tasty-mgolden +- work-pool +- xray diff --git a/stack-9.12.yaml.lock b/stack-9.12.yaml.lock new file mode 100644 index 00000000..165938d0 --- /dev/null +++ b/stack-9.12.yaml.lock @@ -0,0 +1,246 @@ +# This file was autogenerated by Stack. +# You should not edit this file by hand. +# For more information, please see the documentation at: +# https://docs.haskellstack.org/en/stable/topics/lock_files + +packages: +- completed: + name: stratosphere + pantry-tree: + sha256: 6820628f1109fcb43ae11d52ea7b5bfc5e54a8b2c89409298116fd7c50cdc518 + size: 1546448 + sha256: 80eb75e2d333363300ad42dd44c67b452906ac66dbb9648ab4d0c963ef1e83d2 + size: 2877978 + subdir: . + url: https://github.com/mbj/stratosphere/archive/e4f5c97814b7a4f73ee9125d4980ccd68b5a4ed2.tar.gz + version: 1.0.0 + original: + subdir: . + url: https://github.com/mbj/stratosphere/archive/e4f5c97814b7a4f73ee9125d4980ccd68b5a4ed2.tar.gz +- completed: + name: stratosphere-cloudwatch + pantry-tree: + sha256: 40a5dcf6d4178747e82763b53c0b2ddc28cf734eeaa6189a84c6b31bbc68c219 + size: 4591 + sha256: 80eb75e2d333363300ad42dd44c67b452906ac66dbb9648ab4d0c963ef1e83d2 + size: 2877978 + subdir: services/cloudwatch + url: https://github.com/mbj/stratosphere/archive/e4f5c97814b7a4f73ee9125d4980ccd68b5a4ed2.tar.gz + version: 1.0.0 + original: + subdir: services/cloudwatch + url: https://github.com/mbj/stratosphere/archive/e4f5c97814b7a4f73ee9125d4980ccd68b5a4ed2.tar.gz +- completed: + name: stratosphere-ecs + pantry-tree: + sha256: ebbc05caf08ee0a4b7ea914f2714f2f188786a3b6b50cfe7ebcf0b0ff994b6e6 + size: 15900 + sha256: 80eb75e2d333363300ad42dd44c67b452906ac66dbb9648ab4d0c963ef1e83d2 + size: 2877978 + subdir: services/ecs + url: https://github.com/mbj/stratosphere/archive/e4f5c97814b7a4f73ee9125d4980ccd68b5a4ed2.tar.gz + version: 1.0.0 + original: + subdir: services/ecs + url: https://github.com/mbj/stratosphere/archive/e4f5c97814b7a4f73ee9125d4980ccd68b5a4ed2.tar.gz +- completed: + name: stratosphere-events + pantry-tree: + sha256: f0cf061f223db62b5358e1936ed22d5e4568ad2124e6b4c025467d241b8319b8 + size: 8860 + sha256: 80eb75e2d333363300ad42dd44c67b452906ac66dbb9648ab4d0c963ef1e83d2 + size: 2877978 + subdir: services/events + url: https://github.com/mbj/stratosphere/archive/e4f5c97814b7a4f73ee9125d4980ccd68b5a4ed2.tar.gz + version: 1.0.0 + original: + subdir: services/events + url: https://github.com/mbj/stratosphere/archive/e4f5c97814b7a4f73ee9125d4980ccd68b5a4ed2.tar.gz +- completed: + name: stratosphere-iam + pantry-tree: + sha256: 500913420a9c02962dc46ae5fae6fe4130cc91b74756b2d565f91d2291b3a66a + size: 2041 + sha256: 80eb75e2d333363300ad42dd44c67b452906ac66dbb9648ab4d0c963ef1e83d2 + size: 2877978 + subdir: services/iam + url: https://github.com/mbj/stratosphere/archive/e4f5c97814b7a4f73ee9125d4980ccd68b5a4ed2.tar.gz + version: 1.0.0 + original: + subdir: services/iam + url: https://github.com/mbj/stratosphere/archive/e4f5c97814b7a4f73ee9125d4980ccd68b5a4ed2.tar.gz +- completed: + name: stratosphere-lambda + pantry-tree: + sha256: 72240d291d7ac9ff3ebb702e82f68c6eacbd3f85edbfeb0f0a5e554c1b1982d3 + size: 8901 + sha256: 80eb75e2d333363300ad42dd44c67b452906ac66dbb9648ab4d0c963ef1e83d2 + size: 2877978 + subdir: services/lambda + url: https://github.com/mbj/stratosphere/archive/e4f5c97814b7a4f73ee9125d4980ccd68b5a4ed2.tar.gz + version: 1.0.0 + original: + subdir: services/lambda + url: https://github.com/mbj/stratosphere/archive/e4f5c97814b7a4f73ee9125d4980ccd68b5a4ed2.tar.gz +- completed: + name: stratosphere-logs + pantry-tree: + sha256: 697bc810da47b6fd9ccc73d9d57794a23db06c53bf44d92af20a6e85392ef3f6 + size: 1990 + sha256: 80eb75e2d333363300ad42dd44c67b452906ac66dbb9648ab4d0c963ef1e83d2 + size: 2877978 + subdir: services/logs + url: https://github.com/mbj/stratosphere/archive/e4f5c97814b7a4f73ee9125d4980ccd68b5a4ed2.tar.gz + version: 1.0.0 + original: + subdir: services/logs + url: https://github.com/mbj/stratosphere/archive/e4f5c97814b7a4f73ee9125d4980ccd68b5a4ed2.tar.gz +- completed: + name: stratosphere-s3 + pantry-tree: + sha256: 59c1a0fbd32527e97e58edba45fe5b7e95d1725bee60c20e658e3323307479ad + size: 19007 + sha256: 80eb75e2d333363300ad42dd44c67b452906ac66dbb9648ab4d0c963ef1e83d2 + size: 2877978 + subdir: services/s3 + url: https://github.com/mbj/stratosphere/archive/e4f5c97814b7a4f73ee9125d4980ccd68b5a4ed2.tar.gz + version: 1.0.0 + original: + subdir: services/s3 + url: https://github.com/mbj/stratosphere/archive/e4f5c97814b7a4f73ee9125d4980ccd68b5a4ed2.tar.gz +- completed: + name: stratosphere-secretsmanager + pantry-tree: + sha256: f8a3693025008e2c3620881c28a5b8fee8d77204a6636a4f514cdc50bf84483f + size: 1408 + sha256: 80eb75e2d333363300ad42dd44c67b452906ac66dbb9648ab4d0c963ef1e83d2 + size: 2877978 + subdir: services/secretsmanager + url: https://github.com/mbj/stratosphere/archive/e4f5c97814b7a4f73ee9125d4980ccd68b5a4ed2.tar.gz + version: 1.0.0 + original: + subdir: services/secretsmanager + url: https://github.com/mbj/stratosphere/archive/e4f5c97814b7a4f73ee9125d4980ccd68b5a4ed2.tar.gz +- completed: + name: amazonka + pantry-tree: + sha256: 449e5e0777359ebb56ead5fca6aeef5ec4f5bdd82a810ad3ba30432055efaa8b + size: 1528 + sha256: 95fd96d76c74894b9d2a2553b58934501270f1cf37418a4d42da6e16b46d8cd3 + size: 34732287 + subdir: lib/amazonka + url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz + version: '2.0' + original: + subdir: lib/amazonka + url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz +- completed: + name: amazonka-core + pantry-tree: + sha256: e560d220c73068da280e8532d27f4cee341c2c05efd2f5d5b1b0336cb24ccb1b + size: 3222 + sha256: 95fd96d76c74894b9d2a2553b58934501270f1cf37418a4d42da6e16b46d8cd3 + size: 34732287 + subdir: lib/amazonka-core + url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz + version: '2.0' + original: + subdir: lib/amazonka-core + url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz +- completed: + name: amazonka-cloudformation + pantry-tree: + sha256: 25e860bcbfaba5317b0e5567aceffbb10b7314400437e0f8a999551c0fa2f216 + size: 27257 + sha256: 95fd96d76c74894b9d2a2553b58934501270f1cf37418a4d42da6e16b46d8cd3 + size: 34732287 + subdir: lib/services/amazonka-cloudformation + url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz + version: '2.0' + original: + subdir: lib/services/amazonka-cloudformation + url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz +- completed: + name: amazonka-ec2 + pantry-tree: + sha256: 51aee8c10460ea60030dd9c3ae09dfdd78ae71c20e304f8824ba2275ec16a20d + size: 234434 + sha256: 95fd96d76c74894b9d2a2553b58934501270f1cf37418a4d42da6e16b46d8cd3 + size: 34732287 + subdir: lib/services/amazonka-ec2 + url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz + version: '2.0' + original: + subdir: lib/services/amazonka-ec2 + url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz +- completed: + name: amazonka-lambda + pantry-tree: + sha256: e99dc2ab8f03c47702d3ba13cd416942e2143b4e494136d482749d2d47ee09ac + size: 21343 + sha256: 95fd96d76c74894b9d2a2553b58934501270f1cf37418a4d42da6e16b46d8cd3 + size: 34732287 + subdir: lib/services/amazonka-lambda + url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz + version: '2.0' + original: + subdir: lib/services/amazonka-lambda + url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz +- completed: + name: amazonka-s3 + pantry-tree: + sha256: 50bb47db3771d94ee26711bad9d91b1dc32e6466a9a580e9333af434728052b1 + size: 38690 + sha256: 95fd96d76c74894b9d2a2553b58934501270f1cf37418a4d42da6e16b46d8cd3 + size: 34732287 + subdir: lib/services/amazonka-s3 + url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz + version: '2.0' + original: + subdir: lib/services/amazonka-s3 + url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz +- completed: + name: amazonka-secretsmanager + pantry-tree: + sha256: e3fff44d0288efd08e15cf06fd1f2116519ea626fdddbebd07102839e18dd85f + size: 7039 + sha256: 95fd96d76c74894b9d2a2553b58934501270f1cf37418a4d42da6e16b46d8cd3 + size: 34732287 + subdir: lib/services/amazonka-secretsmanager + url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz + version: '2.0' + original: + subdir: lib/services/amazonka-secretsmanager + url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz +- completed: + name: amazonka-sso + pantry-tree: + sha256: f8897d82072d662605f60dc3d18e921c04bbb337b5d7caaeaece36fc8aee7fb9 + size: 1817 + sha256: 95fd96d76c74894b9d2a2553b58934501270f1cf37418a4d42da6e16b46d8cd3 + size: 34732287 + subdir: lib/services/amazonka-sso + url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz + version: '2.0' + original: + subdir: lib/services/amazonka-sso + url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz +- completed: + name: amazonka-sts + pantry-tree: + sha256: b2a18c0a04c999f9f32e114ad94bf76a89e463dbb16063ebf0899ee28808f898 + size: 2880 + sha256: 95fd96d76c74894b9d2a2553b58934501270f1cf37418a4d42da6e16b46d8cd3 + size: 34732287 + subdir: lib/services/amazonka-sts + url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz + version: '2.0' + original: + subdir: lib/services/amazonka-sts + url: https://github.com/brendanhay/amazonka/archive/30b200d487bccd2568de1257a812a464270d0096.tar.gz +snapshots: +- completed: + sha256: fab6a1992f7bc4198c7f8dfbb32f87be1f0866ec5123c4bb59972d5a3b89ff5a + size: 704692 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2025/10/26.yaml + original: nightly-2025-10-26 diff --git a/stack-9.4.yaml.lock b/stack-9.4.yaml.lock index b94d8ded..8fa4cff5 100644 --- a/stack-9.4.yaml.lock +++ b/stack-9.4.yaml.lock @@ -1,7 +1,7 @@ # This file was autogenerated by Stack. # You should not edit this file by hand. # For more information, please see the documentation at: -# https://docs.haskellstack.org/en/stable/lock_files +# https://docs.haskellstack.org/en/stable/topics/lock_files packages: - completed: diff --git a/stack-deploy/stack-deploy.cabal b/stack-deploy/stack-deploy.cabal index fda1ac4b..fa7cac04 100644 --- a/stack-deploy/stack-deploy.cabal +++ b/stack-deploy/stack-deploy.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.36.0. +-- This file has been generated from package.yaml by hpack version 0.38.1. -- -- see: https://github.com/sol/hpack @@ -18,6 +18,9 @@ build-type: Simple tested-with: GHC == 9.4 , GHC == 9.6 + , GHC == 9.8 + , GHC == 9.10 + , GHC == 9.12 source-repository head type: git diff --git a/tasty-mgolden/src/Test/Tasty/MGolden.hs b/tasty-mgolden/src/Test/Tasty/MGolden.hs index 75aee293..2e5e46df 100644 --- a/tasty-mgolden/src/Test/Tasty/MGolden.hs +++ b/tasty-mgolden/src/Test/Tasty/MGolden.hs @@ -18,7 +18,6 @@ import Control.Applicative (empty) import Data.Foldable (traverse_) import Data.Proxy (Proxy(..)) import Data.Text (Text) -import Data.Typeable (Typeable) import Prelude hiding (print, putStrLn) import Test.Tasty import Test.Tasty.Options @@ -35,7 +34,7 @@ import qualified System.IO.Error as Error data Mode = RunTest -- ^ Run the tests, error (with diff) on actual vs expectation mismatch | UpdateExpected -- ^ Run the tests, update the expectation on actual vs expectation mismatch - deriving stock (Eq, Ord, Typeable, Show) + deriving stock (Eq, Ord, Show) instance IsOption Mode where defaultValue = RunTest @@ -52,14 +51,12 @@ data Golden = Golden { action :: IO Text , expectedPath :: FilePath } - deriving stock Typeable instance IsTest Golden where run options golden _callback = runGolden golden options testOptions = pure . pure $ Option (Proxy :: Proxy Mode) newtype DiffTest = DiffTest (IO (Text, Text)) - deriving stock Typeable instance IsTest DiffTest where run options test _callback = runDiffTest test options diff --git a/work-pool/work-pool.cabal b/work-pool/work-pool.cabal index 73a0cf94..a7b97675 100644 --- a/work-pool/work-pool.cabal +++ b/work-pool/work-pool.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.36.0. +-- This file has been generated from package.yaml by hpack version 0.38.1. -- -- see: https://github.com/sol/hpack @@ -17,6 +17,9 @@ build-type: Simple tested-with: GHC == 9.4 , GHC == 9.6 + , GHC == 9.8 + , GHC == 9.10 + , GHC == 9.12 source-repository head type: git diff --git a/xray/src/XRay/Prelude.hs b/xray/src/XRay/Prelude.hs index 48bf4439..4af599a5 100644 --- a/xray/src/XRay/Prelude.hs +++ b/xray/src/XRay/Prelude.hs @@ -1,5 +1,6 @@ +{-# LANGUAGE PackageImports #-} module XRay.Prelude (module Exports) where -import Control.Arrow as Exports (left) -import Data.Bounded as Exports -import MPrelude as Exports +import "bounded" Data.Bounded as Exports +import Control.Arrow as Exports (left) +import MPrelude as Exports diff --git a/xray/xray.cabal b/xray/xray.cabal index f2162468..92541132 100644 --- a/xray/xray.cabal +++ b/xray/xray.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.37.0. +-- This file has been generated from package.yaml by hpack version 0.38.1. -- -- see: https://github.com/sol/hpack @@ -17,6 +17,9 @@ build-type: Simple tested-with: GHC == 9.4 , GHC == 9.6 + , GHC == 9.8 + , GHC == 9.10 + , GHC == 9.12 source-repository head type: git