From 6e16f6587e9f6902e0e5b812253b3368ca32da7d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 13 Nov 2017 12:36:07 -0400 Subject: use win32 2.6.1.0 (second try) Using patched http-client. --- git-annex.cabal | 8 ++++++-- stack-windows.yaml | 9 +++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/git-annex.cabal b/git-annex.cabal index f16e682cf..a73d55d15 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -380,8 +380,12 @@ Executable git-annex Build-Depends: network (< 2.6), network (>= 2.4) if (os(windows)) - Build-Depends: Win32 (== 2.3.1.1), Win32-extras, unix-compat (>= 0.4.1.3), setenv, - process (>= 1.4.2.0) + Build-Depends: + Win32 (>= 2.6.1.0), + Win32-extras, + unix-compat (>= 0.5), + setenv, + process (>= 1.6.2.0) else Build-Depends: unix if impl(ghc <= 7.6.3) diff --git a/stack-windows.yaml b/stack-windows.yaml index bdacbec31..c8ae34e23 100644 --- a/stack-windows.yaml +++ b/stack-windows.yaml @@ -17,14 +17,19 @@ flags: packages: - '.' - location: - git: https://github.com/joeyh/win32 - commit: 9250d2b8cadf5a98ffb3f68d933a6257c1b7e23d + git: https://github.com/snoyberg/http-client + commit: 9207033c9869a46f7df759b56d1b317a7f542d63 extra-dep: true 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 +- directory-1.3.1.5 +- process-1.6.2.0 +allow-newer: true explicit-setup-deps: git-annex: true resolver: lts-9.10 -- cgit v1.2.3