summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2017-10-22 14:20:54 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2017-10-22 14:20:54 -0400
commit43aae542d8ea23d89599f21d56e076d06924f8cf (patch)
tree9cb705a3d3c69ad12fd5a77e430c1389bc048c6f
parentfaf57cb8213e3beb39b0ec871e567dbcc1b3edb9 (diff)
try lts-9.10 with old win32
toolchain issue is preventing nightly from building anything on windows
-rw-r--r--git-annex.cabal2
-rw-r--r--standalone/windows/stack.yaml3
2 files changed, 2 insertions, 3 deletions
diff --git a/git-annex.cabal b/git-annex.cabal
index ff56ccec2..65bf31a08 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -380,7 +380,7 @@ Executable git-annex
Build-Depends: network (< 2.6), network (>= 2.4)
if (os(windows))
- Build-Depends: Win32 (>= 2.5), unix-compat (>= 0.4.1.3), setenv,
+ Build-Depends: Win32 (== 2.3.1.1), Win32-extras, unix-compat (>= 0.4.1.3), setenv,
process (>= 1.4.2.0)
else
Build-Depends: unix
diff --git a/standalone/windows/stack.yaml b/standalone/windows/stack.yaml
index edd2a8b57..54b8fe920 100644
--- a/standalone/windows/stack.yaml
+++ b/standalone/windows/stack.yaml
@@ -21,7 +21,6 @@ extra-deps:
- bloomfilter-2.0.1.0
- torrent-10000.1.1
- yesod-default-1.2.0
-- IfElse-0.85
explicit-setup-deps:
git-annex: true
-resolver: nightly-2017-10-22
+resolver: lts-9.10