* Basic work on allowing derive expressions to build multiple paths.

  This is not entirely trivial since this introduces the possibility
  of mutual recursion.
* Made normal forms self-contained.
* Use unique ids, not content hashes, for content referencing.

1 files changed, 4 insertions, 2 deletions

diff --git a/src/globals.cc b/src/globals.cc
index 9893d7ad22..1edb38f748 100644
--- a/src/globals.cc
+++ b/src/globals.cc
@@ -2,7 +2,8 @@
 #include "db.hh"
 
 
-string dbHash2Paths = "hash2paths";
+string dbPath2Id = "path2id";
+string dbId2Paths = "id2paths";
 string dbSuccessors = "successors";
 string dbSubstitutes = "substitutes";
 
@@ -15,7 +16,8 @@ string nixDB = "/UNINIT";
 
 void initDB()
 {
-    createDB(nixDB, dbHash2Paths);
+    createDB(nixDB, dbPath2Id);
+    createDB(nixDB, dbId2Paths);
     createDB(nixDB, dbSuccessors);
     createDB(nixDB, dbSubstitutes);
 }