puck/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

libcmd: Installable::toStorePaths -> Installable::toStorePathSet

Browse source
This commit is contained in:
Cole Helbling 2023-12-21 10:14:54 -08:00
parent 8e64cd59b0
commit 5ed1884875
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libcmd/installables.cc
View file

@ -715,7 +715,7 @@ BuiltPaths Installable::toBuiltPaths(
} }
} }
StorePathSet Installable::toStorePaths( StorePathSet Installable::toStorePathSet(
ref<Store> evalStore, ref<Store> evalStore,
ref<Store> store, ref<Store> store,
Realise mode, OperateOn operateOn, Realise mode, OperateOn operateOn,
@ -735,7 +735,7 @@ StorePath Installable::toStorePath(
Realise mode, OperateOn operateOn, Realise mode, OperateOn operateOn,
ref<Installable> installable) ref<Installable> installable)
{ {
auto paths = toStorePaths(evalStore, store, mode, operateOn, {installable}); auto paths = toStorePathSet(evalStore, store, mode, operateOn, {installable});
if (paths.size() != 1) if (paths.size() != 1)
throw Error("argument '%s' should evaluate to one store path", installable->what()); throw Error("argument '%s' should evaluate to one store path", installable->what());

2
src/libcmd/installables.hh
View file

@ -165,7 +165,7 @@ struct Installable
const Installables & installables, const Installables & installables,
BuildMode bMode = bmNormal); BuildMode bMode = bmNormal);
static std::set<StorePath> toStorePaths( static std::set<StorePath> toStorePathSet(
ref<Store> evalStore, ref<Store> evalStore,
ref<Store> store, ref<Store> store,
Realise mode, Realise mode,

4
src/nix/develop.cc
View file

@ -376,7 +376,7 @@ struct Common : InstallableCommand, MixProfile
for (auto & [installable_, dir_] : redirects) { for (auto & [installable_, dir_] : redirects) {
auto dir = absPath(dir_); auto dir = absPath(dir_);
auto installable = parseInstallable(store, installable_); auto installable = parseInstallable(store, installable_);
auto builtPaths = Installable::toStorePaths( auto builtPaths = Installable::toStorePathSet(
getEvalStore(), store, Realise::Nothing, OperateOn::Output, {installable}); getEvalStore(), store, Realise::Nothing, OperateOn::Output, {installable});
for (auto & path: builtPaths) { for (auto & path: builtPaths) {
auto from = store->printStorePath(path); auto from = store->printStorePath(path);
@ -631,7 +631,7 @@ struct CmdDevelop : Common, MixEnvironment
bool found = false; bool found = false;
for (auto & path : Installable::toStorePaths(getEvalStore(), store, Realise::Outputs, OperateOn::Output, {bashInstallable})) { for (auto & path : Installable::toStorePathSet(getEvalStore(), store, Realise::Outputs, OperateOn::Output, {bashInstallable})) {
auto s = store->printStorePath(path) + "/bin/bash"; auto s = store->printStorePath(path) + "/bin/bash";
if (pathExists(s)) { if (pathExists(s)) {
shell = s; shell = s;