* Renamed `normalise.cc' -> `build.cc', `storeexprs.cc' ->

  `derivations.cc', etc.
* Store the SHA-256 content hash of store paths in the database after
  they have been built/added.  This is so that we can check whether
  the store has been messed with (a la `rpm --verify').
* When registering path validity, verify that the closure property
  holds.

3 files changed, 4 insertions, 4 deletions

diff --git a/src/nix-store/dotgraph.cc b/src/nix-store/dotgraph.cc
index 67473a81f45c..8fead9c0c6b8 100644
--- a/src/nix-store/dotgraph.cc
+++ b/src/nix-store/dotgraph.cc
@@ -1,5 +1,5 @@
 #include "dotgraph.hh"
-#include "normalise.hh"
+#include "build.hh"
 
 
 #if 0
diff --git a/src/nix-store/dotgraph.hh b/src/nix-store/dotgraph.hh
index ef389b30d353..9effa5a884bd 100644
--- a/src/nix-store/dotgraph.hh
+++ b/src/nix-store/dotgraph.hh
@@ -1,7 +1,7 @@
 #ifndef __DOTGRAPH_H
 #define __DOTGRAPH_H
 
-#include "storeexpr.hh"
+#include "util.hh"
 
 void printDotGraph(const PathSet & roots);
 
diff --git a/src/nix-store/main.cc b/src/nix-store/main.cc
index 7c86395a640d..f8ddfd5d7887 100644
--- a/src/nix-store/main.cc
+++ b/src/nix-store/main.cc
@@ -1,7 +1,7 @@
 #include <iostream>
 
 #include "globals.hh"
-#include "normalise.hh"
+#include "build.hh"
 #include "gc.hh"
 #include "archive.hh"
 #include "shared.hh"
@@ -187,7 +187,7 @@ static void opValidPath(Strings opFlags, Strings opArgs)
     createStoreTransaction(txn);
     for (Strings::iterator i = opArgs.begin();
          i != opArgs.end(); ++i)
-        registerValidPath(txn, *i);
+        registerValidPath(txn, *i, hashPath(htSHA256, *i));
     txn.commit();
 }