From 25854c73dbaab54ab6e903dc65b223edea6e0c5e Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Thu, 9 Nov 2017 13:54:05 -0400
Subject: [PATCH] still need stack-windows.yaml to specify newer versions of
 Win32 and unix-compat

---
 doc/install/Windows.mdwn    |  5 +++--
 git-annex.cabal             |  2 +-
 stack-windows.yaml          | 28 ++++++++++++++++++++++++++++
 stack.yaml                  |  2 +-
 standalone/windows/build.sh |  9 +++++----
 5 files changed, 38 insertions(+), 8 deletions(-)
 create mode 100644 stack-windows.yaml

diff --git a/doc/install/Windows.mdwn b/doc/install/Windows.mdwn
index 46a92fd6c4..9ae82e4a9a 100644
--- a/doc/install/Windows.mdwn
+++ b/doc/install/Windows.mdwn
@@ -39,8 +39,9 @@ for Windows. One way is to download it from
 Put it somewhere in PATH.
 
 Then open Git Bash, [[clone git-annex|download]], and in git-annex's source
-tree, run "stack build" to download and
-build all dependencies and git-annex. "stack install" will install git-annex.
+tree, run "stack build --stack-yaml stack-windows.yaml" to download and
+build all dependencies and git-annex. "stack install --stack-yaml
+stack-windows.yaml" will install git-annex.
 
 (To build the git-annex installer, you also need to install the NullSoft
 installer system. The script `standalone/windows/build.sh` is
diff --git a/git-annex.cabal b/git-annex.cabal
index f6cb10c05f..3363d12a8e 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -381,7 +381,7 @@ Executable git-annex
 
   if (os(windows))
     Build-Depends:
-      Win32 (>= 2.6.1.0),
+      Win32 (== 2.3.1.1),
       Win32-extras,
       unix-compat (>= 0.5),
       setenv,
diff --git a/stack-windows.yaml b/stack-windows.yaml
new file mode 100644
index 0000000000..7253a51432
--- /dev/null
+++ b/stack-windows.yaml
@@ -0,0 +1,28 @@
+flags:
+  git-annex:
+    concurrentoutput: true
+    production: true
+    assistant: true
+    pairing: true
+    network-uri: true
+    s3: true
+    testsuite: true
+    webdav: true
+    torrentparser: true
+    webapp: true
+    magicmime: false
+    dbus: false
+    android: false
+    androidsplice: false
+packages:
+- '.'
+extra-deps:
+- aws-0.17.1
+- bloomfilter-2.0.1.0
+- torrent-10000.1.1
+- yesod-default-1.2.0
+- Win32-2.6.1.0
+- unix-compat-0.5
+explicit-setup-deps:
+  git-annex: true
+resolver: lts-9.10
diff --git a/stack.yaml b/stack.yaml
index dc181272bf..d84c4682ef 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -23,4 +23,4 @@ extra-deps:
 - yesod-default-1.2.0
 explicit-setup-deps:
   git-annex: true
-resolver: lts-9.10
+resolver: lts-9.9
diff --git a/standalone/windows/build.sh b/standalone/windows/build.sh
index e3be18af0d..b0e6bdd4ff 100755
--- a/standalone/windows/build.sh
+++ b/standalone/windows/build.sh
@@ -64,16 +64,17 @@ getextra rsync.exe 85cb7a4d16d274fcf8069b39042965ad26abd6aa
 stack --version
 
 # Build git-annex
-stack setup
-stack install -j 1 --no-haddock --local-bin-path .
+stack setup --stack-yaml stack-windows.yaml
+stack install -j 1 --stack-yaml stack-windows.yaml --no-haddock \
+	--local-bin-path .
 
 # Build the installer
-withcygpreferred stack ghc --no-haddock \
+withcygpreferred stack ghc --stack-yaml stack-windows.yaml --no-haddock \
 	--package nsis Build/NullSoftInstaller.hs
 ./Build/NullSoftInstaller
 
 mkdir -p dist
-stack ghc --no-haddock Build/BuildVersion.hs
+stack ghc --stack-yaml stack-windows.yaml --no-haddock Build/BuildVersion.hs
 ./Build/BuildVersion > dist/build-version
 
 # Test git-annex