Ignore global database when copying precompiled packages #1146

ChangeLog.md

@@ -43,6 +43,7 @@ Bug fixes:
 * Add `explicit-setup-deps` option [#1110](https://github.com/commercialhaskell/stack/issues/1110), and change the default to the old behavior of using any package in the global and snapshot database [#1025](https://github.com/commercialhaskell/stack/issues/1025)
 * Precompiled cache checks full package IDs on Cabal < 1.22 [#1103](https://github.com/commercialhaskell/stack/issues/1103)
 * Pass -package-id to ghci [#867](https://github.com/commercialhaskell/stack/issues/867)
+* Ignore global packages when copying precompiled packages [#1146](https://github.com/commercialhaskell/stack/issues/1146)
 
 ## 0.1.5.0
 

src/Stack/Build/Execute.hs

@@ -903,11 +903,18 @@ singleBuild runInBase ac@ActionContext {..} ee@ExecuteEnv {..} task@Task {..} in
  announceTask task "copying precompiled package"
  forM_ mlib $ \libpath -> do
  menv <- getMinimalEnvOverride
- withMVar eeInstallLock $ \() ->
- readProcessNull Nothing menv "ghc-pkg"
+ withMVar eeInstallLock $ \() -> do
+ -- We want to ignore the global and user databases.
+ -- Unfortunately, ghc-pkg doesn't take such arguments on the
+ -- command line. Instead, we'll set GHC_PACKAGE_PATH. See:
+ -- https://github.com/commercialhaskell/stack/issues/1146
+
+ menv' <- modifyEnvOverride menv
+ $ Map.insert
+ "GHC_PACKAGE_PATH"
+ (T.pack $ toFilePath $ bcoSnapDB eeBaseConfigOpts)
+ readProcessNull Nothing menv' "ghc-pkg"
  [ "register"
- , "--no-user-package-db"
- , "--package-db=" ++ toFilePath (bcoSnapDB eeBaseConfigOpts)
  , "--force"
  , libpath
  ]

src/System/Process/Read.hs

@@ -18,6 +18,7 @@ module System.Process.Read
  ,EnvOverride(..)
  ,unEnvOverride
  ,mkEnvOverride
+ ,modifyEnvOverride
  ,envHelper
  ,doesExecutableExist
  ,findExecutable
@@ -77,6 +78,7 @@ data EnvOverride = EnvOverride
  , eoPath :: [FilePath]
  , eoExeCache :: IORef (Map FilePath (Either ReadProcessException (Path Abs File)))
  , eoExeExtension :: String
+ , eoPlatform :: Platform
  }
 
 -- | Get the environment variables from @EnvOverride@
@@ -87,6 +89,15 @@ unEnvOverride = eoTextMap
 envSearchPath :: EnvOverride -> [FilePath]
 envSearchPath = eoPath
 
+-- | Modify an EnvOverride
+modifyEnvOverride :: MonadIO m
+ => EnvOverride
+ -> (Map Text Text -> Map Text Text)
+ -> m EnvOverride
+modifyEnvOverride eo f = mkEnvOverride
+ (eoPlatform eo)
+ (f $ eoTextMap eo)
+
 -- | Create a new @EnvOverride@
 mkEnvOverride :: MonadIO m
  => Platform
@@ -100,6 +111,7 @@ mkEnvOverride platform tm' = do
  , eoPath = maybe [] (FP.splitSearchPath . T.unpack) (Map.lookup "PATH" tm)
  , eoExeCache = ref
  , eoExeExtension = if isWindows then ".exe" else ""
+ , eoPlatform = platform
  }
  where
  -- Fix case insensitivity of the PATH environment variable on Windows.