wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-04 11:21:47 +02:00
Code Activity

Fixed dependency resolution

Browse source
This commit is contained in:
Nick Van den Broeck 2019-03-29 16:18:25 +01:00
parent 641db127be
commit 3ec0c82fab
4 changed files with 168 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -19,6 +19,20 @@ struct FlakeRegistry
std::map<FlakeId, Entry> entries;
};
struct LockFile
{
struct FlakeEntry
{
FlakeRef ref;
std::map<FlakeId, FlakeEntry> flakeEntries;
std::map<FlakeId, FlakeRef> nonFlakeEntries;
FlakeEntry(const FlakeRef & flakeRef) : ref(flakeRef) {};
};
std::map<FlakeId, FlakeEntry> flakeEntries;
std::map<FlakeId, FlakeRef> nonFlakeEntries;
};
Path getUserRegistryPath();
Value * makeFlakeRegistryValue(EvalState & state);
@ -37,7 +51,7 @@ struct Flake
Path path;
std::optional<uint64_t> revCount;
std::vector<FlakeRef> requires;
std::shared_ptr<FlakeRegistry> lockFile;
LockFile lockFile;
std::map<FlakeId, FlakeRef> nonFlakeRequires;
Value * vProvides; // FIXME: gc
// date
@ -55,18 +69,17 @@ struct NonFlake
NonFlake(const FlakeRef flakeRef) : ref(flakeRef) {};
};
Flake getFlake(EvalState &, const FlakeRef &);
Flake getFlake(EvalState &, const FlakeRef &, bool impureIsAllowed);
struct Dependencies
{
FlakeId topFlakeId;
std::vector<Flake> flakes;
std::vector<NonFlake> nonFlakes;
Flake flake;
std::vector<Dependencies> flakeDeps; // The flake dependencies
std::vector<NonFlake> nonFlakeDeps;
Dependencies(const Flake & flake) : flake(flake) {}
};
Dependencies resolveFlake(EvalState &, const FlakeRef &, bool impureTopRef);
Dependencies resolveFlake(EvalState &, const FlakeRef &, bool impureTopRef, bool isTopFlake);
FlakeRegistry updateLockFile(EvalState &, Flake &);
void updateLockFile(EvalState &, Path);
void updateLockFile(EvalState &, Path path, bool impureTopRef);
}