Merge branch 'master' into rc/v3.1

commercialhaskell · Jul 28, 2024 · 8127279 · 8127279
2 parents 64cf95a + 4cbd5e1
commit 8127279
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 36 deletions.
diff --git a/package.yaml b/package.yaml
@@ -58,7 +58,7 @@ ghc-options:
 - -optP-Wno-nonportable-include-path
 dependencies:
 - base >= 4.16.0.0 && < 5
-- Cabal >= 3.8.1.0
+- Cabal >= 3.8.1.0 && < 3.12
 - aeson >= 2.0.3.0
 - aeson-warning-parser >= 0.1.1
 - ansi-terminal >= 1.0.2

diff --git a/stack-ghc-9.10.1.yaml b/stack-ghc-9.10.1.yaml
@@ -4,7 +4,7 @@
 # Currently, Stack cannot be built with GHC 9.10.1 because Cabal-3.12.0.0 has
 # changed the type of Distribution.PackageDescription.Check.checkPackage.
 
-snapshot: nightly-2024-07-05 # GHC 9.8.2
+snapshot: nightly-2024-07-28 # GHC 9.8.2
 compiler: ghc-9.10.1
 
 extra-deps:
@@ -14,8 +14,6 @@ extra-deps:
 - directory-1.3.8.3@rev:3
 - filepath-1.5.2.0
 - ghc-boot-9.10.1
-# nightly-2024-07-05 provides hpack-0.36.1
-- hpack-0.37.0@sha256:b7c91b0416a55c134172a9fd9a02f3815ba68c4b92cca4e320c36906d5e970e0,5187
 - hpc-0.7.0.1@rev:1
 - http-api-data-0.6.1
 - process-1.6.19.0@rev:1

diff --git a/stack-ghc-9.10.1.yaml.lock b/stack-ghc-9.10.1.yaml.lock
@@ -74,23 +74,23 @@ packages:
       size: 7264
   original:
     hackage: time-1.12.2
+- completed:
+    hackage: unix-2.8.5.1@sha256:3f702a252a313a7bcb56e3908a14e7f9f1b40e41b7bdc8ae8a9605a1a8686f06,9808
+    pantry-tree:
+      sha256: b961320db69795a16c4ef4eebb0a3e7ddbbbe506fa1e22dde95ee8d8501bfbe5
+      size: 5821
+  original:
+    hackage: unix-2.8.5.1
 - completed:
     hackage: uuid-types-1.0.6@sha256:7cb34342914f1be68dbdf2dec35c27d360160848ce5a79ad2c1a990fefd1d855,2582
     pantry-tree:
       sha256: 73e7029b6faeb88f5395e72ed38fcef197b9077c38f9f8f34039f209e75d4806
       size: 480
   original:
     hackage: uuid-types-1.0.6
-- completed:
-    hackage: hpack-0.37.0@sha256:b7c91b0416a55c134172a9fd9a02f3815ba68c4b92cca4e320c36906d5e970e0,5187
-    pantry-tree:
-      sha256: de5e75f3757d6957e5fb0032a465cbd1016d051370ec96a7e4f423bf8bafd095
-      size: 3742
-  original:
-    hackage: hpack-0.37.0@sha256:b7c91b0416a55c134172a9fd9a02f3815ba68c4b92cca4e320c36906d5e970e0,5187
 snapshots:
 - completed:
-    sha256: 5534407e1313da2872e0d76a8fe893a1f60b51366672249704cc17b1f3cc65cc
-    size: 651868
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2024/7/5.yaml
-  original: nightly-2024-07-05
+    sha256: c6e4cd173fb499ea2865dd89ef283f85e7c306972b5039a4f96c6371e37c2118
+    size: 656842
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2024/7/28.yaml
+  original: nightly-2024-07-28
diff --git a/stack-ghc-9.8.2.yaml b/stack-ghc-9.8.2.yaml
@@ -1,11 +1,7 @@
 # This is an experimental project-level configuration, to see if Stack can be
 # built with GHC 9.8.2.
 
-snapshot: nightly-2024-07-05 # GHC 9.8.2
-
-extra-deps:
-# nightly-2024-07-05 provides hpack-0.36.1
-- hpack-0.37.0@sha256:b7c91b0416a55c134172a9fd9a02f3815ba68c4b92cca4e320c36906d5e970e0,5187
+snapshot: nightly-2024-07-28 # GHC 9.8.2
 
 docker:
   enable: false

diff --git a/stack-ghc-9.8.2.yaml.lock b/stack-ghc-9.8.2.yaml.lock
@@ -3,17 +3,10 @@
 # For more information, please see the documentation at:
 #   https://docs.haskellstack.org/en/stable/lock_files
 
-packages:
-- completed:
-    hackage: hpack-0.37.0@sha256:b7c91b0416a55c134172a9fd9a02f3815ba68c4b92cca4e320c36906d5e970e0,5187
-    pantry-tree:
-      sha256: de5e75f3757d6957e5fb0032a465cbd1016d051370ec96a7e4f423bf8bafd095
-      size: 3742
-  original:
-    hackage: hpack-0.37.0@sha256:b7c91b0416a55c134172a9fd9a02f3815ba68c4b92cca4e320c36906d5e970e0,5187
+packages: []
 snapshots:
 - completed:
-    sha256: 5534407e1313da2872e0d76a8fe893a1f60b51366672249704cc17b1f3cc65cc
-    size: 651868
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2024/7/5.yaml
-  original: nightly-2024-07-05
+    sha256: c6e4cd173fb499ea2865dd89ef283f85e7c306972b5039a4f96c6371e37c2118
+    size: 656842
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2024/7/28.yaml
+  original: nightly-2024-07-28
diff --git a/stack.cabal b/stack.cabal
@@ -394,7 +394,7 @@ library
       src
   ghc-options: -fwrite-ide-info -hiedir=.hie -Wall -Wmissing-export-lists -optP-Wno-nonportable-include-path -Widentities
   build-depends:
-      Cabal >=3.8.1.0
+      Cabal >=3.8.1.0 && <3.12
     , aeson >=2.0.3.0
     , aeson-warning-parser >=0.1.1
     , ansi-terminal >=1.0.2
@@ -517,7 +517,7 @@ executable stack
       app
   ghc-options: -fwrite-ide-info -hiedir=.hie -Wall -Wmissing-export-lists -optP-Wno-nonportable-include-path -threaded -rtsopts
   build-depends:
-      Cabal >=3.8.1.0
+      Cabal >=3.8.1.0 && <3.12
     , aeson >=2.0.3.0
     , aeson-warning-parser >=0.1.1
     , ansi-terminal >=1.0.2
@@ -619,7 +619,7 @@ executable stack-integration-test
       tests/integration/lib
   ghc-options: -fwrite-ide-info -hiedir=.hie -Wall -Wmissing-export-lists -optP-Wno-nonportable-include-path -threaded -rtsopts -with-rtsopts=-N
   build-depends:
-      Cabal >=3.8.1.0
+      Cabal >=3.8.1.0 && <3.12
     , aeson >=2.0.3.0
     , aeson-warning-parser >=0.1.1
     , ansi-terminal >=1.0.2
@@ -736,7 +736,7 @@ test-suite stack-unit-test
       tests/unit
   ghc-options: -fwrite-ide-info -hiedir=.hie -Wall -Wmissing-export-lists -optP-Wno-nonportable-include-path -threaded
   build-depends:
-      Cabal >=3.8.1.0
+      Cabal >=3.8.1.0 && <3.12
     , QuickCheck
     , aeson >=2.0.3.0
     , aeson-warning-parser >=0.1.1