Bump version numbers to 3.15 (haskell#10309)

* Bump version numbers to 3.15 * Bump GHC 9.6.6 for workflows * Update index-state * Bump bootstrap boundaries * Regenerate bootstrap files
ffaf1 · Sep 9, 2024 · b5e7132 · b5e7132
1 parent b09b118
commit b5e7132
Show file tree

Hide file tree

Showing 22 changed files with 651 additions and 158 deletions.
diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml
@@ -30,7 +30,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        ghc: ["9.0.2", "9.2.8", "9.4.8", "9.6.4", "9.8.2"]
+        ghc: ["9.0.2", "9.2.8", "9.4.8", "9.6.6", "9.8.2"]
         include:
           - os: macos-latest
             ghc: "9.2.8"

diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -71,7 +71,7 @@ jobs:
           [
             "9.10.1",
             "9.8.2",
-            "9.6.4",
+            "9.6.6",
             "9.4.8",
             "9.2.8",
             "9.0.2",

diff --git a/Cabal-QuickCheck/Cabal-QuickCheck.cabal b/Cabal-QuickCheck/Cabal-QuickCheck.cabal
@@ -1,6 +1,6 @@
 cabal-version: 2.2
 name:          Cabal-QuickCheck
-version:       3.13.0.0
+version:       3.15.0.0
 synopsis:      QuickCheck instances for types in Cabal
 category:      Testing
 build-type:    Simple
@@ -14,8 +14,8 @@ library
   build-depends:
     , base
     , bytestring
-    , Cabal         ^>=3.13.0.0
-    , Cabal-syntax  ^>=3.13.0.0
+    , Cabal         ^>=3.15.0.0
+    , Cabal-syntax  ^>=3.15.0.0
     , QuickCheck    ^>=2.13.2 || ^>=2.14
 
   exposed-modules:

diff --git a/Cabal-described/Cabal-described.cabal b/Cabal-described/Cabal-described.cabal
@@ -1,6 +1,6 @@
 cabal-version: 2.2
 name:          Cabal-described
-version:       3.13.0.0
+version:       3.15.0.0
 synopsis:      Described functionality for types in Cabal
 category:      Testing, Parsec
 description:   Provides rere bindings
@@ -12,8 +12,8 @@ library
   ghc-options:      -Wall
   build-depends:
     , base
-    , Cabal             ^>=3.13.0.0
-    , Cabal-syntax      ^>=3.13.0.0
+    , Cabal             ^>=3.15.0.0
+    , Cabal-syntax      ^>=3.15.0.0
     , containers
     , pretty
     , QuickCheck

diff --git a/Cabal-hooks/Cabal-hooks.cabal b/Cabal-hooks/Cabal-hooks.cabal
@@ -27,8 +27,8 @@ library
   hs-source-dirs: src
 
   build-depends:
-    Cabal-syntax    >= 3.13      && < 3.15,
-    Cabal           >= 3.13      && < 3.15,
+    Cabal-syntax    >= 3.15      && < 3.17,
+    Cabal           >= 3.15      && < 3.17,
     base            >= 4.13      && < 5,
     containers      >= 0.5.0.0   && < 0.8,
     transformers    >= 0.5.6.0   && < 0.7

diff --git a/Cabal-syntax/Cabal-syntax.cabal b/Cabal-syntax/Cabal-syntax.cabal
@@ -1,6 +1,6 @@
 cabal-version: 2.2
 name:          Cabal-syntax
-version:       3.13.0.0
+version:       3.15.0.0
 copyright:     2003-2024, Cabal Development Team (see AUTHORS file)
 license:       BSD-3-Clause
 license-file:  LICENSE

diff --git a/Cabal-tree-diff/Cabal-tree-diff.cabal b/Cabal-tree-diff/Cabal-tree-diff.cabal
@@ -1,6 +1,6 @@
 cabal-version: 2.2
 name:          Cabal-tree-diff
-version:       3.13.0.0
+version:       3.15.0.0
 synopsis:      QuickCheck instances for types in Cabal
 category:      Testing
 description:   Provides tree-diff ToExpr instances for some types in Cabal
@@ -11,8 +11,8 @@ library
   ghc-options:      -Wall
   build-depends:
     , base
-    , Cabal-syntax  ^>=3.13.0.0
-    , Cabal         ^>=3.13.0.0
+    , Cabal-syntax  ^>=3.15.0.0
+    , Cabal         ^>=3.15.0.0
     , tree-diff     ^>=0.1 || ^>=0.2 || ^>=0.3
 
   exposed-modules:  Data.TreeDiff.Instances.Cabal

diff --git a/Cabal/Cabal.cabal b/Cabal/Cabal.cabal
@@ -1,6 +1,6 @@
 cabal-version: 3.0
 name:          Cabal
-version:       3.13.0.0
+version:       3.15.0.0
 copyright:     2003-2024, Cabal Development Team (see AUTHORS file)
 license:       BSD-3-Clause
 license-file:  LICENSE
@@ -34,7 +34,7 @@ library
   hs-source-dirs: src
 
   build-depends:
-    Cabal-syntax ^>= 3.13,
+    Cabal-syntax ^>= 3.15,
     array      >= 0.4.0.1  && < 0.6,
     base       >= 4.13     && < 5,
     bytestring >= 0.10.0.0 && < 0.13,

diff --git a/Cabal/Makefile b/Cabal/Makefile
@@ -1,4 +1,4 @@
-VERSION=3.13.0.0
+VERSION=3.15.0.0
 
 #KIND=devel
 KIND=rc

diff --git a/Makefile b/Makefile
@@ -226,7 +226,7 @@ bootstrap-json-%: phony
 	cd bootstrap && cabal run -v0 cabal-bootstrap-gen -- linux-$*.plan.json \
 		| python3 -m json.tool > linux-$*.json
 
-BOOTSTRAP_GHC_VERSIONS := 9.0.2 9.2.8 9.4.8 9.6.4 9.8.2
+BOOTSTRAP_GHC_VERSIONS := 9.0.2 9.2.8 9.4.8 9.6.6 9.8.2
 
 .PHONY: bootstrap-jsons
 bootstrap-jsons: $(BOOTSTRAP_GHC_VERSIONS:%=bootstrap-json-%)

diff --git a/bootstrap/cabal-bootstrap-gen.cabal b/bootstrap/cabal-bootstrap-gen.cabal
@@ -8,11 +8,11 @@ executable cabal-bootstrap-gen
   ghc-options:      -Wall
   main-is:          Main.hs
   build-depends:
-    , aeson                  ^>=1.5.2.0  || ^>=2.0.3.0 || ^>=2.1.0.0
-    , base                   ^>=4.12.0.0 || ^>=4.13.0.0 || ^>=4.14.0.0 || ^>=4.15.0.0 || ^>=4.16.0.0 || ^>=4.17.0.0 || ^>=4.18.0.0
+    , aeson                  ^>=1.5.2.0  || ^>=2.0.3.0 || ^>=2.1.0.0 || ^>=2.2.0.0
+    , base                   ^>=4.12.0.0 || ^>=4.13.0.0 || ^>=4.14.0.0 || ^>=4.15.0.0 || ^>=4.16.0.0 || ^>=4.17.0.0 || ^>=4.18.0.0 || ^>=4.19.0.0
     , bytestring             ^>=0.10.8.2 || ^>=0.11.0.0
-    , Cabal                  ^>=3.4.1.0  || ^>=3.6.3.0 || ^>=3.10.1.0 || ^>=3.12.1.0
-    , Cabal-syntax           ^>=3.8.1.0 || ^>=3.10.1.0 || ^>=3.12.1.0
+    , Cabal                  ^>=3.12.1.0 || ^>=3.14.0.0
+    , Cabal-syntax           ^>=3.12.1.0 || ^>=3.14.0.0
         -- For the release process, we need the last *two* Cabal-syntax
         -- versions here: one to make CI green when release Cabal-syntax is
         -- not yet on Hackage and we are bumping versions.  The second for

diff --git a/bootstrap/linux-9.0.2.json b/bootstrap/linux-9.0.2.json
@@ -172,17 +172,17 @@
             "revision": null,
             "source": "local",
             "src_sha256": null,
-            "version": "3.13.0.0"
+            "version": "3.15.0.0"
         },
         {
-            "cabal_sha256": "2a9393de33f18415fb8f4826957a87a94ffe8840ca8472a9b69dca6de45aca03",
+            "cabal_sha256": "684028fb5ac3d1c7657fe516f2a442d95a53ae2fcf6f6151544f3ed5289f6320",
             "component": "lib:process",
             "flags": [],
             "package": "process",
-            "revision": 1,
+            "revision": 0,
             "source": "hackage",
-            "src_sha256": "cefda221c3009fa2316b5cf148215cb340dad7eb8503f22e49e33722559df99a",
-            "version": "1.6.20.0"
+            "src_sha256": "a816655978c2527d8d7a6ebfd6f1ca79027f27ac4f2f28888f1581b2d558aea5",
+            "version": "1.6.23.0"
         },
         {
             "cabal_sha256": null,
@@ -192,7 +192,7 @@
             "revision": null,
             "source": "local",
             "src_sha256": null,
-            "version": "3.13.0.0"
+            "version": "3.15.0.0"
         },
         {
             "cabal_sha256": null,
@@ -217,16 +217,16 @@
             "version": "0.68.10"
         },
         {
-            "cabal_sha256": "25440c1bbd5772fdbbeec068f20138121131e1a56453db0adc113dcdf9044105",
+            "cabal_sha256": "17b834d2b75df8a8aef05de523280f613bb9c9aa9c31f269d5b90c1431a3749b",
             "component": "lib:network",
             "flags": [
                 "-devel"
             ],
             "package": "network",
             "revision": 0,
             "source": "hackage",
-            "src_sha256": "c45696744dc437d93a56871a3dd869965b7b50eda3fe3c1a90a35e2fbb9cb9ca",
-            "version": "3.2.0.0"
+            "src_sha256": "efb04947946f52cccba802c2a8fc2f4259f0bdfd0bce95094c84e71583647f0c",
+            "version": "3.2.2.0"
         },
         {
             "cabal_sha256": "129a59ba3ccfcd06192fd6da899e2711ae276a466915a047bd6727e4a0321d2e",
@@ -274,7 +274,7 @@
             "version": "0.9.2"
         },
         {
-            "cabal_sha256": "82503a1ef0a625c210e118f2785c4138f8502aacbbfd4e5d987f6baffbb87115",
+            "cabal_sha256": "573f3ab242f75465a0d67ce9d84202650a1606575e6dbd6d31ffcf4767a9a379",
             "component": "lib:hashable",
             "flags": [
                 "-arch-native",
@@ -284,17 +284,17 @@
             "package": "hashable",
             "revision": 0,
             "source": "hackage",
-            "src_sha256": "34652a7a1d2fc9e3d764b150bd35bcd2220761c1d4c6b446b0cfac5ad5b778cb",
-            "version": "1.4.6.0"
+            "src_sha256": "3baee4c9027a08830d148ec524cbc0471de645e1e8426d46780ef2758df0e8da",
+            "version": "1.4.7.0"
         },
         {
-            "cabal_sha256": "9d5d9e605f52958d099e13a8b8f30ee56cb137c9192996245e3c533adb682cf8",
+            "cabal_sha256": "cf9e6afba8e01830ca0d32a12b98d481cf389688762c80d1870a1db2061ebf35",
             "component": "lib:async",
             "flags": [
                 "-bench"
             ],
             "package": "async",
-            "revision": 1,
+            "revision": 2,
             "source": "hackage",
             "src_sha256": "1818473ebab9212afad2ed76297aefde5fae8b5d4404daf36939aece6a8f16f7",
             "version": "2.2.5"
@@ -362,17 +362,17 @@
             "revision": null,
             "source": "local",
             "src_sha256": null,
-            "version": "3.13.0.0"
+            "version": "3.15.0.0"
         },
         {
-            "cabal_sha256": "200d756a7b3bab7ca2bac6eb50ed8252f26de77ac8def490a3ad743f2933acbd",
+            "cabal_sha256": "acb64f2af52d81b0bb92c266f11d43def726a7a7b74a2c23d219e160b54edec7",
             "component": "lib:cryptohash-sha256",
             "flags": [
                 "-exe",
                 "+use-cbits"
             ],
             "package": "cryptohash-sha256",
-            "revision": 4,
+            "revision": 5,
             "source": "hackage",
             "src_sha256": "73a7dc7163871a80837495039a099967b11f5c4fe70a118277842f7a713c6bf6",
             "version": "0.11.102.1"
@@ -417,58 +417,58 @@
             "version": "0.1.2"
         },
         {
-            "cabal_sha256": "4d4186bb8d711435765253c7dc076c44a1d52896300689507ba135706ab35866",
+            "cabal_sha256": "7699e7ae9bf74d056a62f384ceef8dfb2aa660f3f7c8016e9703f3b995e5e030",
             "component": "lib:os-string",
             "flags": [],
             "package": "os-string",
             "revision": 0,
             "source": "hackage",
-            "src_sha256": "f6b388b9f9002622901d3f71437b98f95f54fbf7fe10490d319cb801c2a061ea",
-            "version": "2.0.3"
+            "src_sha256": "22fcc7d5fc66676b5dfc57b714d2caf93cce2d5a79d242168352f9eb0fe2f18a",
+            "version": "2.0.6"
         },
         {
-            "cabal_sha256": "b853b4296cb23386feda17dc0d9065af6709d22d684ec734aab65403d59ed547",
+            "cabal_sha256": "e9f151d9999be8953443e730524b2792e9c0a4fb5b1463097fa1a8230870fd8a",
             "component": "lib:tar-internal",
             "flags": [],
             "package": "tar",
-            "revision": 0,
+            "revision": 1,
             "source": "hackage",
             "src_sha256": "50bb660feec8a524416d6934251b996eaa7e39d49ae107ad505ab700d43f6814",
             "version": "0.6.3.0"
         },
         {
-            "cabal_sha256": "b853b4296cb23386feda17dc0d9065af6709d22d684ec734aab65403d59ed547",
+            "cabal_sha256": "e9f151d9999be8953443e730524b2792e9c0a4fb5b1463097fa1a8230870fd8a",
             "component": "lib:tar",
             "flags": [],
             "package": "tar",
-            "revision": 0,
+            "revision": 1,
             "source": "hackage",
             "src_sha256": "50bb660feec8a524416d6934251b996eaa7e39d49ae107ad505ab700d43f6814",
             "version": "0.6.3.0"
         },
         {
-            "cabal_sha256": "d6696f2b55ab4a50b8de57947abca308604eb7cf8287c40bf69cfa26133e24d3",
+            "cabal_sha256": "bae1c5a6092d65c5e763246f91e04fef3f43e37cb055130725c9a973c88a250f",
             "component": "lib:zlib",
             "flags": [
                 "-bundled-c-zlib",
                 "+non-blocking-ffi",
                 "+pkg-config"
             ],
             "package": "zlib",
-            "revision": 0,
+            "revision": 1,
             "source": "hackage",
             "src_sha256": "6edd38b6b81df8d274952aa85affa6968ae86b2231e1d429ce8bc9083e6a55bc",
             "version": "0.7.1.0"
         },
         {
-            "cabal_sha256": "8ff70524314f9ad706f8e5051d7150ee44cb82170147879b245bdab279604b16",
+            "cabal_sha256": "a7311a70ce2cc820ee430c389f57f82a082f148230b37526c34eac72b7b3ff34",
             "component": "lib:hackage-security",
             "flags": [
                 "+cabal-syntax",
                 "+lukko"
             ],
             "package": "hackage-security",
-            "revision": 1,
+            "revision": 4,
             "source": "hackage",
             "src_sha256": "2e4261576b3e11b9f5175392947f56a638cc1a3584b8acbb962b809d7c69db69",
             "version": "0.6.2.6"
@@ -546,7 +546,7 @@
             "revision": null,
             "source": "local",
             "src_sha256": null,
-            "version": "3.13.0.0"
+            "version": "3.15.0.0"
         },
         {
             "cabal_sha256": null,
@@ -559,7 +559,7 @@
             "revision": null,
             "source": "local",
             "src_sha256": null,
-            "version": "3.13.0.0"
+            "version": "3.15.0.0"
         },
         {
             "cabal_sha256": "e4be4a206f5ab6ddb5ae4fbb39101529196e20af5670c5d33326fea6eff886fd",