mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

remove dep on Win32-extras

Browse source 
Win32 now has its own getCurrentProcessId.
This commit is contained in:
Joey Hess 2017-11-09 14:03:06 -04:00
parent 5393479ef6
commit 8b5480c66a
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Utility/PID.hs
View file

@ -13,8 +13,7 @@ module Utility.PID where
import System.Posix.Types (ProcessID) import System.Posix.Types (ProcessID)
import System.Posix.Process (getProcessID) import System.Posix.Process (getProcessID)
#else #else
import System.Win32.Process (ProcessId) import System.Win32.Process (ProcessId, getCurrentProcessId)
import System.Win32.Process.Current (getCurrentProcessId)
#endif #endif
#ifndef mingw32_HOST_OS #ifndef mingw32_HOST_OS

3
git-annex.cabal
View file

@ -381,8 +381,7 @@ Executable git-annex
if (os(windows)) if (os(windows))
Build-Depends: Build-Depends:
Win32 (== 2.3.1.1), Win32 (>= 2.6.1.0),
Win32-extras,
unix-compat (>= 0.5), unix-compat (>= 0.5),
setenv, setenv,
process (>= 1.4.2.0) process (>= 1.4.2.0)

1
stack-windows.yaml
View file

@ -23,7 +23,6 @@ extra-deps:
- yesod-default-1.2.0 - yesod-default-1.2.0
- Win32-2.6.1.0 - Win32-2.6.1.0
- unix-compat-0.5 - unix-compat-0.5
allow-newer: true
explicit-setup-deps: explicit-setup-deps:
git-annex: true git-annex: true
resolver: lts-9.10 resolver: lts-9.10