From 8ab999595788f62193fdbc48f7b596f0222cad85 Mon Sep 17 00:00:00 2001 From: Kirill Zaborsky Date: Wed, 19 Jun 2019 09:15:32 +0300 Subject: [PATCH] Allow nix mode commands to run outside of a project --- ChangeLog.md | 4 ++++ src/Stack/Nix.hs | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index a92d94a4b9..1438b7803f 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -15,6 +15,10 @@ Other enhancements: Bug fixes: +* Allow Stack commands to be run in Nix mode without having a project file + available. See + [#4854](https://github.com/commercialhaskell/stack/issues/4864). + ## v2.1.1.1 diff --git a/src/Stack/Nix.hs b/src/Stack/Nix.hs index 134bb5df8b..788f91d17b 100644 --- a/src/Stack/Nix.hs +++ b/src/Stack/Nix.hs @@ -24,7 +24,6 @@ import Stack.Constants (platformVariantEnvVar,inNixShellEnvVar,inConta import Stack.Types.Config import Stack.Types.Docker import Stack.Types.Nix -import Stack.Docker (getProjectRoot) import System.Environment (getArgs,getExecutablePath,lookupEnv) import qualified System.FilePath as F import RIO.Process (processContextL, exec) @@ -43,10 +42,11 @@ runShellAndExit = do local (set processContextL envOverride) $ do let cmnd = escape exePath args' = map escape args - projectRoot <- getProjectRoot - mshellFile <- - traverse (resolveFile projectRoot) $ - nixInitFile (configNix config) + + mshellFile <- case configProjectRoot config of + Just projectRoot -> + traverse (resolveFile projectRoot) $ nixInitFile (configNix config) + Nothing -> pure Nothing -- This will never result in double loading the build config, since: --