diff options
author | 2017-11-09 14:58:37 -0400 | |
---|---|---|
committer | 2017-11-09 15:01:59 -0400 | |
commit | bdc96eda329fbe9084c21a80cfd268f9adcf9a62 (patch) | |
tree | 72378b39ea6d62e3fcbd4943bfdea30f0e075eb3 | |
parent | 6d7621aa0bded7c737e0e4091d7ca6380ce0b626 (diff) |
Revert "use win32 2.6.1.0"
This reverts commit 757a7d6e22b9faa443a4f063e1a6df3204e298c1.
Blocked by https://github.com/snoyberg/http-client/issues/309
this commit can be reverted once that's fixed.
-rw-r--r-- | git-annex.cabal | 4 | ||||
-rw-r--r-- | stack-windows.yaml | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/git-annex.cabal b/git-annex.cabal index 0d3681aa5..9268105a4 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -381,10 +381,10 @@ Executable git-annex if (os(windows)) Build-Depends: - Win32 (>= 2.6.1.0), + Win32 (== 2.4.0.0), unix-compat (>= 0.5), setenv, - process (>= 1.6.2.0) + process (>= 1.4.2.0) else Build-Depends: unix if impl(ghc <= 7.6.3) diff --git a/stack-windows.yaml b/stack-windows.yaml index 7d2bc89f9..6899abc86 100644 --- a/stack-windows.yaml +++ b/stack-windows.yaml @@ -16,16 +16,16 @@ flags: androidsplice: false packages: - '.' +- location: + git: https://github.com/joeyh/win32 + commit: 9250d2b8cadf5a98ffb3f68d933a6257c1b7e23d + 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 +- Win32-2.4.0.0 explicit-setup-deps: git-annex: true resolver: lts-9.10 |