Skip to content

Commit aa063a5

Browse files
authored
Merge pull request #3205 from domenkozar/nix-use-git
When using Nix, depend on git.
2 parents 62220ce + 89fa672 commit aa063a5

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

ChangeLog.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,8 @@ Behavior changes:
147147

148148
Other enhancements:
149149

150+
* When using Nix, nix-shell now depends always on git to prevent runtime errors
151+
while fetching metadata
150152
* Internal cleanup: configuration types are now based much more on lenses
151153
* `stack build` and related commands now allow the user to disable debug symbol stripping
152154
with new `--no-strip`, `--no-library-stripping`, and `--no-executable-shipping` flags,

src/Stack/Nix.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ runShellAndExit mprojectRoot getCompilerVersion getCmdArgs = do
8383
inContainer <- getInContainer
8484
let pkgsInConfig = nixPackages (configNix config)
8585
ghc = nixCompiler compilerVersion
86-
pkgs = pkgsInConfig ++ [ghc]
86+
pkgs = pkgsInConfig ++ [ghc, "git"]
8787
pkgsStr = "[" <> T.intercalate " " pkgs <> "]"
8888
pureShell = nixPureShell (configNix config)
8989
addGCRoots = nixAddGCRoots (configNix config)

0 commit comments

Comments
 (0)