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.

diff --git a/.appveyor.yml b/.appveyor.yml
index 82e3bfe3f657a95629acca6c6fad298af25b2014..e6ac3d2e215e369154e5847fe332127171017045 100644 (file)
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -101,7 +101,7 @@ install:
 # optimisation (including when building the dependencies) 
 before_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'
   - ps: '"apply-ghc-options: everything" |Add-Content -Path .\stack.yaml.build'
   - stack --stack-yaml stack.yaml.build build --only-dependencies --ghc-options=-O0

diff --git a/CHANGELOG b/CHANGELOG
index 471936cf93b80ca78a979aca4c3c60a11917548c..7b74a17ca7a0ac7d25c40a75df50b6dd88e2adb7 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -20,6 +20,8 @@ git-annex (10.20240731) UNRELEASED; urgency=medium
   * Added a build flag for servant, enabling annex+http urls and 
     git-annex p2phttp.
   * 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
 

diff --git a/git-annex.cabal b/git-annex.cabal
index 8d1eb7902a79d6c3ebab34ac547a8c18d078266a..a9fc14010a79932310d6569ee2e61a5347735e5f 100644 (file)
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -35,7 +35,6 @@ Description:
 -- Include only files that are needed make cabal install git-annex work.
 Extra-Source-Files:
   stack.yaml
-  stack-lts-18.13.yaml
   README
   CHANGELOG
   NEWS

diff --git a/stack-lts-18.13.yaml b/stack-lts-18.13.yaml
deleted file mode 100644 (file)
index 528b85c..0000000
--- a/stack-lts-18.13.yaml
+++ /dev/null
@@ -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

diff --git a/stack.yaml b/stack.yaml
index 6b56dc547ea42db8d65b3b2d3c458c7383c0ec98..9ea41be4d27f232bbf392110627a913e6e8ad395 100644 (file)
--- a/stack.yaml
+++ b/stack.yaml
@@ -13,6 +13,6 @@ flags:
     servant: true
 packages:
 - '.'
-resolver: lts-22.9
+resolver: nightly-2024-07-29
 extra-deps:
-allow-newer: true
+ - filepath-bytestring-1.4.100.3.2