Fix Hpack #530

For the context to this pull request, see see [Hpack issue #530](sol/hpack#530), the [Hpack PR #531](sol/hpack#531) and the alternative [Hpack PR #535](sol/hpack#535) (on which this PR builds). See also [Pantry PR #74](commercialhaskell/pantry#74) (on which this PR builds).

package.yaml

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

src/Stack/Constants.hs

@@ -132,7 +132,7 @@ import           Data.Char ( toUpper )
 import           Data.FileEmbed ( embedFile, makeRelativeToProject )
 import qualified Data.Set as Set
 import           Distribution.Package ( mkPackageName )
-import qualified Hpack.Config as Hpack
+import           Hpack.Config ( packageConfig )
 import qualified Language.Haskell.TH.Syntax as TH ( runIO, lift )
 import           Path as FL
 import           Stack.Prelude
@@ -342,7 +342,7 @@ relFileSetupLhs :: Path Rel File
 relFileSetupLhs = $(mkRelFile "Setup.lhs")
 
 relFileHpackPackageConfig :: Path Rel File
-relFileHpackPackageConfig = $(mkRelFile Hpack.packageConfig)
+relFileHpackPackageConfig = $(mkRelFile packageConfig)
 
 relDirGlobalAutogen :: Path Rel Dir
 relDirGlobalAutogen = $(mkRelDir "global-autogen")

stack.cabal

@@ -1,6 +1,6 @@
 cabal-version: 2.0
 
--- This file has been generated from package.yaml by hpack version 0.35.0.
+-- This file has been generated from package.yaml by hpack version 0.35.1.
 --
 -- see: https://github.com/sol/hpack
 
@@ -313,7 +313,7 @@ library
     , network-uri
     , open-browser
     , optparse-applicative >=0.17.0.0
-    , pantry >=0.8.0
+    , pantry >=0.8.1
     , path
     , path-io
     , persistent >=2.13.3.5 && <2.14
@@ -437,7 +437,7 @@ executable stack
     , network-uri
     , open-browser
     , optparse-applicative >=0.17.0.0
-    , pantry >=0.8.0
+    , pantry >=0.8.1
     , path
     , path-io
     , persistent >=2.13.3.5 && <2.14
@@ -562,7 +562,7 @@ executable stack-integration-test
     , open-browser
     , optparse-applicative >=0.17.0.0
     , optparse-generic
-    , pantry >=0.8.0
+    , pantry >=0.8.1
     , path
     , path-io
     , persistent >=2.13.3.5 && <2.14
@@ -692,7 +692,7 @@ test-suite stack-test
     , network-uri
     , open-browser
     , optparse-applicative >=0.17.0.0
-    , pantry >=0.8.0
+    , pantry >=0.8.1
     , path
     , path-io
     , persistent >=2.13.3.5 && <2.14

stack.yaml

@@ -5,7 +5,8 @@ packages:
 - .
 
 extra-deps:
-- pantry-0.8.0@sha256:351a9103c0b1dd78f6b8f243ca4fc6a6952d5ba00f72032b831e5ee0e61dce0f,4099
+- hpack-0.35.1
+- pantry-0.8.1
 - rio-prettyprint-0.1.4.0@sha256:1f8eb3ead0ef33d3736d53e1de5e9b2c91a0c207cdca23321bd74c401e85f23a,1301
 - fsnotify-0.4.1.0@sha256:44540beabea36aeeef930aa4d5f28091d431904bc9923b6ac4d358831c651235,2854
 

stack.yaml.lock

@@ -5,12 +5,19 @@
 
 packages:
 - completed:
-    hackage: pantry-0.8.0@sha256:351a9103c0b1dd78f6b8f243ca4fc6a6952d5ba00f72032b831e5ee0e61dce0f,4099
+    hackage: hpack-0.35.1@sha256:ef816234cbc7b52b0a6c55f7e904b6bc5292b8dd8f2d81ffcbcbc69ab80d75e5,4762
     pantry-tree:
-      sha256: a5f0a90f33a78e3c92f3c13335f870fe83f20c45296cda9c279042b7c451a310
+      sha256: 514f0311eff442ab83ef3c2db456857f360ea173c17df133e575f50915e02da0
+      size: 3675
+  original:
+    hackage: hpack-0.35.1
+- completed:
+    hackage: pantry-0.8.1@sha256:196111414d2489499fda6213deebcb865bc12285023d5af9bd273bf27cdb185d,4099
+    pantry-tree:
+      sha256: f7032e124bda7deb3b70b0fc308e9bbe9ba6c81f79b88a1cd0b5b7932f4ab14a
       size: 2524
   original:
-    hackage: pantry-0.8.0@sha256:351a9103c0b1dd78f6b8f243ca4fc6a6952d5ba00f72032b831e5ee0e61dce0f,4099
+    hackage: pantry-0.8.1
 - completed:
     hackage: rio-prettyprint-0.1.4.0@sha256:1f8eb3ead0ef33d3736d53e1de5e9b2c91a0c207cdca23321bd74c401e85f23a,1301
     pantry-tree: