nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-12-03 15:40:59 +01:00
Code Activity

Merge remote-tracking branch 'detsys/detsys-main' into lazy-trees-v2

Browse source
This commit is contained in:
Eelco Dolstra 2025-05-06 19:09:09 +02:00
commit 577b331464
52 changed files with 398 additions and 235 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libcmd/include/nix/cmd/command.hh
View file

@ -214,6 +214,8 @@ struct InstallableCommand : virtual Args, SourceExprCommand
{
InstallableCommand();
virtual void preRun(ref<Store> store);
virtual void run(ref<Store> store, ref<Installable> installable) = 0;
void run(ref<Store> store) override;

7
src/libcmd/installables.cc
View file

@ -40,7 +40,7 @@ void completeFlakeInputAttrPath(
std::string_view prefix)
{
for (auto & flakeRef : flakeRefs) {
auto flake = flake::getFlake(*evalState, flakeRef, true);
auto flake = flake::getFlake(*evalState, flakeRef, fetchers::UseRegistries::All);
for (auto & input : flake.inputs)
if (hasPrefix(input.first, prefix))
completions.add(input.first);
@ -903,8 +903,13 @@ InstallableCommand::InstallableCommand()
});
}
void InstallableCommand::preRun(ref<Store> store)
{
}
void InstallableCommand::run(ref<Store> store)
{
preRun(store);
auto installable = parseInstallable(store, _installable);
run(store, std::move(installable));
}