lix-project/lix
18
47
Fork 24
Code Issues 333 Code Review (Gerrit) Projects 1 Releases Wiki Activity

Merge remote-tracking branch 'tweag/fixFlakeList' into flakes

Browse source
This commit is contained in:
Eelco Dolstra 2019-04-25 14:05:40 +02:00
parent 514117a6bb d867e1804a
commit e6109ec765
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/nix/flake.cc
View file

@ -30,9 +30,14 @@ struct CmdFlakeList : StoreCommand, MixEvalArgs
stopProgressBar();
for (auto & registry : registries)
for (auto & entry : registry->entries)
std::cout << entry.first << " " << entry.second << "\n";
for (auto & entry : registries[0]->entries)
std::cout << entry.first.to_string() << " flags " << entry.second.to_string() << "\n";
for (auto & entry : registries[1]->entries)
std::cout << entry.first.to_string() << " user " << entry.second.to_string() << "\n";
for (auto & entry : registries[2]->entries)
std::cout << entry.first.to_string() << " global " << entry.second.to_string() << "\n";
}
};
@ -146,7 +151,7 @@ struct CmdFlakeInfo : FlakeCommand, MixJSON, MixEvalArgs, StoreCommand
void run(nix::ref<nix::Store> store) override
{
auto evalState = std::make_shared<EvalState>(searchPath, store);
nix::Flake flake = nix::getFlake(*evalState, FlakeRef(flakeUri), true);
Flake flake = getFlake(*evalState, FlakeRef(flakeUri), true);
printFlakeInfo(flake, json);
}
};