Merge pull request #5953 from commercialhaskell/fix5952

Fix #5952 Bump Stack to `pantry-0.8.0`

Author: mpilgrem

package.yaml

@@ -96,7 +96,7 @@ dependencies:
 - network-uri
 - open-browser
 - optparse-applicative >= 0.17.0.0
-- pantry >= 0.7.1
+- pantry >= 0.8.0
 - path
 - path-io
 # In order for Cabal (the tool) to build Stack, it needs to be told of the

src/Stack/Ghci.hs

@@ -674,7 +674,8 @@ loadGhciPkgDesc buildOptsCLI name cabalfp target = do
     -- wouldn't have figured out the cabalfp already. In the future:
     -- retain that GenericPackageDescription in the relevant data
     -- structures to avoid reparsing.
-    (gpdio, _name, _cabalfp) <- loadCabalFilePath (parent cabalfp)
+    (gpdio, _name, _cabalfp) <-
+        loadCabalFilePath (Just stackProgName') (parent cabalfp)
     gpkgdesc <- liftIO $ gpdio YesPrintWarnings
 
     -- Source the package's *.buildinfo file created by configure if any. See

src/Stack/Hoogle.hs

@@ -118,7 +118,7 @@ hoogleCmd (args,setup,rebuild,startServer) =
                       restrictMinHoogleVersion muted (packageLocationIdent pli)
                 plm@(PLMutable _) -> do
                   T.pack . packageIdentifierString . package . packageDescription
-                      <$> loadCabalFile plm
+                      <$> loadCabalFile (Just stackProgName') plm
             Nothing -> do
               -- not muted because this should happen only once
               logWarn "No hoogle version was found, trying to install the latest version"

src/Stack/Init.hs

@@ -557,7 +557,7 @@ cabalPackagesCheck cabaldirs = do
     logInfo $ formatGroup relpaths
 
     packages <- for cabaldirs $ \dir -> do
-      (gpdio, _name, cabalfp) <- loadCabalFilePath dir
+      (gpdio, _name, cabalfp) <- loadCabalFilePath (Just stackProgName') dir
       gpd <- liftIO $ gpdio YesPrintWarnings
       pure (cabalfp, gpd)
 

src/Stack/Prelude.hs

@@ -16,6 +16,7 @@ module Stack.Prelude
   , promptPassword
   , promptBool
   , stackProgName
+  , stackProgName'
   , FirstTrue (..)
   , fromFirstTrue
   , defaultFirstTrue
@@ -246,6 +247,9 @@ promptBool txt = liftIO $ do
 stackProgName :: String
 stackProgName = "stack"
 
+stackProgName' :: Text
+stackProgName' = T.pack stackProgName
+
 -- | Like @First Bool@, but the default is @True@.
 newtype FirstTrue = FirstTrue { getFirstTrue :: Maybe Bool }
   deriving (Show, Eq, Ord)

src/Stack/SDist.hs

@@ -199,7 +199,8 @@ getCabalLbs :: HasEnvConfig env
             -> SourceMap
             -> RIO env (PackageIdentifier, L.ByteString)
 getCabalLbs pvpBounds mrev cabalfp sourceMap = do
-    (gpdio, _name, cabalfp') <- loadCabalFilePath (parent cabalfp)
+    (gpdio, _name, cabalfp') <-
+      loadCabalFilePath (Just stackProgName') (parent cabalfp)
     gpd <- liftIO $ gpdio NoPrintWarnings
     unless (cabalfp == cabalfp') $
       throwIO $ CabalFilePathsInconsistentBug cabalfp cabalfp'
@@ -334,7 +335,7 @@ gtraverseT f =
 readLocalPackage :: HasEnvConfig env => Path Abs Dir -> RIO env LocalPackage
 readLocalPackage pkgDir = do
     config  <- getDefaultPackageConfig
-    (gpdio, _, cabalfp) <- loadCabalFilePath pkgDir
+    (gpdio, _, cabalfp) <- loadCabalFilePath (Just stackProgName') pkgDir
     gpd <- liftIO $ gpdio YesPrintWarnings
     let package = resolvePackage config gpd
     pure LocalPackage
@@ -441,7 +442,7 @@ checkPackageInExtractedTarball
   => Path Abs Dir -- ^ Absolute path to tarball
   -> RIO env ()
 checkPackageInExtractedTarball pkgDir = do
-    (gpdio, name, _cabalfp) <- loadCabalFilePath pkgDir
+    (gpdio, name, _cabalfp) <- loadCabalFilePath (Just stackProgName') pkgDir
     gpd <- liftIO $ gpdio YesPrintWarnings
     config  <- getDefaultPackageConfig
     let PackageDescriptionPair pkgDesc _ = resolvePackageDescription config gpd