From d1b641cb1e2bcaf4e420d5a88c2a46fff4e59505 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Mon, 29 Jul 2024 20:03:58 -0400
Subject: [PATCH] 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.
---
 .appveyor.yml        |  2 +-
 CHANGELOG            |  2 ++
 git-annex.cabal      |  1 -
 stack-lts-18.13.yaml | 29 -----------------------------
 stack.yaml           |  4 ++--
 5 files changed, 5 insertions(+), 33 deletions(-)
 delete mode 100644 stack-lts-18.13.yaml

diff --git a/.appveyor.yml b/.appveyor.yml
index 82e3bfe3f6..e6ac3d2e21 100644
--- 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 471936cf93..7b74a17ca7 100644
--- 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 8d1eb7902a..a9fc14010a 100644
--- 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
index 528b85ccb9..0000000000
--- 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 6b56dc547e..9ea41be4d2 100644
--- 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