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

Rename 'resolvedRef' to 'lockedRef'

Browse source 
'resolvedRef' was incorrect, since a resolved ref is one after
registry resolution, which may still be unlocked (e.g. 'nixpkgs' ->
'github:NixOS/nixpkgs').
This commit is contained in:
Eelco Dolstra 2022-05-04 10:35:28 +02:00 committed by Felix Uhl
parent 87b82db881
commit b8e8f27159
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libcmd/installable-flake.cc
View file

@ -151,7 +151,7 @@ DerivedPathsWithInfo InstallableFlake::toDerivedPaths()
}, },
ExtraPathInfoFlake::Flake { ExtraPathInfoFlake::Flake {
.originalRef = flakeRef, .originalRef = flakeRef,
.resolvedRef = getLockedFlake()->flake.lockedRef, .lockedRef = getLockedFlake()->flake.lockedRef,
}), }),
}}; }};
} }

2
src/libcmd/installable-flake.hh
View file

@ -19,7 +19,7 @@ struct ExtraPathInfoFlake : ExtraPathInfoValue
*/ */
struct Flake { struct Flake {
FlakeRef originalRef; FlakeRef originalRef;
FlakeRef resolvedRef; FlakeRef lockedRef;
}; };
Flake flake; Flake flake;

14
src/nix/profile.cc
View file

@ -21,7 +21,7 @@ struct ProfileElementSource
{ {
FlakeRef originalRef; FlakeRef originalRef;
// FIXME: record original attrpath. // FIXME: record original attrpath.
FlakeRef resolvedRef; FlakeRef lockedRef;
std::string attrPath; std::string attrPath;
ExtendedOutputsSpec outputs; ExtendedOutputsSpec outputs;
@ -181,7 +181,7 @@ struct ProfileManifest
obj["priority"] = element.priority; obj["priority"] = element.priority;
if (element.source) { if (element.source) {
obj["originalUrl"] = element.source->originalRef.to_string(); obj["originalUrl"] = element.source->originalRef.to_string();
obj["url"] = element.source->resolvedRef.to_string(); obj["url"] = element.source->lockedRef.to_string();
obj["attrPath"] = element.source->attrPath; obj["attrPath"] = element.source->attrPath;
obj["outputs"] = element.source->outputs; obj["outputs"] = element.source->outputs;
} }
@ -349,7 +349,7 @@ struct CmdProfileInstall : InstallablesCommand, MixDefaultProfile
if (auto * info2 = dynamic_cast<ExtraPathInfoFlake *>(&*info)) { if (auto * info2 = dynamic_cast<ExtraPathInfoFlake *>(&*info)) {
element.source = ProfileElementSource { element.source = ProfileElementSource {
.originalRef = info2->flake.originalRef, .originalRef = info2->flake.originalRef,
.resolvedRef = info2->flake.resolvedRef, .lockedRef = info2->flake.lockedRef,
.attrPath = info2->value.attrPath, .attrPath = info2->value.attrPath,
.outputs = info2->value.extendedOutputsSpec, .outputs = info2->value.extendedOutputsSpec,
}; };
@ -588,14 +588,14 @@ struct CmdProfileUpgrade : virtual SourceExprCommand, MixDefaultProfile, MixProf
assert(infop); assert(infop);
auto & info = *infop; auto & info = *infop;
if (element.source->resolvedRef == info.flake.resolvedRef) continue; if (element.source->lockedRef == info.flake.lockedRef) continue;
printInfo("upgrading '%s' from flake '%s' to '%s'", printInfo("upgrading '%s' from flake '%s' to '%s'",
element.source->attrPath, element.source->resolvedRef, info.flake.resolvedRef); element.source->attrPath, element.source->lockedRef, info.flake.lockedRef);
element.source = ProfileElementSource { element.source = ProfileElementSource {
.originalRef = installable->flakeRef, .originalRef = installable->flakeRef,
.resolvedRef = info.flake.resolvedRef, .lockedRef = info.flake.lockedRef,
.attrPath = info.value.attrPath, .attrPath = info.value.attrPath,
.outputs = installable->extendedOutputsSpec, .outputs = installable->extendedOutputsSpec,
}; };
@ -662,7 +662,7 @@ struct CmdProfileList : virtual EvalCommand, virtual StoreCommand, MixDefaultPro
if (element.source) { if (element.source) {
logger->cout("Flake attribute: %s%s", element.source->attrPath, element.source->outputs.to_string()); logger->cout("Flake attribute: %s%s", element.source->attrPath, element.source->outputs.to_string());
logger->cout("Original flake URL: %s", element.source->originalRef.to_string()); logger->cout("Original flake URL: %s", element.source->originalRef.to_string());
logger->cout("Locked flake URL: %s", element.source->resolvedRef.to_string()); logger->cout("Locked flake URL: %s", element.source->lockedRef.to_string());
} }
logger->cout("Store paths: %s", concatStringsSep(" ", store->printStorePathSet(element.storePaths))); logger->cout("Store paths: %s", concatStringsSep(" ", store->printStorePathSet(element.storePaths)));
} }