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

FlakeAlias is implemented

Browse source
This commit is contained in:
Nick Van den Broeck 2019-03-21 09:30:16 +01:00
parent f39670c631
commit c64f98b883
6 changed files with 129 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -16,7 +16,7 @@ struct FlakeRegistry
Entry(const FlakeRef & flakeRef) : ref(flakeRef) {};
Entry operator=(const Entry & entry) { return Entry(entry.ref); }
};
std::map<FlakeId, Entry> entries;
std::map<FlakeAlias, Entry> entries;
};
struct LockFile
@ -52,7 +52,7 @@ struct Flake
std::optional<uint64_t> revCount;
std::vector<FlakeRef> requires;
LockFile lockFile;
std::map<FlakeId, FlakeRef> nonFlakeRequires;
std::map<FlakeAlias, FlakeRef> nonFlakeRequires;
Value * vProvides; // FIXME: gc
// date
// content hash
@ -61,7 +61,7 @@ struct Flake
struct NonFlake
{
FlakeId id;
FlakeAlias alias;
FlakeRef ref;
Path path;
// date
@ -81,5 +81,7 @@ struct Dependencies
Dependencies resolveFlake(EvalState &, const FlakeRef &, bool impureTopRef, bool isTopFlake);
void updateLockFile(EvalState &, Path path, bool impureTopRef);
FlakeRegistry updateLockFile(EvalState &, Flake &);
void updateLockFile(EvalState &, Path path);
}