* Propagate the deriver of a path through the substitute mechanism.

* Removed some dead code (successor stuff) from nix-push.
* Updated terminology in the tests (store expr -> drv path).
* Check that the deriver is set properly in the tests.

1 files changed, 4 insertions, 1 deletions

diff --git a/src/libstore/store.hh b/src/libstore/store.hh
index 082fc9de498d..3b18664de646 100644
--- a/src/libstore/store.hh
+++ b/src/libstore/store.hh
@@ -16,7 +16,10 @@ const int nixSchemaVersion = 2;
    path (typically by fetching it from somewhere, e.g., from the
    network). */
 struct Substitute
-{
+{       
+    /* The derivation that built this store path (empty if none). */
+    Path deriver;
+    
     /* Program to be executed to create the store path.  Must be in
        the output path of `storeExpr'. */
     Path program;