From 6da6449fff405c1747a062be40df233aecf81540 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 1 Aug 2023 18:53:26 -0400 Subject: [PATCH] stack.yaml: Update to build with ghc-9.6.2 and aws-0.24 This enables some new features that need the new aws. Use http-client-restricted-0.1.0 because it uses the crypton side of the cryptonite/crypton fork, which seems to be needed for ghc-9.6.2. Dependency on connection removed because of the cryptonite/crypton fork. This avoids needing a build flag. It was only used to throw a typed exception in Utility.Url, which nothing depended on. Used a fork of bloomfilter because it's not being maintained and no longer builds as-of this ghc version. (I have been trying to contact its maintainer about it, and emailed him today suggesting I take over the package.) Sponsored-by: Brock Spratlen on Patreon --- CHANGELOG | 1 + git-annex.cabal | 1 - stack.yaml | 18 +++++++----------- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index dba3259b00..2435bfd415 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -36,6 +36,7 @@ git-annex (10.20230627) UNRELEASED; urgency=medium change to using make install-home.a * git-annex.cabal: Support building with unix-compat 0.7 * Support building with unix-2.8.0. + * stack.yaml: Update to build with ghc-9.6.2 and aws-0.24. -- Joey Hess Mon, 26 Jun 2023 13:10:40 -0400 diff --git a/git-annex.cabal b/git-annex.cabal index 5495a06c11..d06ef796ab 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -347,7 +347,6 @@ Executable git-annex bloomfilter (>= 2.0.0), edit-distance, resourcet, - connection (>= 0.2.6), http-client (>= 0.5.3), http-client-tls, http-types (>= 0.7), diff --git a/stack.yaml b/stack.yaml index 7dbfb657ac..6c940c4330 100644 --- a/stack.yaml +++ b/stack.yaml @@ -11,17 +11,13 @@ flags: gitlfs: true packages: - '.' -resolver: lts-18.13 +resolver: nightly-2023-08-01 extra-deps: -- IfElse-0.85 -- aws-0.22 -- bloomfilter-2.0.1.0 -- git-lfs-1.2.0 -- http-client-restricted-0.0.4 -- network-multicast-0.3.2 -- sandi-0.5 +- git-lfs-1.2.1 +- http-client-restricted-0.1.0 - torrent-10000.1.1 -- base16-bytestring-0.1.1.7 -- base64-bytestring-1.0.0.3 - bencode-0.6.1.1 -- http-client-0.7.9 +- feed-1.3.2.1 +- git: https://github.com/sjakobi/bloomfilter.git + commit: fb79b39c44404fd791a3bed973e9d844fb084f1e +allow-newer: true -- 2.30.2