mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

revert change to use lts-19.32

Browse source 
This reverts commit 15dd7fe84b.

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
This commit is contained in:
Joey Hess 2022-11-14 11:56:55 -04:00
parent a91bf72684
commit def779b250
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG
View file

@ -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 * 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. 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 This can be used, for example, with importtree=yes to import from
a public bucket. a public bucket.
This feature needs git-annex to be built with aws-0.23. This feature needs git-annex to be built with aws-0.23.
* stack.yaml: Updated to lts-19.32
-- Joey Hess <id@joeyh.name> Thu, 03 Nov 2022 14:07:31 -0400 -- Joey Hess <id@joeyh.name> Thu, 03 Nov 2022 14:07:31 -0400

11
stack.yaml
View file

@ -11,14 +11,17 @@ flags:
gitlfs: true gitlfs: true
packages: packages:
- '.' - '.'
resolver: lts-19.32 resolver: lts-18.13
extra-deps: extra-deps:
- IfElse-0.85 - IfElse-0.85
- aws-0.23 - aws-0.22
- bloomfilter-2.0.1.0 - bloomfilter-2.0.1.0
- git-lfs-1.2.0 - git-lfs-1.2.0
- http-client-restricted-0.0.5 - http-client-restricted-0.0.4
- network-multicast-0.3.2 - network-multicast-0.3.2
- sandi-0.5 - sandi-0.5
- torrent-10000.1.1 - 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