diff options
| -rw-r--r-- | Utility/PID.hs | 3 | ||||
| -rw-r--r-- | git-annex.cabal | 3 | ||||
| -rw-r--r-- | stack-windows.yaml | 1 |
3 files changed, 2 insertions, 5 deletions
diff --git a/Utility/PID.hs b/Utility/PID.hs index ac63045a7..f5f8aa873 100644 --- a/Utility/PID.hs +++ b/Utility/PID.hs @@ -13,8 +13,7 @@ module Utility.PID where import System.Posix.Types (ProcessID) import System.Posix.Process (getProcessID) #else -import System.Win32.Process (ProcessId) -import System.Win32.Process.Current (getCurrentProcessId) +import System.Win32.Process (ProcessId, getCurrentProcessId) #endif #ifndef mingw32_HOST_OS diff --git a/git-annex.cabal b/git-annex.cabal index 3363d12a8..1312f4c58 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -381,8 +381,7 @@ Executable git-annex if (os(windows)) Build-Depends: - Win32 (== 2.3.1.1), - Win32-extras, + Win32 (>= 2.6.1.0), unix-compat (>= 0.5), setenv, process (>= 1.4.2.0) diff --git a/stack-windows.yaml b/stack-windows.yaml index 830fc0251..7253a5143 100644 --- a/stack-windows.yaml +++ b/stack-windows.yaml @@ -23,7 +23,6 @@ extra-deps: - yesod-default-1.2.0 - Win32-2.6.1.0 - unix-compat-0.5 -allow-newer: true explicit-setup-deps: git-annex: true resolver: lts-9.10 |