alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

lib/sources.nix@commitIdFromGitRepo: remove use of lib.splitString

Browse source 
lib.splitString was blowing up the stack in instances where the
.git/packed-refs file was too large. We now use a regexp over the
whole file instead.

Closes #16570
This commit is contained in:
obadz 2016-07-27 15:44:26 +01:00
parent 54c46d18ea
commit fee334f672
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/sources.nix
View file

@ -55,10 +55,11 @@ rec {
# packed-refs file, so we have to grep through it: # packed-refs file, so we have to grep through it:
else if lib.pathExists packedRefsName else if lib.pathExists packedRefsName
then then
let packedRefs = lib.splitString "\n" (readFile packedRefsName); let fileContent = readFile packedRefsName;
matchRule = match ("^(.*) " + file + "$"); matchRef = match ".*\n([^\n ]*) " + file + "\n.*" fileContent;
matchedRefs = lib.flatten (lib.filter (m: ! (isNull m)) (map matchRule packedRefs)); in if isNull matchRef
in lib.head matchedRefs then throw ("Could not find " + file + " in " + packedRefsName)
else lib.head matchRef
else throw ("Not a .git directory: " + path); else throw ("Not a .git directory: " + path);
in lib.flip readCommitFromFile "HEAD"; in lib.flip readCommitFromFile "HEAD";
} }