aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/CabalHelper/Compiletime/Compile.hs3
-rw-r--r--src/CabalHelper/Compiletime/Data.hs1
-rw-r--r--src/CabalHelper/Compiletime/Sandbox.hs (renamed from src/CabalHelper/Shared/Sandbox.hs)4
-rw-r--r--src/CabalHelper/Runtime/Compat.hs1
-rw-r--r--src/CabalHelper/Runtime/Main.hs1
5 files changed, 4 insertions, 6 deletions
diff --git a/src/CabalHelper/Compiletime/Compile.hs b/src/CabalHelper/Compiletime/Compile.hs
index c1c3bc4..2f4b0a9 100644
--- a/src/CabalHelper/Compiletime/Compile.hs
+++ b/src/CabalHelper/Compiletime/Compile.hs
@@ -58,10 +58,11 @@ import CabalHelper.Compiletime.Data
import CabalHelper.Compiletime.Log
import CabalHelper.Compiletime.Program.GHC
import CabalHelper.Compiletime.Program.CabalInstall
+import CabalHelper.Compiletime.Sandbox
+ ( getSandboxPkgDb )
import CabalHelper.Compiletime.Types
import CabalHelper.Shared.Common
-import CabalHelper.Shared.Sandbox (getSandboxPkgDb)
data Compile
= CompileWithCabalSource
diff --git a/src/CabalHelper/Compiletime/Data.hs b/src/CabalHelper/Compiletime/Data.hs
index 9fb5a53..07cf2d2 100644
--- a/src/CabalHelper/Compiletime/Data.hs
+++ b/src/CabalHelper/Compiletime/Data.hs
@@ -87,7 +87,6 @@ runtimeSources = $(
[ ("Runtime/Main.hs")
, ("Runtime/Compat.hs")
, ("Shared/Common.hs")
- , ("Shared/Sandbox.hs")
, ("Shared/InterfaceTypes.hs")
]
in do
diff --git a/src/CabalHelper/Shared/Sandbox.hs b/src/CabalHelper/Compiletime/Sandbox.hs
index d2172a2..5af226a 100644
--- a/src/CabalHelper/Shared/Sandbox.hs
+++ b/src/CabalHelper/Compiletime/Sandbox.hs
@@ -20,7 +20,7 @@ Description : Extracting information from @cabal.sandbox.config@ files
License : GPL-3
-}
-module CabalHelper.Shared.Sandbox where
+module CabalHelper.Compiletime.Sandbox where
import Control.Applicative
import Data.Char
@@ -67,7 +67,7 @@ extractSandboxDbDir conf = extractValue <$> parse conf
keyLen = length key
parse = listToMaybe . filter (key `isPrefixOf`) . lines
- extractValue = CabalHelper.Shared.Sandbox.dropWhileEnd isSpace . dropWhile isSpace . drop keyLen
+ extractValue = CabalHelper.Compiletime.Sandbox.dropWhileEnd isSpace . dropWhile isSpace . drop keyLen
-- dropWhileEnd is not provided prior to base 4.5.0.0.
dropWhileEnd :: (a -> Bool) -> [a] -> [a]
diff --git a/src/CabalHelper/Runtime/Compat.hs b/src/CabalHelper/Runtime/Compat.hs
index 8c32adf..eb87163 100644
--- a/src/CabalHelper/Runtime/Compat.hs
+++ b/src/CabalHelper/Runtime/Compat.hs
@@ -134,7 +134,6 @@ import Distribution.Types.GenericPackageDescription
#endif
-import CabalHelper.Shared.Sandbox
import CabalHelper.Shared.Common
import CabalHelper.Shared.InterfaceTypes
diff --git a/src/CabalHelper/Runtime/Main.hs b/src/CabalHelper/Runtime/Main.hs
index 2a72f37..775f6b0 100644
--- a/src/CabalHelper/Runtime/Main.hs
+++ b/src/CabalHelper/Runtime/Main.hs
@@ -226,7 +226,6 @@ import System.IO
import System.IO.Unsafe (unsafeInterleaveIO, unsafePerformIO)
import Text.Printf
-import CabalHelper.Shared.Sandbox
import CabalHelper.Shared.Common
import CabalHelper.Shared.InterfaceTypes
import CabalHelper.Runtime.Compat