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

Don't pass rev/shortRev for dirty trees

Browse source
This commit is contained in:
Eelco Dolstra 2020-11-26 21:53:11 +01:00
parent 19576c2aea
commit 8812d6d109
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
default.nix
View file

@ -30,12 +30,14 @@ let
// (if info ? rev then { inherit (info) rev; } else {}) // (if info ? rev then { inherit (info) rev; } else {})
// (if info ? ref then { inherit (info) ref; } else {}) // (if info ? ref then { inherit (info) ref; } else {})
); );
rev = info.rev;
shortRev = builtins.substring 0 7 info.rev;
lastModified = info.lastModified; lastModified = info.lastModified;
lastModifiedDate = formatSecondsSinceEpoch info.lastModified; lastModifiedDate = formatSecondsSinceEpoch info.lastModified;
narHash = info.narHash; narHash = info.narHash;
} } // (if info ? rev then {
rev = info.rev;
shortRev = builtins.substring 0 7 info.rev;
} else {
})
else if info.type == "path" then else if info.type == "path" then
{ outPath = builtins.path { path = info.path; }; { outPath = builtins.path { path = info.path; };
narHash = info.narHash; narHash = info.narHash;
@ -78,7 +80,9 @@ let
# tree is a valid git repository. # tree is a valid git repository.
tryFetchGit = src: tryFetchGit = src:
if isGit && !isShallow if isGit && !isShallow
then builtins.fetchGit src then
let res = builtins.fetchGit src;
in if res.rev == "0000000000000000000000000000000000000000" then removeAttrs res ["rev" "shortRev"] else res
else { outPath = src; }; else { outPath = src; };
# NB git worktrees have a file for .git, so we don't check the type of .git # NB git worktrees have a file for .git, so we don't check the type of .git
isGit = builtins.pathExists (src + "/.git"); isGit = builtins.pathExists (src + "/.git");