From 8f2829e6461198def5fcd6bd6bd0bb73d5353231 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 20 Feb 2023 15:07:48 -0400 Subject: [PATCH] Revert "stack.yaml: Update to lts-19.33 and aws-0.24" This reverts commit 648e59cac2ea9ab6ea4b6cbc50ab30b34e4938b1. Failed to build on windows, because In the dependencies for haskeline-0.8.2: Win32-2.11.1.0 from Stack configuration does not match >=2.1 && <2.10 || >=2.12 (latest matching version is 2.13.4.0) jkniiv did find a solution that builds: -- Win32-2.11.1.0 +- Win32-2.9.0.0 +- Cabal-3.6.3.0 +- directory-1.3.7.1 +- process-1.6.17.0 +- time-1.11.1.2 But that is a quite old version of Win32 and risks bugs from it, and bumping Cabal and directory to newer than lts-19.33 has seems also likely to be risky. So, I've given up. aws-0.24 won't be able to be in the stack build until there's a stackage lts (or nightly) that has filepath (>=1.4.100.0), which will not happen until sometime after the next ghc release. --- CHANGELOG | 3 --- ...s-19.33_still_causes_trouble_with_Win32.mdwn | 2 ++ ..._1_dcc2067ea1bc26510d013ca52096513f._comment | 17 +++++++++++++++++ stack.yaml | 11 +++++++---- 4 files changed, 26 insertions(+), 7 deletions(-) create mode 100644 doc/bugs/Resolver_lts-19.33_still_causes_trouble_with_Win32/comment_1_dcc2067ea1bc26510d013ca52096513f._comment diff --git a/CHANGELOG b/CHANGELOG index 43cf1a0092..a9dfdf469b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,9 +3,6 @@ git-annex (10.20230215) UNRELEASED; urgency=medium * Fix more breakage caused by git's fix for CVE-2022-24765, this time involving a remote that is a local bare repository not owned by the current user. - * view: Fix a reversion in 10.20230214 that omitted a file from a view - when the file had no metadata set, but the view only used path fields. - * stack.yaml: Update to lts-19.33 and aws-0.24 * info: Fix reversion in last release involving handling of unsupported input by continuing to handle any other inputs, before exiting nonzero at the end. diff --git a/doc/bugs/Resolver_lts-19.33_still_causes_trouble_with_Win32.mdwn b/doc/bugs/Resolver_lts-19.33_still_causes_trouble_with_Win32.mdwn index 84bda6e26c..97428699b9 100644 --- a/doc/bugs/Resolver_lts-19.33_still_causes_trouble_with_Win32.mdwn +++ b/doc/bugs/Resolver_lts-19.33_still_causes_trouble_with_Win32.mdwn @@ -422,3 +422,5 @@ Git Annex is great. I use it several times a week with my multigigabyte backups, [[!meta author=jkniiv]] [[!meta title="windows: Resolver lts-19.33 still (!) causes trouble with Win32 for stack builds"]] + +> [[fixed|done]] --[[Joey]] diff --git a/doc/bugs/Resolver_lts-19.33_still_causes_trouble_with_Win32/comment_1_dcc2067ea1bc26510d013ca52096513f._comment b/doc/bugs/Resolver_lts-19.33_still_causes_trouble_with_Win32/comment_1_dcc2067ea1bc26510d013ca52096513f._comment new file mode 100644 index 0000000000..d648bcb32a --- /dev/null +++ b/doc/bugs/Resolver_lts-19.33_still_causes_trouble_with_Win32/comment_1_dcc2067ea1bc26510d013ca52096513f._comment @@ -0,0 +1,17 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 1""" + date="2023-02-20T19:12:19Z" + content=""" +Drat. The problem is haskeline-0.8.2 depending on a different Win32 +version. I'll take your word for it that was the only dependency solution +though. + +Win32-2.9.0.0 is quite old and I don't want to risk reverting to some bug +fixed in the meantime. And I'm doubtful about bumping Cabal and directory +to newer versions too. + +So, I've reverted this attempt, and won't make another one until there's a +ghc release that has the filepath (>=1.4.100.0) that Wind32 needs. +Shouldn't be more than half a year or so.. +"""]] diff --git a/stack.yaml b/stack.yaml index c7fb4b0991..7dbfb657ac 100644 --- a/stack.yaml +++ b/stack.yaml @@ -11,14 +11,17 @@ flags: gitlfs: true packages: - '.' -resolver: lts-19.33 +resolver: lts-18.13 extra-deps: - IfElse-0.85 -- aws-0.24 +- 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.11.1.0 +- base16-bytestring-0.1.1.7 +- base64-bytestring-1.0.0.3 +- bencode-0.6.1.1 +- http-client-0.7.9