diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-11-09 15:09:14 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-11-09 15:09:14 -0400 |
| commit | ce44f20f128ad8740b9098ad86ed70156919cd43 (patch) | |
| tree | 6da25ef8899f1389545b31752e75695cdf780843 | |
| parent | ced01d583d07d224d6638de8a95b6ba59b9f3936 (diff) | |
Revert "remove dep on Win32-extras"
This reverts commit afaf1799d47d88e1e0ace4f1bb128684761e11c1.
Yeah, too early for that too
| -rw-r--r-- | Utility/PID.hs | 3 | ||||
| -rw-r--r-- | git-annex.cabal | 3 | ||||
| -rw-r--r-- | stack-windows.yaml | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/Utility/PID.hs b/Utility/PID.hs index f5f8aa873..ac63045a7 100644 --- a/Utility/PID.hs +++ b/Utility/PID.hs @@ -13,7 +13,8 @@ module Utility.PID where import System.Posix.Types (ProcessID) import System.Posix.Process (getProcessID) #else -import System.Win32.Process (ProcessId, getCurrentProcessId) +import System.Win32.Process (ProcessId) +import System.Win32.Process.Current (getCurrentProcessId) #endif #ifndef mingw32_HOST_OS diff --git a/git-annex.cabal b/git-annex.cabal index 9268105a4..3363d12a8 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -381,7 +381,8 @@ Executable git-annex if (os(windows)) Build-Depends: - Win32 (== 2.4.0.0), + Win32 (== 2.3.1.1), + Win32-extras, unix-compat (>= 0.5), setenv, process (>= 1.4.2.0) diff --git a/stack-windows.yaml b/stack-windows.yaml index 0e108d4a1..bdacbec31 100644 --- a/stack-windows.yaml +++ b/stack-windows.yaml @@ -18,7 +18,7 @@ packages: - '.' - location: git: https://github.com/joeyh/win32 - commit: 68067eeff8e019eff64b124b9c0232e94a0e8b30 + commit: 9250d2b8cadf5a98ffb3f68d933a6257c1b7e23d extra-dep: true extra-deps: - aws-0.17.1 |