From def779b250705efec423b863d0c0d17aac964053 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 14 Nov 2022 11:56:55 -0400 Subject: [PATCH] revert change to use lts-19.32 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This reverts commit 15dd7fe84b2aa13531c80adb00efa82469724845. aws 0.23 is not used any longer, so read-only S3 import won't be supported yet when building with stack. That commit broke the build on windows, because the new version of Win32 that was included (because the old one does not work with this lts version) needs a version of filepath that is newer than the one bundled with the ghc in that lts version. It is not possible to override that to a newer filepath. Seems that the only solution to get aws 0.23 will be to wait for a ghc that contains filepath 1.4.100.0. No ghc yet contains it. (Backporting the Win32 fix to a point release version that does not include this bleeding edge filepath would also resolve it, but seems unlikely to happen.) Sponsored-by: Jarkko Kniivilä on Patreon --- CHANGELOG | 3 +-- stack.yaml | 11 +++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 6be0eeb034..99c893231b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -git-annex (10.20221104) UNRELEASED; urgency=medium +git-annex (10.20221104) upstream; urgency=medium * export: Fix a bug that left a file on a special remote when two files with the same content were both deleted in the exported tree. @@ -6,7 +6,6 @@ git-annex (10.20221104) UNRELEASED; urgency=medium This can be used, for example, with importtree=yes to import from a public bucket. This feature needs git-annex to be built with aws-0.23. - * stack.yaml: Updated to lts-19.32 -- Joey Hess Thu, 03 Nov 2022 14:07:31 -0400 diff --git a/stack.yaml b/stack.yaml index 1ab72ac200..7dbfb657ac 100644 --- a/stack.yaml +++ b/stack.yaml @@ -11,14 +11,17 @@ flags: gitlfs: true packages: - '.' -resolver: lts-19.32 +resolver: lts-18.13 extra-deps: - IfElse-0.85 -- aws-0.23 +- aws-0.22 - bloomfilter-2.0.1.0 - git-lfs-1.2.0 -- http-client-restricted-0.0.5 +- http-client-restricted-0.0.4 - network-multicast-0.3.2 - sandi-0.5 - torrent-10000.1.1 -- Win32-2.13.4.0 +- base16-bytestring-0.1.1.7 +- base64-bytestring-1.0.0.3 +- bencode-0.6.1.1 +- http-client-0.7.9 -- 2.30.2