aboutsummaryrefslogtreecommitdiff
path: root/src/libexpr/primops/flake.hh
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2019-04-16 16:18:47 +0200
committerEelco Dolstra <edolstra@gmail.com>2019-04-16 16:18:47 +0200
commit260527a90ccc23461cdc4ad73970dd4e0b2e5239 (patch)
treed42a19cf9e536d82f773c1c994e56d6668407a9d /src/libexpr/primops/flake.hh
parent3c28cb1b8ff586421ed9e37cef383af0486445cb (diff)
Use the lock file
Diffstat (limited to 'src/libexpr/primops/flake.hh')
-rw-r--r--src/libexpr/primops/flake.hh5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libexpr/primops/flake.hh b/src/libexpr/primops/flake.hh
index f93796660..85f4fdf9f 100644
--- a/src/libexpr/primops/flake.hh
+++ b/src/libexpr/primops/flake.hh
@@ -18,12 +18,12 @@ struct LockFile
struct FlakeEntry
{
FlakeRef ref;
- std::map<FlakeId, FlakeEntry> flakeEntries;
+ std::map<FlakeRef, FlakeEntry> flakeEntries;
std::map<FlakeId, FlakeRef> nonFlakeEntries;
FlakeEntry(const FlakeRef & flakeRef) : ref(flakeRef) {};
};
- std::map<FlakeId, FlakeEntry> flakeEntries;
+ std::map<FlakeRef, FlakeEntry> flakeEntries;
std::map<FlakeId, FlakeRef> nonFlakeEntries;
};
@@ -54,7 +54,6 @@ struct Flake
std::string description;
FlakeSourceInfo sourceInfo;
std::vector<FlakeRef> requires;
- LockFile lockFile;
std::map<FlakeAlias, FlakeRef> nonFlakeRequires;
Value * vProvides; // FIXME: gc
Flake(const FlakeRef & flakeRef, FlakeSourceInfo && sourceInfo)