update stack.yaml to nightly-2024-07-29 and remove stack-lts-18.13.yaml

Primarily because Windows needs a dependency bump to get stm-2.5.1
for Servant build flag.

This includes Win32-2.13.4.0 and aws-0.24 which adds some features
that windows had been missing out on as well.

Lots of warnings about head and tail will need to eventually be
addressed. Of course AFAIK the uses of it in git-annex are all safe.
This commit is contained in:
Joey Hess 2024-07-29 20:03:58 -04:00
parent 54f2ea2b85
commit d1b641cb1e
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
5 changed files with 5 additions and 33 deletions

View file

@ -101,7 +101,7 @@ install:
# optimisation (including when building the dependencies) # optimisation (including when building the dependencies)
before_build: before_build:
- sh: cp stack.yaml stack.yaml.build - sh: cp stack.yaml stack.yaml.build
- ps: cp stack-lts-18.13.yaml stack.yaml.build - ps: cp stack.yaml stack.yaml.build
- sh: 'echo "apply-ghc-options: everything" >> stack.yaml.build' - sh: 'echo "apply-ghc-options: everything" >> stack.yaml.build'
- ps: '"apply-ghc-options: everything" |Add-Content -Path .\stack.yaml.build' - ps: '"apply-ghc-options: everything" |Add-Content -Path .\stack.yaml.build'
- stack --stack-yaml stack.yaml.build build --only-dependencies --ghc-options=-O0 - stack --stack-yaml stack.yaml.build build --only-dependencies --ghc-options=-O0

View file

@ -20,6 +20,8 @@ git-annex (10.20240731) UNRELEASED; urgency=medium
* Added a build flag for servant, enabling annex+http urls and * Added a build flag for servant, enabling annex+http urls and
git-annex p2phttp. git-annex p2phttp.
* Added a dependency on clock. * Added a dependency on clock.
* Updated stack.yaml to nightly-2024-07-29, which can be used to build
on Windows as well, so removed stack-lts-18.13.yaml
-- Joey Hess <id@joeyh.name> Tue, 02 Jul 2024 12:14:53 -0400 -- Joey Hess <id@joeyh.name> Tue, 02 Jul 2024 12:14:53 -0400

View file

@ -35,7 +35,6 @@ Description:
-- Include only files that are needed make cabal install git-annex work. -- Include only files that are needed make cabal install git-annex work.
Extra-Source-Files: Extra-Source-Files:
stack.yaml stack.yaml
stack-lts-18.13.yaml
README README
CHANGELOG CHANGELOG
NEWS NEWS

View file

@ -1,29 +0,0 @@
flags:
git-annex:
production: true
parallelbuild: true
assistant: true
pairing: true
torrentparser: true
magicmime: false
dbus: false
debuglocks: false
benchmark: true
crypton: false
servant: false
packages:
- '.'
resolver: lts-18.13
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
- 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

View file

@ -13,6 +13,6 @@ flags:
servant: true servant: true
packages: packages:
- '.' - '.'
resolver: lts-22.9 resolver: nightly-2024-07-29
extra-deps: extra-deps:
allow-newer: true - filepath-bytestring-1.4.100.3.2