Merge pull request #7571 from fendor/bump-cabal-version-3.7

Bump Cabal version to 3.7 for development
haskell · Aug 25, 2021 · 6f932b7 · 6f932b7
2 parents bea894a + 838927a
commit 6f932b7
Show file tree

Hide file tree

Showing 16 changed files with 47 additions and 47 deletions.
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -63,7 +63,7 @@ jobs:
           cabal v2-run cabal-install:unit-tests -- --pattern "! (/FileMonitor/ || /VCS/ || /Get/)"
       - name: cabal-tests
         # Using only one job, -j1, to fail less.
-        run: cabal v2-run cabal-testsuite:cabal-tests -- -j1 --with-cabal=dist-newstyle\build\x86_64-windows\ghc-8.6.5\cabal-install-3.6.0.0\x\cabal\build\cabal\cabal.exe
+        run: cabal v2-run cabal-testsuite:cabal-tests -- -j1 --with-cabal=dist-newstyle\build\x86_64-windows\ghc-8.6.5\cabal-install-3.7.0.0\x\cabal\build\cabal\cabal.exe
   test-windows-8_10_4:
     name: test ghc-8.10.4
     runs-on: windows-latest
@@ -111,4 +111,4 @@ jobs:
           cabal v2-run cabal-install:unit-tests -- --pattern "! (/FileMonitor/ || /VCS/ || /Get/)"
       - name: cabal-tests
         # Using only one job, -j1, to fail less.
-        run: cabal v2-run cabal-testsuite:cabal-tests -- -j1 --with-cabal=dist-newstyle\build\x86_64-windows\ghc-8.10.4\cabal-install-3.6.0.0\x\cabal\build\cabal\cabal.exe
+        run: cabal v2-run cabal-testsuite:cabal-tests -- -j1 --with-cabal=dist-newstyle\build\x86_64-windows\ghc-8.10.4\cabal-install-3.7.0.0\x\cabal\build\cabal\cabal.exe
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.6.0.0
+version:       3.7.0.0
 synopsis:      QuickCheck instances for types in Cabal
 category:      Testing
 description:
@@ -13,7 +13,7 @@ library
   build-depends:
     , base
     , bytestring
-    , Cabal       ^>=3.6.0.0
+    , Cabal       ^>=3.7.0.0
     , QuickCheck  ^>=2.13.2 || ^>=2.14
 
   if !impl(ghc >= 8.0)

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.6.0.0
+version:       3.7.0.0
 synopsis:      Described functionality for types in Cabal
 category:      Testing, Parsec
 description:   Provides rere bindings
@@ -11,7 +11,7 @@ library
   ghc-options:      -Wall
   build-depends:
     , base
-    , Cabal             ^>=3.6.0.0
+    , Cabal             ^>=3.7.0.0
     , containers
     , pretty
     , QuickCheck

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.6.0.0
+version:       3.7.0.0
 synopsis:      QuickCheck instances for types in Cabal
 category:      Testing
 description:   Provides tree-diff ToExpr instances for some types in Cabal
@@ -11,7 +11,7 @@ library
   ghc-options:      -Wall
   build-depends:
     , base
-    , Cabal      ^>=3.6.0.0
+    , Cabal      ^>=3.7.0.0
     , tree-diff  ^>=0.1 || ^>=0.2
 
   exposed-modules:  Data.TreeDiff.Instances.Cabal

diff --git a/Cabal/Cabal.cabal b/Cabal/Cabal.cabal
@@ -1,6 +1,6 @@
 cabal-version: >=1.10
 name:          Cabal
-version:       3.6.0.0
+version:       3.7.0.0
 copyright:     2003-2021, Cabal Development Team (see AUTHORS file)
 license:       BSD3
 license-file:  LICENSE

diff --git a/appveyor.yml b/appveyor.yml
@@ -54,7 +54,7 @@ build_script:
   - cabal %CABOPTS% v2-test Cabal-tests
   - appveyor-retry cabal %CABOPTS% v2-build exe:cabal exe:cabal-tests --only-dependencies
   - cabal %CABOPTS% v2-build exe:cabal
-  - cabal %CABOPTS% v2-run cabal-testsuite:cabal-tests -- -j3 --with-cabal=dist-newstyle\build\x86_64-windows\ghc-8.6.5\cabal-install-3.6.0.0\x\cabal\build\cabal\cabal.exe
+  - cabal %CABOPTS% v2-run cabal-testsuite:cabal-tests -- -j3 --with-cabal=dist-newstyle\build\x86_64-windows\ghc-8.6.5\cabal-install-3.7.0.0\x\cabal\build\cabal\cabal.exe
   - appveyor-retry cabal %CABOPTS% v2-build cabal-install:tests --only-dependencies
   - cd cabal-install
   - cabal %CABOPTS% v2-run cabal-install:memory-usage-tests

diff --git a/bootstrap/linux-8.10.4.json b/bootstrap/linux-8.10.4.json
@@ -3,7 +3,7 @@
         {
             "source": "local",
             "package": "Cabal",
-            "version": "3.6.0.0",
+            "version": "3.7.0.0",
             "flags": [
                 "-bundled-binary-generic"
             ],
@@ -90,10 +90,10 @@
         {
             "source": "hackage",
             "package": "base64-bytestring",
-            "version": "1.2.0.1",
+            "version": "1.2.1.0",
             "flags": [],
-            "cabal_sha256": "f4f998235fc0825ab636ca9241b827de5805b336625eb1c7822f1798a238b6ac",
-            "src_sha256": "af09b17d072eb1391d91e30b4186dd1797330647ef79268ecd7fcce8f5afc638",
+            "cabal_sha256": "50ec0e229255d4c45cbdd568da011311b8887f304b931564886016f4984334d8",
+            "src_sha256": "fbf8ed30edde271eb605352021431d8f1b055f95a56af31fe2eacf6bdfdc49c9",
             "revision": 0
         },
         {
@@ -128,7 +128,7 @@
         {
             "source": "local",
             "package": "cabal-install-solver",
-            "version": "3.6.0.0",
+            "version": "3.7.0.0",
             "flags": [
                 "-debug-conflict-sets",
                 "-debug-expensive-assertions",
@@ -231,9 +231,9 @@
             "package": "regex-base",
             "version": "0.94.0.1",
             "flags": [],
-            "cabal_sha256": "6e3546b73cd5489201d481aa645a531f2c61aa317984e31c5f379ac0bcbfbfad",
+            "cabal_sha256": "35ff2d13c0e3ac364469c19e4c7c8775f5148977d8fcef58a424df0a10a53fa7",
             "src_sha256": "71b1d96fff201f31fe8cd4532f056aca03a21cd486890256dc3007dd73adedd9",
-            "revision": 0
+            "revision": 1
         },
         {
             "source": "hackage",
@@ -258,7 +258,7 @@
         {
             "source": "local",
             "package": "cabal-install",
-            "version": "3.6.0.0",
+            "version": "3.7.0.0",
             "flags": [
                 "+lukko",
                 "+native-dns"
@@ -270,7 +270,7 @@
         {
             "source": "local",
             "package": "cabal-install",
-            "version": "3.6.0.0",
+            "version": "3.7.0.0",
             "flags": [
                 "+lukko",
                 "+native-dns"

diff --git a/bootstrap/linux-8.10.4.plan.json b/bootstrap/linux-8.10.4.plan.json
diff --git a/bootstrap/linux-8.6.5.json b/bootstrap/linux-8.6.5.json
@@ -3,7 +3,7 @@
         {
             "source": "local",
             "package": "Cabal",
-            "version": "3.6.0.0",
+            "version": "3.7.0.0",
             "flags": [
                 "-bundled-binary-generic"
             ],
@@ -90,10 +90,10 @@
         {
             "source": "hackage",
             "package": "base64-bytestring",
-            "version": "1.2.0.1",
+            "version": "1.2.1.0",
             "flags": [],
-            "cabal_sha256": "f4f998235fc0825ab636ca9241b827de5805b336625eb1c7822f1798a238b6ac",
-            "src_sha256": "af09b17d072eb1391d91e30b4186dd1797330647ef79268ecd7fcce8f5afc638",
+            "cabal_sha256": "50ec0e229255d4c45cbdd568da011311b8887f304b931564886016f4984334d8",
+            "src_sha256": "fbf8ed30edde271eb605352021431d8f1b055f95a56af31fe2eacf6bdfdc49c9",
             "revision": 0
         },
         {
@@ -128,7 +128,7 @@
         {
             "source": "local",
             "package": "cabal-install-solver",
-            "version": "3.6.0.0",
+            "version": "3.7.0.0",
             "flags": [
                 "-debug-conflict-sets",
                 "-debug-expensive-assertions",
@@ -242,9 +242,9 @@
             "package": "regex-base",
             "version": "0.94.0.1",
             "flags": [],
-            "cabal_sha256": "6e3546b73cd5489201d481aa645a531f2c61aa317984e31c5f379ac0bcbfbfad",
+            "cabal_sha256": "35ff2d13c0e3ac364469c19e4c7c8775f5148977d8fcef58a424df0a10a53fa7",
             "src_sha256": "71b1d96fff201f31fe8cd4532f056aca03a21cd486890256dc3007dd73adedd9",
-            "revision": 0
+            "revision": 1
         },
         {
             "source": "hackage",
@@ -269,7 +269,7 @@
         {
             "source": "local",
             "package": "cabal-install",
-            "version": "3.6.0.0",
+            "version": "3.7.0.0",
             "flags": [
                 "+lukko",
                 "+native-dns"
@@ -281,7 +281,7 @@
         {
             "source": "local",
             "package": "cabal-install",
-            "version": "3.6.0.0",
+            "version": "3.7.0.0",
             "flags": [
                 "+lukko",
                 "+native-dns"

diff --git a/bootstrap/linux-8.6.5.plan.json b/bootstrap/linux-8.6.5.plan.json
diff --git a/bootstrap/linux-8.8.4.json b/bootstrap/linux-8.8.4.json
@@ -3,7 +3,7 @@
         {
             "source": "local",
             "package": "Cabal",
-            "version": "3.6.0.0",
+            "version": "3.7.0.0",
             "flags": [
                 "-bundled-binary-generic"
             ],
@@ -90,10 +90,10 @@
         {
             "source": "hackage",
             "package": "base64-bytestring",
-            "version": "1.2.0.1",
+            "version": "1.2.1.0",
             "flags": [],
-            "cabal_sha256": "f4f998235fc0825ab636ca9241b827de5805b336625eb1c7822f1798a238b6ac",
-            "src_sha256": "af09b17d072eb1391d91e30b4186dd1797330647ef79268ecd7fcce8f5afc638",
+            "cabal_sha256": "50ec0e229255d4c45cbdd568da011311b8887f304b931564886016f4984334d8",
+            "src_sha256": "fbf8ed30edde271eb605352021431d8f1b055f95a56af31fe2eacf6bdfdc49c9",
             "revision": 0
         },
         {
@@ -128,7 +128,7 @@
         {
             "source": "local",
             "package": "cabal-install-solver",
-            "version": "3.6.0.0",
+            "version": "3.7.0.0",
             "flags": [
                 "-debug-conflict-sets",
                 "-debug-expensive-assertions",
@@ -242,9 +242,9 @@
             "package": "regex-base",
             "version": "0.94.0.1",
             "flags": [],
-            "cabal_sha256": "6e3546b73cd5489201d481aa645a531f2c61aa317984e31c5f379ac0bcbfbfad",
+            "cabal_sha256": "35ff2d13c0e3ac364469c19e4c7c8775f5148977d8fcef58a424df0a10a53fa7",
             "src_sha256": "71b1d96fff201f31fe8cd4532f056aca03a21cd486890256dc3007dd73adedd9",
-            "revision": 0
+            "revision": 1
         },
         {
             "source": "hackage",
@@ -269,7 +269,7 @@
         {
             "source": "local",
             "package": "cabal-install",
-            "version": "3.6.0.0",
+            "version": "3.7.0.0",
             "flags": [
                 "+lukko",
                 "+native-dns"
@@ -281,7 +281,7 @@
         {
             "source": "local",
             "package": "cabal-install",
-            "version": "3.6.0.0",
+            "version": "3.7.0.0",
             "flags": [
                 "+lukko",
                 "+native-dns"

diff --git a/bootstrap/linux-8.8.4.plan.json b/bootstrap/linux-8.8.4.plan.json
diff --git a/cabal-install-solver/cabal-install-solver.cabal b/cabal-install-solver/cabal-install-solver.cabal
@@ -1,6 +1,6 @@
 cabal-version: 2.2
 name:          cabal-install-solver
-version:       3.6.0.0
+version:       3.7.0.0
 synopsis:      The command-line interface for Cabal and Hackage.
 description:
   The solver component used in cabal-install command-line program
@@ -106,7 +106,7 @@ library
     , base          >=4.10     && <4.15
     , binary        >=0.7.3    && <0.9
     , bytestring    >=0.10.6.0 && <0.12
-    , Cabal         ^>=3.6
+    , Cabal         ^>=3.7
     , containers    >=0.5.6.2  && <0.7
     , edit-distance ^>= 0.2.2
     , filepath      ^>=1.4.0.0

diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal
@@ -1,7 +1,7 @@
 Cabal-Version:      2.2
 
 Name:               cabal-install
-Version:            3.6.0.0
+Version:            3.7.0.0
 Synopsis:           The command-line interface for Cabal and Hackage.
 Description:
     The \'cabal\' command-line program simplifies the process of managing
@@ -49,10 +49,10 @@ common base-dep
     build-depends: base >=4.10 && <4.16
 
 common cabal-dep
-    build-depends: Cabal ^>=3.6
+    build-depends: Cabal ^>=3.7
 
 common cabal-install-solver-dep
-    build-depends: cabal-install-solver ^>=3.6
+    build-depends: cabal-install-solver ^>=3.7
 
 library
     import: warnings, base-dep, cabal-dep, cabal-install-solver-dep

diff --git a/cabal-testsuite/cabal-testsuite.cabal b/cabal-testsuite/cabal-testsuite.cabal
@@ -28,7 +28,7 @@ common shared
   build-depends:
     , base >= 4.6 && <4.16
     -- this needs to match the in-tree lib:Cabal version
-    , Cabal == 3.6.0.0
+    , Cabal == 3.7.0.0
 
   ghc-options: -Wall -fwarn-tabs -fwarn-incomplete-uni-patterns
 

diff --git a/templates/ci-windows.template.yml b/templates/ci-windows.template.yml
@@ -70,5 +70,5 @@ jobs:
           cabal v2-run cabal-install:unit-tests -- --pattern "! (/FileMonitor/ || /VCS/ || /Get/)"
       - name: cabal-tests
         # Using only one job, -j1, to fail less.
-        run: cabal v2-run cabal-testsuite:cabal-tests -- -j1 --with-cabal=dist-newstyle\build\x86_64-windows\ghc-{{ job.version }}\cabal-install-3.6.0.0\x\cabal\build\cabal\cabal.exe
+        run: cabal v2-run cabal-testsuite:cabal-tests -- -j1 --with-cabal=dist-newstyle\build\x86_64-windows\ghc-{{ job.version }}\cabal-install-3.7.0.0\x\cabal\build\cabal\cabal.exe
 {% endfor %}