lix-project/flake-compat
16
0
Fork 0
Code Issues 13 Pull requests Packages Projects Releases Wiki Activity

Simplify rootSrc fetchGit logic

Browse source
This commit is contained in:
Robert Hensing 2020-10-27 11:48:33 +01:00
parent 64de97c480
commit 5ad681b894
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
default.nix
View file

@ -74,18 +74,15 @@ let
in outputs; in outputs;
rootSrc = let rootSrc = let
dir = builtins.readDir src;
gitDir = builtins.readDir (src + "/.git");
isGit = dir ? ".git";
isGitDir = isGit && dir.".git" == "directory";
isShallow = isGitDir && gitDir ? "shallow";
# Try to clean the source tree by using fetchGit, if this source # Try to clean the source tree by using fetchGit, if this source
# tree is a valid git repository. # tree is a valid git repository.
# NB git worktrees have a file for .git, so we don't check the type of .git
tryFetchGit = src: tryFetchGit = src:
if isGit && !isShallow if isGit && !isShallow
then builtins.fetchGit src then builtins.fetchGit src
else { outPath = src; }; else { outPath = src; };
# NB git worktrees have a file for .git, so we don't check the type of .git
isGit = builtins.pathExists (src + "/.git");
isShallow = builtins.pathExists (src + "/.git/shallow");
in in
(if src ? outPath then src else tryFetchGit src) (if src ? outPath then src else tryFetchGit src)