From 1bd956bed4c26ee42008100b4dd5bded7a2b1105 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 13 Nov 2017 12:55:23 -0400 Subject: [PATCH] Revert "Revert "remove dep on Win32-extras"" This reverts commit d18bc52caf6ad5ac8edd42900ad26af8c4aa4f03. --- Utility/PID.hs | 3 +-- git-annex.cabal | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Utility/PID.hs b/Utility/PID.hs index ac63045a77..f5f8aa873e 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 a73d55d15c..8f963b15ed 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -382,7 +382,6 @@ Executable git-annex if (os(windows)) Build-Depends: Win32 (>= 2.6.1.0), - Win32-extras, unix-compat (>= 0.5), setenv, process (>= 1.6.2.0)