From 1f90cfd51d1a1d0ef6d100c0506cb8ec3fc142cb Mon Sep 17 00:00:00 2001 From: Mikolaj Konarski Date: Mon, 13 Mar 2023 23:28:30 +0100 Subject: [PATCH] Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844) * Bump versions on master branch to 3.11 * Try to fix CI by setting cabal-testsuite stable Cabal version to 3.8 back again * Update bootstrap configuration * Work around bounds problem with cabal-install-parsers * Update bootstrap files * Try to update the Custom setup cabal to 3.10 according to Artem's suggestion * CI: cabal-3.10 compat: actions/cache has to go before cabal update * Fix failing old GHC CI builds by adding XDG's ~/.local/bin to GITHUB_PATH --------- Co-authored-by: Artem Pelenitsyn (cherry picked from commit dfe73930b4b977924af9ac17ad7f2f45b6956d89) # Conflicts: # .github/workflows/bootstrap.yml # Cabal-QuickCheck/Cabal-QuickCheck.cabal # Cabal-described/Cabal-described.cabal # Cabal-syntax/Cabal-syntax.cabal # Cabal-tree-diff/Cabal-tree-diff.cabal # Cabal/Cabal.cabal # Cabal/Makefile # Makefile # bootstrap/cabal-bootstrap-gen.cabal # bootstrap/linux-8.10.7.json # bootstrap/linux-9.0.2.json # bootstrap/linux-9.2.3.json # bootstrap/linux-9.2.6.json # bootstrap/linux-9.2.7.json # bootstrap/linux-9.4.4.json # cabal-install-solver/cabal-install-solver.cabal # cabal-install/cabal-install.cabal # cabal-install/src/Distribution/Client/Version.hs # cabal-testsuite/cabal-testsuite.cabal # doc/conf.py # solver-benchmarks/solver-benchmarks.cabal --- .github/workflows/bootstrap.yml | 7 + .github/workflows/validate.yml | 88 ++-- Cabal-QuickCheck/Cabal-QuickCheck.cabal | 9 + Cabal-described/Cabal-described.cabal | 9 + Cabal-syntax/Cabal-syntax.cabal | 4 + Cabal-tree-diff/Cabal-tree-diff.cabal | 9 + Cabal/Cabal.cabal | 8 + Cabal/Makefile | 4 + Makefile | 4 + bootstrap/cabal-bootstrap-gen.cabal | 5 + bootstrap/cabal.project | 3 + bootstrap/linux-8.10.7.json | 55 +++ bootstrap/linux-9.0.2.json | 55 +++ bootstrap/linux-9.2.6.json | 50 ++ bootstrap/linux-9.2.7.json | 450 ++++++++++++++++++ bootstrap/linux-9.4.4.json | 46 ++ .../cabal-install-solver.cabal | 9 + cabal-install/cabal-install.cabal | 14 + .../src/Distribution/Client/Version.hs | 4 + cabal-testsuite/cabal-testsuite.cabal | 9 +- doc/conf.py | 4 + solver-benchmarks/solver-benchmarks.cabal | 4 + 22 files changed, 804 insertions(+), 46 deletions(-) create mode 100644 bootstrap/linux-9.2.7.json diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml index 1165e6a138c..1e9d30bacdd 100644 --- a/.github/workflows/bootstrap.yml +++ b/.github/workflows/bootstrap.yml @@ -19,10 +19,17 @@ jobs: strategy: matrix: os: [ubuntu-latest] +<<<<<<< HEAD ghc: ["8.10.7", "9.0.2", "9.2.6", "9.4.4"] include: - os: macos-latest ghc: "9.2.6" +======= + ghc: ["8.10.7", "9.0.2", "9.2.7", "9.4.4"] + include: + - os: macos-latest + ghc: "9.2.7" +>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)) name: Bootstrap ${{ matrix.os }} ghc-${{ matrix.ghc }} runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 48f10d09e91..5cab8256371 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -57,6 +57,20 @@ jobs: - uses: actions/checkout@v3 + # See the following link for a breakdown of the following step + # https://github.com/haskell/actions/issues/7#issuecomment-745697160 + # + # See https://github.com/haskell/cabal/pull/8739 for why Windows is excluded + - if: ${{ runner.os != 'Windows' }} + uses: actions/cache@v3 + with: + # validate.sh uses a special build dir + path: | + ${{ steps.setup-haskell.outputs.cabal-store }} + dist-* + key: ${{ runner.os }}-${{ matrix.ghc }}-20220419-${{ github.sha }} + restore-keys: ${{ runner.os }}-${{ matrix.ghc }}-20220419- + # See https://github.com/haskell/cabal/pull/8739 - name: Sudo chmod to permit ghcup to update its cache run: | @@ -71,21 +85,7 @@ jobs: id: setup-haskell with: ghc-version: ${{ matrix.ghc }} - cabal-version: '3.8.1.0' - - # See the following link for a breakdown of the following step - # https://github.com/haskell/actions/issues/7#issuecomment-745697160 - # - # See https://github.com/haskell/cabal/pull/8739 for why Windows is excluded - - if: ${{ runner.os != 'Windows' }} - uses: actions/cache@v3 - with: - # validate.sh uses a special build dir - path: | - ${{ steps.setup-haskell.outputs.cabal-store }} - dist-* - key: ${{ runner.os }}-${{ matrix.ghc }}-20220419-${{ github.sha }} - restore-keys: ${{ runner.os }}-${{ matrix.ghc }}-20220419- + cabal-version: '3.10.1.0' - name: Work around git problem https://bugs.launchpad.net/ubuntu/+source/git/+bug/1993586 (cabal PR #8546) run: | @@ -98,7 +98,7 @@ jobs: run: | cd $(mktemp -d) cabal install cabal-plan --constraint='cabal-plan +exe' - echo "$HOME/.cabal/bin" >> $GITHUB_PATH + echo "$HOME/.cabal/bin:$HOME/.local/bin" >> $GITHUB_PATH # The tool is not essential to the rest of the test suite. If # hackage-repo-tool is not present, any test that requires it will @@ -206,6 +206,20 @@ jobs: - uses: actions/checkout@v3 + # See the following link for a breakdown of the following step + # https://github.com/haskell/actions/issues/7#issuecomment-745697160 + # + # See https://github.com/haskell/cabal/pull/8739 for why Windows is excluded + - if: ${{ runner.os != 'Windows' }} + uses: actions/cache@v3 + with: + # validate.sh uses a special build dir + path: | + ${{ steps.setup-haskell.outputs.cabal-store }} + dist-* + key: ${{ runner.os }}-${{ matrix.ghc }}-20220419-${{ github.sha }} + restore-keys: ${{ runner.os }}-${{ matrix.ghc }}-20220419- + # See https://github.com/haskell/cabal/pull/8739 - name: Sudo chmod to permit ghcup to update its cache run: | @@ -227,20 +241,6 @@ jobs: ghc --version cabal update - # See the following link for a breakdown of the following step - # https://github.com/haskell/actions/issues/7#issuecomment-745697160 - # - # See https://github.com/haskell/cabal/pull/8739 for why Windows is excluded - - if: ${{ runner.os != 'Windows' }} - uses: actions/cache@v3 - with: - # validate.sh uses a special build dir - path: | - ${{ steps.setup-haskell.outputs.cabal-store }} - dist-* - key: ${{ runner.os }}-${{ matrix.ghc }}-20220419-${{ github.sha }} - restore-keys: ${{ runner.os }}-${{ matrix.ghc }}-20220419- - - name: Work around git problem https://bugs.launchpad.net/ubuntu/+source/git/+bug/1993586 (cabal PR #8546) run: | git config --global protocol.file.allow always @@ -252,7 +252,7 @@ jobs: run: | cd $(mktemp -d) cabal install cabal-plan --constraint='cabal-plan +exe' --allow-newer - echo "$HOME/.cabal/bin" >> $GITHUB_PATH + echo "$HOME/.cabal/bin:$HOME/.local/bin" >> $GITHUB_PATH # The tool is not essential to the rest of the test suite. If # hackage-repo-tool is not present, any test that requires it will @@ -348,17 +348,6 @@ jobs: git fetch origin $GITHUB_SHA:temporary-ci-branch git checkout $GITHUB_SHA || (git fetch && git checkout $GITHUB_SHA) - - name: Install extra compiler - run: | - apt-get update - apt-get install -y ghc-${{ matrix.extra-ghc }}-dyn - - - uses: haskell/actions/setup@v2 - id: setup-haskell - with: - ghc-version: ${{ matrix.ghc }} - cabal-version: '3.8.1.0' - # As we are reusing the cached build dir from the previous step # the generated artifacts are available here, # including the cabal executable and the test suite @@ -370,11 +359,22 @@ jobs: key: ${{ runner.os }}-${{ matrix.ghc }}-20220419-${{ github.sha }} restore-keys: ${{ runner.os }}-${{ matrix.ghc }}-20220419- + - name: Install extra compiler + run: | + apt-get update + apt-get install -y ghc-${{ matrix.extra-ghc }}-dyn + + - uses: haskell/actions/setup@v2 + id: setup-haskell + with: + ghc-version: ${{ matrix.ghc }} + cabal-version: latest # latest is mandatory for cabal-testsuite, see https://github.com/haskell/cabal/issues/8133 + - name: Install cabal-plan run: | cd $(mktemp -d) cabal install cabal-plan --constraint='cabal-plan +exe' - echo "$HOME/.cabal/bin" >> $GITHUB_PATH + echo "$HOME/.cabal/bin:$HOME/.local/bin" >> $GITHUB_PATH - name: Validate build run: sh validate.sh ${{ env.COMMON_FLAGS }} -s build @@ -422,7 +422,7 @@ jobs: run: | cd $(mktemp -d) cabal install cabal-plan --constraint='cabal-plan +exe' - echo "$HOME/.cabal/bin" >> $GITHUB_PATH + echo "$HOME/.cabal/bin:$HOME/.local/bin" >> $GITHUB_PATH - name: Download cabal executable from workflow artifacts uses: actions/download-artifact@v3 diff --git a/Cabal-QuickCheck/Cabal-QuickCheck.cabal b/Cabal-QuickCheck/Cabal-QuickCheck.cabal index 29a9462354c..b24c2e661bd 100644 --- a/Cabal-QuickCheck/Cabal-QuickCheck.cabal +++ b/Cabal-QuickCheck/Cabal-QuickCheck.cabal @@ -1,6 +1,10 @@ cabal-version: 2.2 name: Cabal-QuickCheck +<<<<<<< HEAD version: 3.10.1.0 +======= +version: 3.11.0.0 +>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)) synopsis: QuickCheck instances for types in Cabal category: Testing description: @@ -13,8 +17,13 @@ library build-depends: , base , bytestring +<<<<<<< HEAD , Cabal ^>=3.10.0.0 , Cabal-syntax ^>=3.10.0.0 +======= + , Cabal ^>=3.11.0.0 + , Cabal-syntax ^>=3.11.0.0 +>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)) , QuickCheck ^>=2.13.2 || ^>=2.14 exposed-modules: diff --git a/Cabal-described/Cabal-described.cabal b/Cabal-described/Cabal-described.cabal index 7458ee5f7f1..89ee044cc98 100644 --- a/Cabal-described/Cabal-described.cabal +++ b/Cabal-described/Cabal-described.cabal @@ -1,6 +1,10 @@ cabal-version: 2.2 name: Cabal-described +<<<<<<< HEAD version: 3.10.1.0 +======= +version: 3.11.0.0 +>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)) synopsis: Described functionality for types in Cabal category: Testing, Parsec description: Provides rere bindings @@ -11,8 +15,13 @@ library ghc-options: -Wall build-depends: , base +<<<<<<< HEAD , Cabal ^>=3.10.0.0 , Cabal-syntax ^>=3.10.0.0 +======= + , Cabal ^>=3.11.0.0 + , Cabal-syntax ^>=3.11.0.0 +>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)) , containers , pretty , QuickCheck diff --git a/Cabal-syntax/Cabal-syntax.cabal b/Cabal-syntax/Cabal-syntax.cabal index d4039a55fb6..aa317596b2d 100644 --- a/Cabal-syntax/Cabal-syntax.cabal +++ b/Cabal-syntax/Cabal-syntax.cabal @@ -1,6 +1,10 @@ cabal-version: 2.2 name: Cabal-syntax +<<<<<<< HEAD version: 3.10.1.0 +======= +version: 3.11.0.0 +>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)) copyright: 2003-2023, 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 index 3d3e8087b3c..57df985d762 100644 --- a/Cabal-tree-diff/Cabal-tree-diff.cabal +++ b/Cabal-tree-diff/Cabal-tree-diff.cabal @@ -1,6 +1,10 @@ cabal-version: 2.2 name: Cabal-tree-diff +<<<<<<< HEAD version: 3.10.1.0 +======= +version: 3.11.0.0 +>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)) synopsis: QuickCheck instances for types in Cabal category: Testing description: Provides tree-diff ToExpr instances for some types in Cabal @@ -11,8 +15,13 @@ library ghc-options: -Wall build-depends: , base +<<<<<<< HEAD , Cabal-syntax ^>=3.10.0.0 , Cabal ^>=3.10.0.0 +======= + , Cabal-syntax ^>=3.11.0.0 + , Cabal ^>=3.11.0.0 +>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)) , tree-diff ^>=0.1 || ^>=0.2 exposed-modules: Data.TreeDiff.Instances.Cabal diff --git a/Cabal/Cabal.cabal b/Cabal/Cabal.cabal index bbe963f26d5..b0955af021f 100644 --- a/Cabal/Cabal.cabal +++ b/Cabal/Cabal.cabal @@ -1,6 +1,10 @@ cabal-version: 2.2 name: Cabal +<<<<<<< HEAD version: 3.10.1.0 +======= +version: 3.11.0.0 +>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)) copyright: 2003-2023, Cabal Development Team (see AUTHORS file) license: BSD-3-Clause license-file: LICENSE @@ -34,7 +38,11 @@ library hs-source-dirs: src build-depends: +<<<<<<< HEAD Cabal-syntax ^>= 3.10, +======= + Cabal-syntax ^>= 3.11, +>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)) array >= 0.4.0.1 && < 0.6, base >= 4.9 && < 5, bytestring >= 0.10.0.0 && < 0.12, diff --git a/Cabal/Makefile b/Cabal/Makefile index 8515826802f..3d639c2f709 100644 --- a/Cabal/Makefile +++ b/Cabal/Makefile @@ -1,4 +1,8 @@ +<<<<<<< HEAD VERSION=3.10.1.0 +======= +VERSION=3.11.0.0 +>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)) #KIND=devel KIND=rc diff --git a/Makefile b/Makefile index bac0d30a4aa..cbcd5dca73e 100644 --- a/Makefile +++ b/Makefile @@ -195,7 +195,11 @@ bootstrap-json-%: phony cd bootstrap && cabal v2-run -v0 cabal-bootstrap-gen -- linux-$*.plan.json \ | python3 -m json.tool > linux-$*.json +<<<<<<< HEAD BOOTSTRAP_GHC_VERSIONS := 8.10.7 9.0.2 9.2.6 9.4.4 +======= +BOOTSTRAP_GHC_VERSIONS := 8.10.7 9.0.2 9.2.7 9.4.4 +>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)) bootstrap-jsons: $(BOOTSTRAP_GHC_VERSIONS:%=bootstrap-json-%) diff --git a/bootstrap/cabal-bootstrap-gen.cabal b/bootstrap/cabal-bootstrap-gen.cabal index 64c5a098f65..21ecf5dd31b 100644 --- a/bootstrap/cabal-bootstrap-gen.cabal +++ b/bootstrap/cabal-bootstrap-gen.cabal @@ -11,8 +11,13 @@ executable cabal-bootstrap-gen , 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 , bytestring ^>=0.10.8.2 || ^>=0.11.0.0 +<<<<<<< HEAD , Cabal ^>=3.2.0.0 || ^>=3.4.1.0 || ^>=3.6.3.0 || ^>=3.8.1.0 || ^>=3.10.1.0 , Cabal-syntax ^>=3.8.1.0 || ^>=3.10.1.0 +======= + , Cabal ^>=3.2.0.0 || ^>=3.4.1.0 || ^>=3.6.3.0 || ^>=3.10.1.0 + , Cabal-syntax ^>=3.10.1.0 +>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)) , cabal-install-parsers ^>=0.3.0.1 || ^>=0.4.5 || ^>=0.6 , cabal-plan ^>=0.7.0.0 , containers ^>=0.6.0.1 diff --git a/bootstrap/cabal.project b/bootstrap/cabal.project index d1eb5750c9d..8d1ac11b28e 100644 --- a/bootstrap/cabal.project +++ b/bootstrap/cabal.project @@ -3,3 +3,6 @@ packages: . optimization: False + +allow-newer: + cabal-install-parsers:Cabal-syntax diff --git a/bootstrap/linux-8.10.7.json b/bootstrap/linux-8.10.7.json index d60690f2075..efa22335545 100644 --- a/bootstrap/linux-8.10.7.json +++ b/bootstrap/linux-8.10.7.json @@ -102,7 +102,11 @@ "revision": null, "source": "local", "src_sha256": null, +<<<<<<< HEAD "version": "3.10.1.0" +======= + "version": "3.11.0.0" +>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)) }, { "cabal_sha256": "49d8a7f372d35363011591b253cae4c8db8b9ec594590448e20b7bed7acaee98", @@ -120,16 +124,24 @@ "revision": null, "source": "local", "src_sha256": null, +<<<<<<< HEAD "version": "3.10.1.0" }, { "cabal_sha256": "e3d78b13db9512aeb106e44a334ab42b7aa48d26c097299084084cb8be5c5568", +======= + "version": "3.11.0.0" + }, + { + "cabal_sha256": "29b28d2e19ae9f5ff92cea4ab8d2e185408ee5de73b4127f7b485a904c9a8b15", +>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)) "flags": [ "-devel" ], "package": "network", "revision": 0, "source": "hackage", +<<<<<<< HEAD "src_sha256": "7f7620fef1a1af3d3d6747f510e73223a5c600e7d7fd9ace073d1222bdc63d85", "version": "3.1.2.7" }, @@ -138,6 +150,16 @@ "flags": [], "package": "th-compat", "revision": 0, +======= + "src_sha256": "fde2d4b065f1984c76755004c64a29ae9ec52c8bf74f2485d805ef577e7c7822", + "version": "3.1.2.8" + }, + { + "cabal_sha256": "e5ae7c083ef3a22248558f8451669bb1c55ea8090f5908b86b9033743c161730", + "flags": [], + "package": "th-compat", + "revision": 2, +>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)) "source": "hackage", "src_sha256": "d8f97ac14ab47b6b8a7b0fdb4ff95426322ec56badd01652ac15da4a44d4bab8", "version": "0.1.4" @@ -166,13 +188,22 @@ "version": "4000.4.1" }, { +<<<<<<< HEAD "cabal_sha256": "58d5514b688ec037f53b9d60097b9d87f6b3847da68f65124987d67222c3a334", +======= + "cabal_sha256": "0bdd3486d3a1bcbed0513b46af4a13ca74b395313fa5b6e0068d6b7413b76a04", +>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)) "flags": [], "package": "base-orphans", "revision": 0, "source": "hackage", +<<<<<<< HEAD "src_sha256": "888fd67f0dbe932778f5b170922ce80d0dcab1680ee98f1d6fcc362f20d9e447", "version": "0.8.7" +======= + "src_sha256": "613ed4d8241ed5a648a59ae6569a6962990bb545711d020d49fb83fa12d16e62", + "version": "0.9.0" +>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)) }, { "cabal_sha256": "2ef1bd3511e82ba56f7f23cd793dd2da84338a1e7c2cbea5b151417afe3baada", @@ -184,24 +215,40 @@ "version": "0.1.0.1" }, { +<<<<<<< HEAD "cabal_sha256": "02acedd7ac829b52756fe481a1d53294d8f5d42aaa56df560c62c6cec3587a14", +======= + "cabal_sha256": "585792335d5541dba78fa8dfcb291a89cd5812a281825ff7a44afa296ab5d58a", +>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)) "flags": [ "+integer-gmp", "-random-initial-seed" ], "package": "hashable", +<<<<<<< HEAD "revision": 0, +======= + "revision": 1, +>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)) "source": "hackage", "src_sha256": "1b4000ea82b81f69d46d0af4152c10c6303873510738e24cfc4767760d30e3f8", "version": "1.4.2.0" }, { +<<<<<<< HEAD "cabal_sha256": "2b9409023536823233ce3134558565d01b3382e651fa54ac8cb8a99967e023c9", +======= + "cabal_sha256": "46367dc0c8326dcbeb7b93f200b567491c2f6029bccf822b8bb26ee660397e08", +>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)) "flags": [ "-bench" ], "package": "async", +<<<<<<< HEAD "revision": 2, +======= + "revision": 3, +>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)) "source": "hackage", "src_sha256": "484df85be0e76c4fed9376451e48e1d0c6e97952ce79735b72d54297e7e0a725", "version": "2.2.4" @@ -264,7 +311,11 @@ "revision": null, "source": "local", "src_sha256": null, +<<<<<<< HEAD "version": "3.10.1.0" +======= + "version": "3.11.0.0" +>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)) }, { "cabal_sha256": "facd0c04925ef925ec05243471fd16055229fdf51f64db1a1049de0cc6c6dfc3", @@ -403,7 +454,11 @@ "revision": null, "source": "local", "src_sha256": null, +<<<<<<< HEAD "version": "3.10.1.0" +======= + "version": "3.11.0.0" +>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)) } ] } diff --git a/bootstrap/linux-9.0.2.json b/bootstrap/linux-9.0.2.json index e0015b5461b..e0704e42781 100644 --- a/bootstrap/linux-9.0.2.json +++ b/bootstrap/linux-9.0.2.json @@ -102,7 +102,11 @@ "revision": null, "source": "local", "src_sha256": null, +<<<<<<< HEAD "version": "3.10.1.0" +======= + "version": "3.11.0.0" +>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)) }, { "cabal_sha256": "49d8a7f372d35363011591b253cae4c8db8b9ec594590448e20b7bed7acaee98", @@ -120,16 +124,24 @@ "revision": null, "source": "local", "src_sha256": null, +<<<<<<< HEAD "version": "3.10.1.0" }, { "cabal_sha256": "e3d78b13db9512aeb106e44a334ab42b7aa48d26c097299084084cb8be5c5568", +======= + "version": "3.11.0.0" + }, + { + "cabal_sha256": "29b28d2e19ae9f5ff92cea4ab8d2e185408ee5de73b4127f7b485a904c9a8b15", +>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)) "flags": [ "-devel" ], "package": "network", "revision": 0, "source": "hackage", +<<<<<<< HEAD "src_sha256": "7f7620fef1a1af3d3d6747f510e73223a5c600e7d7fd9ace073d1222bdc63d85", "version": "3.1.2.7" }, @@ -138,6 +150,16 @@ "flags": [], "package": "th-compat", "revision": 0, +======= + "src_sha256": "fde2d4b065f1984c76755004c64a29ae9ec52c8bf74f2485d805ef577e7c7822", + "version": "3.1.2.8" + }, + { + "cabal_sha256": "e5ae7c083ef3a22248558f8451669bb1c55ea8090f5908b86b9033743c161730", + "flags": [], + "package": "th-compat", + "revision": 2, +>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)) "source": "hackage", "src_sha256": "d8f97ac14ab47b6b8a7b0fdb4ff95426322ec56badd01652ac15da4a44d4bab8", "version": "0.1.4" @@ -166,13 +188,22 @@ "version": "4000.4.1" }, { +<<<<<<< HEAD "cabal_sha256": "58d5514b688ec037f53b9d60097b9d87f6b3847da68f65124987d67222c3a334", +======= + "cabal_sha256": "0bdd3486d3a1bcbed0513b46af4a13ca74b395313fa5b6e0068d6b7413b76a04", +>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)) "flags": [], "package": "base-orphans", "revision": 0, "source": "hackage", +<<<<<<< HEAD "src_sha256": "888fd67f0dbe932778f5b170922ce80d0dcab1680ee98f1d6fcc362f20d9e447", "version": "0.8.7" +======= + "src_sha256": "613ed4d8241ed5a648a59ae6569a6962990bb545711d020d49fb83fa12d16e62", + "version": "0.9.0" +>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)) }, { "cabal_sha256": "2ef1bd3511e82ba56f7f23cd793dd2da84338a1e7c2cbea5b151417afe3baada", @@ -184,24 +215,40 @@ "version": "0.1.0.1" }, { +<<<<<<< HEAD "cabal_sha256": "02acedd7ac829b52756fe481a1d53294d8f5d42aaa56df560c62c6cec3587a14", +======= + "cabal_sha256": "585792335d5541dba78fa8dfcb291a89cd5812a281825ff7a44afa296ab5d58a", +>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)) "flags": [ "+integer-gmp", "-random-initial-seed" ], "package": "hashable", +<<<<<<< HEAD "revision": 0, +======= + "revision": 1, +>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)) "source": "hackage", "src_sha256": "1b4000ea82b81f69d46d0af4152c10c6303873510738e24cfc4767760d30e3f8", "version": "1.4.2.0" }, { +<<<<<<< HEAD "cabal_sha256": "2b9409023536823233ce3134558565d01b3382e651fa54ac8cb8a99967e023c9", +======= + "cabal_sha256": "46367dc0c8326dcbeb7b93f200b567491c2f6029bccf822b8bb26ee660397e08", +>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)) "flags": [ "-bench" ], "package": "async", +<<<<<<< HEAD "revision": 2, +======= + "revision": 3, +>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)) "source": "hackage", "src_sha256": "484df85be0e76c4fed9376451e48e1d0c6e97952ce79735b72d54297e7e0a725", "version": "2.2.4" @@ -264,7 +311,11 @@ "revision": null, "source": "local", "src_sha256": null, +<<<<<<< HEAD "version": "3.10.1.0" +======= + "version": "3.11.0.0" +>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)) }, { "cabal_sha256": "facd0c04925ef925ec05243471fd16055229fdf51f64db1a1049de0cc6c6dfc3", @@ -403,7 +454,11 @@ "revision": null, "source": "local", "src_sha256": null, +<<<<<<< HEAD "version": "3.10.1.0" +======= + "version": "3.11.0.0" +>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)) } ] } diff --git a/bootstrap/linux-9.2.6.json b/bootstrap/linux-9.2.6.json index c1eab1720e7..1e4a4dff161 100644 --- a/bootstrap/linux-9.2.6.json +++ b/bootstrap/linux-9.2.6.json @@ -26,7 +26,11 @@ }, { "package": "ghc-boot-th", +<<<<<<<< HEAD:bootstrap/linux-9.2.6.json "version": "9.2.6" +======== + "version": "9.2.7" +>>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)):bootstrap/linux-9.2.7.json }, { "package": "pretty", @@ -102,7 +106,11 @@ "revision": null, "source": "local", "src_sha256": null, +<<<<<<<< HEAD:bootstrap/linux-9.2.6.json "version": "3.10.1.0" +======== + "version": "3.11.0.0" +>>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)):bootstrap/linux-9.2.7.json }, { "cabal_sha256": "49d8a7f372d35363011591b253cae4c8db8b9ec594590448e20b7bed7acaee98", @@ -120,16 +128,24 @@ "revision": null, "source": "local", "src_sha256": null, +<<<<<<<< HEAD:bootstrap/linux-9.2.6.json "version": "3.10.1.0" }, { "cabal_sha256": "e3d78b13db9512aeb106e44a334ab42b7aa48d26c097299084084cb8be5c5568", +======== + "version": "3.11.0.0" + }, + { + "cabal_sha256": "29b28d2e19ae9f5ff92cea4ab8d2e185408ee5de73b4127f7b485a904c9a8b15", +>>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)):bootstrap/linux-9.2.7.json "flags": [ "-devel" ], "package": "network", "revision": 0, "source": "hackage", +<<<<<<<< HEAD:bootstrap/linux-9.2.6.json "src_sha256": "7f7620fef1a1af3d3d6747f510e73223a5c600e7d7fd9ace073d1222bdc63d85", "version": "3.1.2.7" }, @@ -138,6 +154,16 @@ "flags": [], "package": "th-compat", "revision": 0, +======== + "src_sha256": "fde2d4b065f1984c76755004c64a29ae9ec52c8bf74f2485d805ef577e7c7822", + "version": "3.1.2.8" + }, + { + "cabal_sha256": "e5ae7c083ef3a22248558f8451669bb1c55ea8090f5908b86b9033743c161730", + "flags": [], + "package": "th-compat", + "revision": 2, +>>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)):bootstrap/linux-9.2.7.json "source": "hackage", "src_sha256": "d8f97ac14ab47b6b8a7b0fdb4ff95426322ec56badd01652ac15da4a44d4bab8", "version": "0.1.4" @@ -175,24 +201,40 @@ "version": "0.1.0.1" }, { +<<<<<<<< HEAD:bootstrap/linux-9.2.6.json "cabal_sha256": "02acedd7ac829b52756fe481a1d53294d8f5d42aaa56df560c62c6cec3587a14", +======== + "cabal_sha256": "585792335d5541dba78fa8dfcb291a89cd5812a281825ff7a44afa296ab5d58a", +>>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)):bootstrap/linux-9.2.7.json "flags": [ "+integer-gmp", "-random-initial-seed" ], "package": "hashable", +<<<<<<<< HEAD:bootstrap/linux-9.2.6.json "revision": 0, +======== + "revision": 1, +>>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)):bootstrap/linux-9.2.7.json "source": "hackage", "src_sha256": "1b4000ea82b81f69d46d0af4152c10c6303873510738e24cfc4767760d30e3f8", "version": "1.4.2.0" }, { +<<<<<<<< HEAD:bootstrap/linux-9.2.6.json "cabal_sha256": "2b9409023536823233ce3134558565d01b3382e651fa54ac8cb8a99967e023c9", +======== + "cabal_sha256": "46367dc0c8326dcbeb7b93f200b567491c2f6029bccf822b8bb26ee660397e08", +>>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)):bootstrap/linux-9.2.7.json "flags": [ "-bench" ], "package": "async", +<<<<<<<< HEAD:bootstrap/linux-9.2.6.json "revision": 2, +======== + "revision": 3, +>>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)):bootstrap/linux-9.2.7.json "source": "hackage", "src_sha256": "484df85be0e76c4fed9376451e48e1d0c6e97952ce79735b72d54297e7e0a725", "version": "2.2.4" @@ -255,7 +297,11 @@ "revision": null, "source": "local", "src_sha256": null, +<<<<<<<< HEAD:bootstrap/linux-9.2.6.json "version": "3.10.1.0" +======== + "version": "3.11.0.0" +>>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)):bootstrap/linux-9.2.7.json }, { "cabal_sha256": "facd0c04925ef925ec05243471fd16055229fdf51f64db1a1049de0cc6c6dfc3", @@ -394,7 +440,11 @@ "revision": null, "source": "local", "src_sha256": null, +<<<<<<<< HEAD:bootstrap/linux-9.2.6.json "version": "3.10.1.0" +======== + "version": "3.11.0.0" +>>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)):bootstrap/linux-9.2.7.json } ] } diff --git a/bootstrap/linux-9.2.7.json b/bootstrap/linux-9.2.7.json new file mode 100644 index 00000000000..1e4a4dff161 --- /dev/null +++ b/bootstrap/linux-9.2.7.json @@ -0,0 +1,450 @@ +{ + "builtin": [ + { + "package": "rts", + "version": "1.0.2" + }, + { + "package": "ghc-prim", + "version": "0.8.0" + }, + { + "package": "ghc-bignum", + "version": "1.2" + }, + { + "package": "base", + "version": "4.16.4.0" + }, + { + "package": "array", + "version": "0.5.4.0" + }, + { + "package": "deepseq", + "version": "1.4.6.1" + }, + { + "package": "ghc-boot-th", +<<<<<<<< HEAD:bootstrap/linux-9.2.6.json + "version": "9.2.6" +======== + "version": "9.2.7" +>>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)):bootstrap/linux-9.2.7.json + }, + { + "package": "pretty", + "version": "1.1.3.6" + }, + { + "package": "template-haskell", + "version": "2.18.0.0" + }, + { + "package": "bytestring", + "version": "0.11.4.0" + }, + { + "package": "containers", + "version": "0.6.5.1" + }, + { + "package": "binary", + "version": "0.8.9.0" + }, + { + "package": "filepath", + "version": "1.4.2.2" + }, + { + "package": "time", + "version": "1.11.1.1" + }, + { + "package": "unix", + "version": "2.7.2.2" + }, + { + "package": "transformers", + "version": "0.5.6.2" + }, + { + "package": "mtl", + "version": "2.2.2" + }, + { + "package": "text", + "version": "1.2.5.0" + }, + { + "package": "parsec", + "version": "3.1.15.0" + }, + { + "package": "stm", + "version": "2.5.0.2" + }, + { + "package": "exceptions", + "version": "0.10.4" + } + ], + "dependencies": [ + { + "cabal_sha256": "1125a0a4be3aafc8da208940f219d4e4df8a0db87d892cc42bb369071855c590", + "flags": [], + "package": "directory", + "revision": 0, + "source": "hackage", + "src_sha256": "dc2785d6548cec2e80700fab007d3e9467f65d3c58ab3efa21b34d9017cf0efd", + "version": "1.3.7.1" + }, + { + "cabal_sha256": null, + "flags": [], + "package": "Cabal-syntax", + "revision": null, + "source": "local", + "src_sha256": null, +<<<<<<<< HEAD:bootstrap/linux-9.2.6.json + "version": "3.10.1.0" +======== + "version": "3.11.0.0" +>>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)):bootstrap/linux-9.2.7.json + }, + { + "cabal_sha256": "49d8a7f372d35363011591b253cae4c8db8b9ec594590448e20b7bed7acaee98", + "flags": [], + "package": "process", + "revision": 0, + "source": "hackage", + "src_sha256": "4c5c454e0f5c864c79b9fabd850307b26d8ac4037e45a6a39ab87e20b583bf06", + "version": "1.6.17.0" + }, + { + "cabal_sha256": null, + "flags": [], + "package": "Cabal", + "revision": null, + "source": "local", + "src_sha256": null, +<<<<<<<< HEAD:bootstrap/linux-9.2.6.json + "version": "3.10.1.0" + }, + { + "cabal_sha256": "e3d78b13db9512aeb106e44a334ab42b7aa48d26c097299084084cb8be5c5568", +======== + "version": "3.11.0.0" + }, + { + "cabal_sha256": "29b28d2e19ae9f5ff92cea4ab8d2e185408ee5de73b4127f7b485a904c9a8b15", +>>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)):bootstrap/linux-9.2.7.json + "flags": [ + "-devel" + ], + "package": "network", + "revision": 0, + "source": "hackage", +<<<<<<<< HEAD:bootstrap/linux-9.2.6.json + "src_sha256": "7f7620fef1a1af3d3d6747f510e73223a5c600e7d7fd9ace073d1222bdc63d85", + "version": "3.1.2.7" + }, + { + "cabal_sha256": "6ca77c4e80b4e4109e30549c269631a9cc295c8fc2431ce4123972a5f80f7bfc", + "flags": [], + "package": "th-compat", + "revision": 0, +======== + "src_sha256": "fde2d4b065f1984c76755004c64a29ae9ec52c8bf74f2485d805ef577e7c7822", + "version": "3.1.2.8" + }, + { + "cabal_sha256": "e5ae7c083ef3a22248558f8451669bb1c55ea8090f5908b86b9033743c161730", + "flags": [], + "package": "th-compat", + "revision": 2, +>>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)):bootstrap/linux-9.2.7.json + "source": "hackage", + "src_sha256": "d8f97ac14ab47b6b8a7b0fdb4ff95426322ec56badd01652ac15da4a44d4bab8", + "version": "0.1.4" + }, + { + "cabal_sha256": "1fde59abf5d82a9666b4415bc2b2e9e33f6c1309074fda12d50410c7dbd95f3b", + "flags": [], + "package": "network-uri", + "revision": 0, + "source": "hackage", + "src_sha256": "9c188973126e893250b881f20e8811dca06c223c23402b06f7a1f2e995797228", + "version": "2.6.4.2" + }, + { + "cabal_sha256": "b878d575c470bd1f72d37af6654d924ab2b9489d88de8a71bd74d9d5d726c013", + "flags": [ + "-conduit10", + "+network-uri", + "-warn-as-error", + "-warp-tests" + ], + "package": "HTTP", + "revision": 1, + "source": "hackage", + "src_sha256": "df31d8efec775124dab856d7177ddcba31be9f9e0836ebdab03d94392f2dd453", + "version": "4000.4.1" + }, + { + "cabal_sha256": "2ef1bd3511e82ba56f7f23cd793dd2da84338a1e7c2cbea5b151417afe3baada", + "flags": [], + "package": "data-array-byte", + "revision": 1, + "source": "hackage", + "src_sha256": "1bb6eca0b3e02d057fe7f4e14c81ef395216f421ab30fdaa1b18017c9c025600", + "version": "0.1.0.1" + }, + { +<<<<<<<< HEAD:bootstrap/linux-9.2.6.json + "cabal_sha256": "02acedd7ac829b52756fe481a1d53294d8f5d42aaa56df560c62c6cec3587a14", +======== + "cabal_sha256": "585792335d5541dba78fa8dfcb291a89cd5812a281825ff7a44afa296ab5d58a", +>>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)):bootstrap/linux-9.2.7.json + "flags": [ + "+integer-gmp", + "-random-initial-seed" + ], + "package": "hashable", +<<<<<<<< HEAD:bootstrap/linux-9.2.6.json + "revision": 0, +======== + "revision": 1, +>>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)):bootstrap/linux-9.2.7.json + "source": "hackage", + "src_sha256": "1b4000ea82b81f69d46d0af4152c10c6303873510738e24cfc4767760d30e3f8", + "version": "1.4.2.0" + }, + { +<<<<<<<< HEAD:bootstrap/linux-9.2.6.json + "cabal_sha256": "2b9409023536823233ce3134558565d01b3382e651fa54ac8cb8a99967e023c9", +======== + "cabal_sha256": "46367dc0c8326dcbeb7b93f200b567491c2f6029bccf822b8bb26ee660397e08", +>>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)):bootstrap/linux-9.2.7.json + "flags": [ + "-bench" + ], + "package": "async", +<<<<<<<< HEAD:bootstrap/linux-9.2.6.json + "revision": 2, +======== + "revision": 3, +>>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)):bootstrap/linux-9.2.7.json + "source": "hackage", + "src_sha256": "484df85be0e76c4fed9376451e48e1d0c6e97952ce79735b72d54297e7e0a725", + "version": "2.2.4" + }, + { + "cabal_sha256": "64abad7816ab8cabed8489e29f807b3a6f828e0b2cec0eae404323d69d36df9a", + "flags": [], + "package": "base16-bytestring", + "revision": 0, + "source": "hackage", + "src_sha256": "1d5a91143ef0e22157536093ec8e59d226a68220ec89378d5dcaeea86472c784", + "version": "1.0.2.0" + }, + { + "cabal_sha256": "50ec0e229255d4c45cbdd568da011311b8887f304b931564886016f4984334d8", + "flags": [], + "package": "base64-bytestring", + "revision": 0, + "source": "hackage", + "src_sha256": "fbf8ed30edde271eb605352021431d8f1b055f95a56af31fe2eacf6bdfdc49c9", + "version": "1.2.1.0" + }, + { + "cabal_sha256": "db25c2e17967aa6b6046ab8b1b96ba3f344ca59a62b60fb6113d51ea305a3d8e", + "flags": [ + "-optimised-mixer" + ], + "package": "splitmix", + "revision": 2, + "source": "hackage", + "src_sha256": "6d065402394e7a9117093dbb4530a21342c9b1e2ec509516c8a8d0ffed98ecaa", + "version": "0.1.0.4" + }, + { + "cabal_sha256": "dea1f11e5569332dc6c8efaad1cb301016a5587b6754943a49f9de08ae0e56d9", + "flags": [], + "package": "random", + "revision": 0, + "source": "hackage", + "src_sha256": "3e1272f7ed6a4d7bd1712b90143ec326fee9b225789222379fea20a9c90c9b76", + "version": "1.2.1.1" + }, + { + "cabal_sha256": "4d33a49cd383d50af090f1b888642d10116e43809f9da6023d9fc6f67d2656ee", + "flags": [], + "package": "edit-distance", + "revision": 1, + "source": "hackage", + "src_sha256": "3e8885ee2f56ad4da940f043ae8f981ee2fe336b5e8e4ba3f7436cff4f526c4a", + "version": "0.2.2.1" + }, + { + "cabal_sha256": null, + "flags": [ + "-debug-conflict-sets", + "-debug-expensive-assertions", + "-debug-tracetree" + ], + "package": "cabal-install-solver", + "revision": null, + "source": "local", + "src_sha256": null, +<<<<<<<< HEAD:bootstrap/linux-9.2.6.json + "version": "3.10.1.0" +======== + "version": "3.11.0.0" +>>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)):bootstrap/linux-9.2.7.json + }, + { + "cabal_sha256": "facd0c04925ef925ec05243471fd16055229fdf51f64db1a1049de0cc6c6dfc3", + "flags": [ + "-exe", + "+use-cbits" + ], + "package": "cryptohash-sha256", + "revision": 1, + "source": "hackage", + "src_sha256": "73a7dc7163871a80837495039a099967b11f5c4fe70a118277842f7a713c6bf6", + "version": "0.11.102.1" + }, + { + "cabal_sha256": "ccce771562c49a2b29a52046ca68c62179e97e8fbeacdae32ca84a85445e8f42", + "flags": [ + "-example" + ], + "package": "echo", + "revision": 0, + "source": "hackage", + "src_sha256": "c9fe1bf2904825a65b667251ec644f197b71dc5c209d2d254be5de3d496b0e43", + "version": "0.1.4" + }, + { + "cabal_sha256": "885c9e2410e5d91a08b199897df0867fecedf818216d7329a2d43a512833dd63", + "flags": [ + "+no-donna", + "+test-doctests", + "+test-hlint", + "+test-properties" + ], + "package": "ed25519", + "revision": 6, + "source": "hackage", + "src_sha256": "d8a5958ebfa9309790efade64275dc5c441b568645c45ceed1b0c6ff36d6156d", + "version": "0.0.5.0" + }, + { + "cabal_sha256": "efd4c08c4df1ac3f423858a834c0e3b5b4909febda66a901d12a8e1d57bddaa8", + "flags": [ + "+ofd-locking" + ], + "package": "lukko", + "revision": 3, + "source": "hackage", + "src_sha256": "a80efb60cfa3dae18682c01980d76d5f7e413e191cd186992e1bf7388d48ab1f", + "version": "0.1.1.3" + }, + { + "cabal_sha256": "bc14969ea4adfec6eee20264decf4a07c4002b38b2aa802d58d86b1a2cf7b895", + "flags": [ + "-old-bytestring", + "-old-time" + ], + "package": "tar", + "revision": 5, + "source": "hackage", + "src_sha256": "b384449f62b2b0aa3e6d2cb1004b8060b01f21ec93e7b63e7af6d8fad8a9f1de", + "version": "0.5.1.1" + }, + { + "cabal_sha256": "9adce39e4ca0b7a87d45df0a243134816c57059a08e28cff5469c98ae1f54dfc", + "flags": [ + "-bundled-c-zlib", + "-non-blocking-ffi", + "-pkg-config" + ], + "package": "zlib", + "revision": 1, + "source": "hackage", + "src_sha256": "9eaa989ad4534438b5beb51c1d3a4c8f6a088fdff0b259a5394fbf39aaee04da", + "version": "0.6.3.0" + }, + { + "cabal_sha256": "18405474813b37ddfc27778c88c549f444661432224999068417dfab3471281e", + "flags": [ + "+base48", + "+cabal-syntax", + "+lukko", + "-mtl21", + "-old-directory", + "+use-network-uri" + ], + "package": "hackage-security", + "revision": 2, + "source": "hackage", + "src_sha256": "52ee0576971955571d846b8e6c09638f89f4f7881f4a95173e44ccc0d856a066", + "version": "0.6.2.3" + }, + { + "cabal_sha256": "4ff4425c710cddf440dfbac6cd52310bb6b23e17902390ff71c9fc7eaafc4fcc", + "flags": [], + "package": "regex-base", + "revision": 1, + "source": "hackage", + "src_sha256": "7b99408f580f5bb67a1c413e0bc735886608251331ad36322020f2169aea2ef1", + "version": "0.94.0.2" + }, + { + "cabal_sha256": "9dbba4b65a3bb6975d9740814be5593c6b2d2d6a0b3febc8ec940edb9a9bbdf4", + "flags": [ + "-_regex-posix-clib" + ], + "package": "regex-posix", + "revision": 1, + "source": "hackage", + "src_sha256": "c7827c391919227711e1cff0a762b1678fd8739f9c902fc183041ff34f59259c", + "version": "0.96.0.1" + }, + { + "cabal_sha256": "61e2d98ff634b8b4b3db467772420c0f9c79c2da9ddf3d2daeb2af2417f2c535", + "flags": [], + "package": "resolv", + "revision": 5, + "source": "hackage", + "src_sha256": "81a2bafad484db123cf8d17a02d98bb388a127fd0f822fa022589468a0e64671", + "version": "0.1.2.0" + }, + { + "cabal_sha256": "6e9b1b233af80cc0aa17ea858d2641ba146fb11cbcc5970a52649e89d77282e2", + "flags": [], + "package": "safe-exceptions", + "revision": 0, + "source": "hackage", + "src_sha256": "91ce28d8f8a6efd31788d4827ed5cdcb9a546ad4053a86c56f7947c66a30b5bf", + "version": "0.1.7.3" + }, + { + "cabal_sha256": null, + "flags": [ + "+lukko", + "+native-dns" + ], + "package": "cabal-install", + "revision": null, + "source": "local", + "src_sha256": null, +<<<<<<<< HEAD:bootstrap/linux-9.2.6.json + "version": "3.10.1.0" +======== + "version": "3.11.0.0" +>>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)):bootstrap/linux-9.2.7.json + } + ] +} diff --git a/bootstrap/linux-9.4.4.json b/bootstrap/linux-9.4.4.json index 33c80f8b821..158af344521 100644 --- a/bootstrap/linux-9.4.4.json +++ b/bootstrap/linux-9.4.4.json @@ -101,7 +101,11 @@ "revision": null, "source": "local", "src_sha256": null, +<<<<<<< HEAD "version": "3.10.1.0" +======= + "version": "3.11.0.0" +>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)) }, { "cabal_sha256": null, @@ -110,16 +114,24 @@ "revision": null, "source": "local", "src_sha256": null, +<<<<<<< HEAD "version": "3.10.1.0" }, { "cabal_sha256": "e3d78b13db9512aeb106e44a334ab42b7aa48d26c097299084084cb8be5c5568", +======= + "version": "3.11.0.0" + }, + { + "cabal_sha256": "29b28d2e19ae9f5ff92cea4ab8d2e185408ee5de73b4127f7b485a904c9a8b15", +>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)) "flags": [ "-devel" ], "package": "network", "revision": 0, "source": "hackage", +<<<<<<< HEAD "src_sha256": "7f7620fef1a1af3d3d6747f510e73223a5c600e7d7fd9ace073d1222bdc63d85", "version": "3.1.2.7" }, @@ -128,6 +140,16 @@ "flags": [], "package": "th-compat", "revision": 0, +======= + "src_sha256": "fde2d4b065f1984c76755004c64a29ae9ec52c8bf74f2485d805ef577e7c7822", + "version": "3.1.2.8" + }, + { + "cabal_sha256": "e5ae7c083ef3a22248558f8451669bb1c55ea8090f5908b86b9033743c161730", + "flags": [], + "package": "th-compat", + "revision": 2, +>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)) "source": "hackage", "src_sha256": "d8f97ac14ab47b6b8a7b0fdb4ff95426322ec56badd01652ac15da4a44d4bab8", "version": "0.1.4" @@ -156,24 +178,40 @@ "version": "4000.4.1" }, { +<<<<<<< HEAD "cabal_sha256": "02acedd7ac829b52756fe481a1d53294d8f5d42aaa56df560c62c6cec3587a14", +======= + "cabal_sha256": "585792335d5541dba78fa8dfcb291a89cd5812a281825ff7a44afa296ab5d58a", +>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)) "flags": [ "+integer-gmp", "-random-initial-seed" ], "package": "hashable", +<<<<<<< HEAD "revision": 0, +======= + "revision": 1, +>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)) "source": "hackage", "src_sha256": "1b4000ea82b81f69d46d0af4152c10c6303873510738e24cfc4767760d30e3f8", "version": "1.4.2.0" }, { +<<<<<<< HEAD "cabal_sha256": "2b9409023536823233ce3134558565d01b3382e651fa54ac8cb8a99967e023c9", +======= + "cabal_sha256": "46367dc0c8326dcbeb7b93f200b567491c2f6029bccf822b8bb26ee660397e08", +>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)) "flags": [ "-bench" ], "package": "async", +<<<<<<< HEAD "revision": 2, +======= + "revision": 3, +>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)) "source": "hackage", "src_sha256": "484df85be0e76c4fed9376451e48e1d0c6e97952ce79735b72d54297e7e0a725", "version": "2.2.4" @@ -236,7 +274,11 @@ "revision": null, "source": "local", "src_sha256": null, +<<<<<<< HEAD "version": "3.10.1.0" +======= + "version": "3.11.0.0" +>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)) }, { "cabal_sha256": "facd0c04925ef925ec05243471fd16055229fdf51f64db1a1049de0cc6c6dfc3", @@ -375,7 +417,11 @@ "revision": null, "source": "local", "src_sha256": null, +<<<<<<< HEAD "version": "3.10.1.0" +======= + "version": "3.11.0.0" +>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)) } ] } diff --git a/cabal-install-solver/cabal-install-solver.cabal b/cabal-install-solver/cabal-install-solver.cabal index 16a0650cbf2..e95d38e4abf 100644 --- a/cabal-install-solver/cabal-install-solver.cabal +++ b/cabal-install-solver/cabal-install-solver.cabal @@ -1,6 +1,10 @@ cabal-version: 2.2 name: cabal-install-solver +<<<<<<< HEAD version: 3.10.1.0 +======= +version: 3.11.0.0 +>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)) synopsis: The command-line interface for Cabal and Hackage. description: The solver component used in cabal-install command-line program @@ -107,8 +111,13 @@ library , array >=0.4 && <0.6 , base >=4.10 && <4.18 , bytestring >=0.10.6.0 && <0.12 +<<<<<<< HEAD , Cabal ^>=3.10 , Cabal-syntax ^>=3.10 +======= + , Cabal ^>=3.11 + , Cabal-syntax ^>=3.11 +>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)) , 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 index fed9aad89cd..9e5fee05ef9 100644 --- a/cabal-install/cabal-install.cabal +++ b/cabal-install/cabal-install.cabal @@ -1,7 +1,11 @@ Cabal-Version: 2.2 Name: cabal-install +<<<<<<< HEAD Version: 3.10.1.0 +======= +Version: 3.11.0.0 +>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)) Synopsis: The command-line interface for Cabal and Hackage. Description: The \'cabal\' command-line program simplifies the process of managing @@ -49,6 +53,7 @@ common base-dep build-depends: base >=4.10 && <4.18 common cabal-dep +<<<<<<< HEAD build-depends: Cabal ^>=3.10 common cabal-syntax-dep @@ -56,6 +61,15 @@ common cabal-syntax-dep common cabal-install-solver-dep build-depends: cabal-install-solver ^>=3.10 +======= + build-depends: Cabal ^>=3.11 + +common cabal-syntax-dep + build-depends: Cabal-syntax ^>=3.11 + +common cabal-install-solver-dep + build-depends: cabal-install-solver ^>=3.11 +>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)) library import: warnings, base-dep, cabal-dep, cabal-syntax-dep, cabal-install-solver-dep diff --git a/cabal-install/src/Distribution/Client/Version.hs b/cabal-install/src/Distribution/Client/Version.hs index 5d434820441..663082340c1 100644 --- a/cabal-install/src/Distribution/Client/Version.hs +++ b/cabal-install/src/Distribution/Client/Version.hs @@ -13,4 +13,8 @@ import Distribution.Version -- program coverage information generated by HPC, and hence was moved to be a standalone value. -- cabalInstallVersion :: Version +<<<<<<< HEAD cabalInstallVersion = mkVersion [3,10,1,0] +======= +cabalInstallVersion = mkVersion [3,11] +>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)) diff --git a/cabal-testsuite/cabal-testsuite.cabal b/cabal-testsuite/cabal-testsuite.cabal index e3ba1da7cbb..461736a5966 100644 --- a/cabal-testsuite/cabal-testsuite.cabal +++ b/cabal-testsuite/cabal-testsuite.cabal @@ -28,8 +28,13 @@ common shared build-depends: , base >= 4.9 && <4.18 -- this needs to match the in-tree lib:Cabal version +<<<<<<< HEAD , Cabal ^>= 3.10.0.0 , Cabal-syntax ^>= 3.10.0.0 +======= + , Cabal ^>= 3.11.0.0 + , Cabal-syntax ^>= 3.11.0.0 +>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)) ghc-options: -Wall -fwarn-tabs -fwarn-incomplete-uni-patterns @@ -115,6 +120,6 @@ custom-setup -- and due to Custom complexity and ConstraintSetupCabalMaxVersion -- it has to be the latest release version plus -- you have to use the latest cabal-install release - setup-depends: Cabal == 3.8.*, - Cabal-syntax == 3.8.*, + setup-depends: Cabal == 3.10.*, + Cabal-syntax == 3.10.*, base, filepath, directory diff --git a/doc/conf.py b/doc/conf.py index ef955125486..3bc57c59cd7 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -13,7 +13,11 @@ sys.path.insert(0, os.path.abspath('.')) import cabaldomain +<<<<<<< HEAD version = "3.10.1.0" +======= +version = "3.11.0.0" +>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)) extensions = [ 'sphinx.ext.extlinks', diff --git a/solver-benchmarks/solver-benchmarks.cabal b/solver-benchmarks/solver-benchmarks.cabal index b64e9d9f846..33d56f1c362 100644 --- a/solver-benchmarks/solver-benchmarks.cabal +++ b/solver-benchmarks/solver-benchmarks.cabal @@ -31,7 +31,11 @@ library base, bytestring, containers, +<<<<<<< HEAD Cabal-syntax ^>= 3.10, +======= + Cabal-syntax ^>= 3.11, +>>>>>>> dfe73930b (Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (#8844)) directory, filepath, optparse-applicative,