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

Revert "remove dep on Win32-extras"

Browse source 
This reverts commit 8b5480c66a.

Yeah, too early for that too
This commit is contained in:
Joey Hess 2017-11-09 15:09:14 -04:00
parent bc4f1ed918
commit d18bc52caf
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Utility/PID.hs
View file

@ -13,7 +13,8 @@ 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, getCurrentProcessId) import System.Win32.Process (ProcessId)
import System.Win32.Process.Current (getCurrentProcessId)
#endif #endif
#ifndef mingw32_HOST_OS #ifndef mingw32_HOST_OS

3
git-annex.cabal
View file

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

2
stack-windows.yaml
View file

@ -18,7 +18,7 @@ packages:
- '.' - '.'
- location: - location:
git: https://github.com/joeyh/win32 git: https://github.com/joeyh/win32
commit: 68067eeff8e019eff64b124b9c0232e94a0e8b30 commit: 9250d2b8cadf5a98ffb3f68d933a6257c1b7e23d
extra-dep: true extra-dep: true
extra-deps: extra-deps:
- aws-0.17.1 - aws-0.17.1