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

Merge pull request #67 from tweag/fixFlakeList

Browse source 
Fix flag registry order
This commit is contained in:
Eelco Dolstra 2019-04-30 12:45:11 +02:00 committed by GitHub
parent e6109ec765 35d1c95f7f
commit 33bd10549e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libexpr/primops/flake.cc
View file

@ -146,7 +146,7 @@ std::shared_ptr<FlakeRegistry> getFlagRegistry()
return std::make_shared<FlakeRegistry>(); return std::make_shared<FlakeRegistry>();
} }
// This always returns a vector with flakeRef, userReg, globalReg. // This always returns a vector with flakeReg, userReg, globalReg.
// If one of them doesn't exist, the registry is left empty but does exist. // If one of them doesn't exist, the registry is left empty but does exist.
const Registries EvalState::getFlakeRegistries() const Registries EvalState::getFlakeRegistries()
{ {

4
src/libexpr/primops/flake.hh
View file

@ -5,6 +5,10 @@
namespace nix { namespace nix {
static const size_t FLAG_REGISTRY = 0;
static const size_t USER_REGISTRY = 1;
static const size_t GLOBAL_REGISTRY = 2;
struct Value; struct Value;
class EvalState; class EvalState;

6
src/nix/flake.cc
View file

@ -30,13 +30,13 @@ struct CmdFlakeList : StoreCommand, MixEvalArgs
stopProgressBar(); stopProgressBar();
for (auto & entry : registries[0]->entries) for (auto & entry : registries[FLAG_REGISTRY]->entries)
std::cout << entry.first.to_string() << " flags " << entry.second.to_string() << "\n"; std::cout << entry.first.to_string() << " flags " << entry.second.to_string() << "\n";
for (auto & entry : registries[1]->entries) for (auto & entry : registries[USER_REGISTRY]->entries)
std::cout << entry.first.to_string() << " user " << entry.second.to_string() << "\n"; std::cout << entry.first.to_string() << " user " << entry.second.to_string() << "\n";
for (auto & entry : registries[2]->entries) for (auto & entry : registries[GLOBAL_REGISTRY]->entries)
std::cout << entry.first.to_string() << " global " << entry.second.to_string() << "\n"; std::cout << entry.first.to_string() << " global " << entry.second.to_string() << "\n";
} }
}; };