lix-project/lix
20
55
Fork 31
Code Issues 344 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Fix sorting of non-flake input attributes

Browse source
This commit is contained in:
Eelco Dolstra 2019-09-26 17:51:51 +02:00
parent c32bba7489
commit 454e3a541a
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/libexpr/flake/flake.cc
View file

@ -146,7 +146,7 @@ static FlakeRef lookupInRefMap(
return flakeRef; return flakeRef;
} }
static SourceInfo fetchFlake(EvalState & state, const FlakeRef & resolvedRef) static SourceInfo fetchInput(EvalState & state, const FlakeRef & resolvedRef)
{ {
assert(resolvedRef.isDirect()); assert(resolvedRef.isDirect());
@ -231,7 +231,7 @@ static Flake getFlake(EvalState & state, const FlakeRef & originalRef,
maybeLookupFlake(state, maybeLookupFlake(state,
lookupInRefMap(refMap, originalRef), allowLookup)); lookupInRefMap(refMap, originalRef), allowLookup));
SourceInfo sourceInfo = fetchFlake(state, flakeRef); SourceInfo sourceInfo = fetchInput(state, flakeRef);
debug("got flake source '%s' with flakeref %s", sourceInfo.storePath, sourceInfo.resolvedRef.to_string()); debug("got flake source '%s' with flakeref %s", sourceInfo.storePath, sourceInfo.resolvedRef.to_string());
FlakeRef resolvedRef = sourceInfo.resolvedRef; FlakeRef resolvedRef = sourceInfo.resolvedRef;
@ -352,7 +352,7 @@ static SourceInfo getNonFlake(EvalState & state, const FlakeRef & originalRef,
maybeLookupFlake(state, maybeLookupFlake(state,
lookupInRefMap(refMap, originalRef), allowLookup)); lookupInRefMap(refMap, originalRef), allowLookup));
auto sourceInfo = fetchFlake(state, flakeRef); auto sourceInfo = fetchInput(state, flakeRef);
debug("got non-flake source '%s' with flakeref %s", sourceInfo.storePath, sourceInfo.resolvedRef.to_string()); debug("got non-flake source '%s' with flakeref %s", sourceInfo.storePath, sourceInfo.resolvedRef.to_string());
FlakeRef resolvedRef = sourceInfo.resolvedRef; FlakeRef resolvedRef = sourceInfo.resolvedRef;
@ -566,6 +566,8 @@ static void prim_callFlake(EvalState & state, const Pos & pos, Value * * args, V
sourceInfo.storePath, {sourceInfo.storePath}); sourceInfo.storePath, {sourceInfo.storePath});
emitSourceInfoAttrs(state, sourceInfo, v); emitSourceInfoAttrs(state, sourceInfo, v);
v.attrs->sort();
} }
} }