Skip to content

Commit 5ef9aa3

Browse files
committed
Use showStackVersion consistently
1 parent 184a7b8 commit 5ef9aa3

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

src/Stack/Nix.hs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,14 @@ module Stack.Nix
1414

1515
import Stack.Prelude
1616
import qualified Data.Text as T
17-
import Data.Version (showVersion)
1817
import Path.IO
19-
import qualified Paths_stack as Meta
2018
import Stack.Config (getInContainer, withBuildConfig)
2119
import Stack.Config.Nix (nixCompiler, nixCompilerVersion)
2220
import Stack.Constants (platformVariantEnvVar,inNixShellEnvVar,inContainerEnvVar)
2321
import Stack.Types.Config
2422
import Stack.Types.Docker
2523
import Stack.Types.Nix
24+
import Stack.Types.Version ( showStackVersion )
2625
import System.Environment (getArgs,getExecutablePath,lookupEnv)
2726
import qualified System.FilePath as F
2827
import RIO.Process (processContextL, exec)
@@ -46,7 +45,7 @@ runShellAndExit = do
4645
let args | inContainer = origArgs -- internal-re-exec version already passed
4746
-- first stack when restarting in the container
4847
| otherwise =
49-
("--" ++ reExecArgName ++ "=" ++ showVersion Meta.version) : origArgs
48+
("--" ++ reExecArgName ++ "=" ++ showStackVersion) : origArgs
5049
exePath <- liftIO getExecutablePath
5150
config <- view configL
5251
envOverride <- view processContextL

0 commit comments

Comments
 (0)