Merge branch 'master' into ghc-9.4.5

Author: mpilgrem

package.yaml

@@ -26,7 +26,7 @@ homepage: http://haskellstack.org
 custom-setup:
   dependencies:
   - base >= 4.14.3.0 && < 5
-  - Cabal < 3.10
+  - Cabal < 3.12
   - filepath
 extra-source-files:
 # note: leaving out 'package.yaml' because it causes confusion with hackage metadata revisions
@@ -60,13 +60,15 @@ dependencies:
 - base >= 4.14.3.0 && < 5
 - Cabal >= 3.8.1.0
 - aeson >= 2.0.3.0
+- aeson-warning-parser
 - ansi-terminal >= 1.0
 - array
 - async
 - attoparsec
 - base64-bytestring
 - bytestring
 - casa-client
+- companion
 - conduit
 - conduit-extra
 - containers

src/Stack/Build/ConstructPlan.hs

@@ -8,7 +8,8 @@ module Stack.Build.ConstructPlan
   ( constructPlan
   ) where
 
-import           Control.Monad.RWS.Strict hiding ( (<>) )
+import           Control.Monad.RWS.Strict
+                   ( RWST, get, modify, modify', pass, put, runRWST, tell )
 import qualified Data.List as L
 import qualified Data.Map.Merge.Strict as Map
 import qualified Data.Map.Strict as Map

src/Stack/Build/Execute.hs

@@ -17,6 +17,7 @@ module Stack.Build.Execute
   , KeepOutputOpen (..)
   ) where
 
+import           Control.Concurrent.Companion ( Companion, withCompanion )
 import           Control.Concurrent.Execute
                    ( Action (..), ActionContext (..), ActionId (..)
                    , ActionType (..)
@@ -66,7 +67,6 @@ import           Distribution.Types.UnqualComponentName
                    ( mkUnqualComponentName )
 import           Distribution.Verbosity ( showForCabal )
 import           Distribution.Version ( mkVersion )
-import           Pantry.Internal.Companion ( Companion, withCompanion )
 import           Path
                    ( PathException, (</>), addExtension, filename
                    , isProperPrefixOf, parent, parseRelDir, parseRelFile

src/Stack/Config.hs

@@ -32,6 +32,9 @@ module Stack.Config
   ) where
 
 import           Control.Monad.Extra ( firstJustM )
+import           Data.Aeson.Types ( Value )
+import           Data.Aeson.WarningParser
+                    ( WithJSONWarnings (..), logJSONWarnings )
 import           Data.Array.IArray ( (!), (//) )
 import qualified Data.ByteString as S
 import           Data.ByteString.Builder ( byteString )
@@ -51,8 +54,6 @@ import           GHC.Conc ( getNumProcessors )
 import           Network.HTTP.StackClient
                    ( httpJSON, parseUrlThrow, getResponseBody )
 import           Options.Applicative ( Parser, help, long, metavar, strOption )
-import           Pantry.Internal.AesonExtended
-                    ( Value, WithJSONWarnings (..), logJSONWarnings )
 import           Path
                    ( PathException (..), (</>), parent, parseAbsDir
                    , parseAbsFile, parseRelDir, stripProperPrefix

src/Stack/Docker.hs

@@ -18,6 +18,9 @@ module Stack.Docker
   ) where
 
 import qualified Crypto.Hash as Hash ( Digest, MD5, hash )
+import           Data.Aeson ( eitherDecode )
+import           Data.Aeson.Types ( FromJSON (..), (.!=) )
+import           Data.Aeson.WarningParser ( (.:), (.:?) )
 import qualified Data.ByteString.Char8 as BS
 import qualified Data.ByteString.Lazy as BL
 import qualified Data.ByteString.Lazy.Char8 as LBS
@@ -32,8 +35,6 @@ import qualified Data.Text.Encoding as T
 import           Data.Time ( UTCTime )
 import qualified Data.Version ( parseVersion )
 import           Distribution.Version ( mkVersion, mkVersion' )
-import           Pantry.Internal.AesonExtended
-                   ( FromJSON (..), (.:), (.:?), (.!=), eitherDecode )
 import           Path
                    ( (</>), dirname, filename, parent, parseAbsDir
                    , splitExtension

src/Stack/Lock.hs

@@ -8,17 +8,16 @@ module Stack.Lock
   , Locked (..)
   ) where
 
+import           Data.Aeson.Types ( FromJSON (..), ToJSON, Value, (.=), object )
+import           Data.Aeson.WarningParser
+                   ( WithJSONWarnings (..), (..:), jsonSubWarnings
+                   , jsonSubWarningsT, logJSONWarnings, withObjectWarnings
+                   )
 import           Data.ByteString.Builder ( byteString )
 import qualified Data.List.NonEmpty as NE
 import qualified Data.Map as Map
 import qualified Data.Text as T
 import qualified Data.Yaml as Yaml
-import           Pantry.Internal.AesonExtended
-                   ( FromJSON (..), ToJSON, Value, WithJSONWarnings (..), (.=)
-                   , (..:), jsonSubWarnings, jsonSubWarningsT, logJSONWarnings
-                   , object
-                   , withObjectWarnings
-                   )
 import           Path ( parent )
 import           Path.Extended ( addExtension )
 import           Path.IO ( doesFileExist )

src/Stack/Setup.hs

@@ -29,6 +29,9 @@ import           Conduit
 import           Control.Applicative ( empty )
 import           Crypto.Hash ( SHA1 (..), SHA256 (..) )
 import qualified Data.Aeson.KeyMap as KeyMap
+import           Data.Aeson.Types ( Value (..) )
+import           Data.Aeson.WarningParser
+                   ( WithJSONWarnings (..), logJSONWarnings )
 import qualified Data.Attoparsec.Text as P
 import qualified Data.ByteString as S
 import qualified Data.ByteString.Lazy as LBS
@@ -61,8 +64,6 @@ import           Network.HTTP.StackClient
                    , verifiedDownloadWithProgress, withResponse
                    )
 import           Network.HTTP.Simple ( getResponseHeader )
-import           Pantry.Internal.AesonExtended
-                   ( Value (..), WithJSONWarnings (..), logJSONWarnings )
 import           Path
                    ( (</>), addExtension, dirname, filename, parent, parseAbsDir
                    , parseAbsFile, parseRelDir, parseRelFile, toFilePath
@@ -921,9 +922,9 @@ warnUnsupportedCompiler ghcVersion =
           , style Url "https://github.com/commercialhaskell/stack/issues/648" <> "."
           ]
         pure True
-    | ghcVersion >= mkVersion [9, 5] -> do
+    | ghcVersion >= mkVersion [9, 7] -> do
         prettyWarnL
-          [ flow "Stack has not been tested with GHC versions above 9.6, and \
+          [ flow "Stack has not been tested with GHC versions 9.8 and above, and \
                  \using"
           , fromString (versionString ghcVersion) <> ","
           , flow "this may fail."
@@ -955,9 +956,9 @@ warnUnsupportedCompilerCabal cp didWarn = do
                  \resolver. Acceptable resolvers: lts-3.0/nightly-2015-05-05 \
                  \or later."
           ]
-    | cabalVersion >= mkVersion [3, 9] ->
+    | cabalVersion >= mkVersion [3, 11] ->
         prettyWarnL
-          [ flow "Stack has not been tested with Cabal versions above 3.10, \
+          [ flow "Stack has not been tested with Cabal versions 3.12 and above, \
                  \but version"
           , fromString (versionString cabalVersion)
           , flow "was found, this may fail."

src/Stack/Storage/Project.hs

@@ -30,7 +30,7 @@ import           Database.Persist.TH
                    ( mkMigrate, mkPersist, persistLowerCase, share
                    , sqlSettings
                    )
-import qualified Pantry.Internal as SQLite
+import           Pantry.SQLite ( initStorage, withStorage_ )
 import           Stack.Prelude
 import           Stack.Storage.Util
                    ( handleMigrationException, updateList, updateSet )
@@ -90,7 +90,7 @@ initProjectStorage ::
   -> (ProjectStorage -> RIO env a)
   -> RIO env a
 initProjectStorage fp f = handleMigrationException $
-  SQLite.initStorage "Stack" migrateAll fp $ f . ProjectStorage
+  initStorage "Stack" migrateAll fp $ f . ProjectStorage
 
 -- | Run an action in a database transaction
 withProjectStorage ::
@@ -99,7 +99,7 @@ withProjectStorage ::
   -> RIO env a
 withProjectStorage inner = do
   storage <- view (buildConfigL . to bcProjectStorage . to unProjectStorage)
-  SQLite.withStorage_ storage inner
+  withStorage_ storage inner
 
 -- | Key used to retrieve configuration or flag cache
 type ConfigCacheKey = Unique ConfigCacheParent

src/Stack/Storage/User.hs

@@ -39,7 +39,7 @@ import           Database.Persist.TH
                    )
 import           Distribution.Text ( simpleParse, display )
 import           Foreign.C.Types ( CTime (..) )
-import qualified Pantry.Internal as SQLite
+import           Pantry.SQLite ( initStorage, withStorage_ )
 import           Path ( (</>), mkRelFile, parseRelFile )
 import           Path.IO ( resolveFile', resolveDir' )
 import qualified RIO.FilePath as FP
@@ -159,7 +159,7 @@ initUserStorage ::
   -> (UserStorage -> RIO env a)
   -> RIO env a
 initUserStorage fp f = handleMigrationException $
-  SQLite.initStorage "Stack" migrateAll fp $ f . UserStorage
+  initStorage "Stack" migrateAll fp $ f . UserStorage
 
 -- | Run an action in a database transaction
 withUserStorage ::
@@ -168,7 +168,7 @@ withUserStorage ::
   -> RIO env a
 withUserStorage inner = do
   storage <- view (configL . to configUserStorage . to unUserStorage)
-  SQLite.withStorage_ storage inner
+  withStorage_ storage inner
 
 -- | Key used to retrieve the precompiled cache
 type PrecompiledCacheKey = Unique PrecompiledCacheParent

src/Stack/Types/AllowNewerDeps.hs

@@ -4,9 +4,9 @@ module Stack.Types.AllowNewerDeps
   ( AllowNewerDeps (..)
   ) where
 
+import           Data.Aeson.Types ( FromJSON (..) )
 import qualified Distribution.PackageDescription as C
 import           Generics.Deriving.Monoid ( mappenddefault, memptydefault )
-import           Pantry.Internal.AesonExtended ( FromJSON (..) )
 import           Stack.Prelude
 
 newtype AllowNewerDeps