* Get rid of the substitutes database table (NIX-47). Instead, if we

  need any info on substitutable paths, we just call the substituters
  (such as download-using-manifests.pl) directly.  This means that
  it's no longer necessary for nix-pull to register substitutes or for
  nix-channel to clear them, which makes those operations much faster
  (NIX-95).  Also, we don't have to worry about keeping nix-pull
  manifests (in /nix/var/nix/manifests) and the database in sync with
  each other.

  The downside is that there is some overhead in calling an external
  program to get the substitutes info.  For instance, "nix-env -qas"
  takes a bit longer.

  Abolishing the substitutes table also makes the logic in
  local-store.cc simpler, as we don't need to store info for invalid
  paths.  On the downside, you cannot do things like "nix-store -qR"
  on a substitutable but invalid path (but nobody did that anyway).

* Never catch interrupts (the Interrupted exception).

1 files changed, 0 insertions, 38 deletions

diff --git a/scripts/nix-pull.in b/scripts/nix-pull.in
index ff83f2857c9d..378d9a363e98 100644
--- a/scripts/nix-pull.in
+++ b/scripts/nix-pull.in
@@ -108,41 +108,3 @@ while (@ARGV) {
 
 my $size = scalar (keys %narFiles) + scalar (keys %localPaths);
 print "$size store paths in manifest\n";
-
-
-# Register all substitutes.
-print STDERR "registering substitutes...\n";
-
-my $pid = open(WRITE, "|$binDir/nix-store --register-substitutes")
-    or die "cannot run nix-store";
-
-sub writeRegistration {
-    my $storePath = shift;
-    my $object = shift;
-    print WRITE "$storePath\n";
-    print WRITE "$object->{deriver}\n";
-    print WRITE "$libexecDir/nix/download-using-manifests.pl\n";
-    print WRITE "0\n";
-    my @references = split " ", $object->{references};
-    my $count = scalar @references;
-    print WRITE "$count\n";
-    foreach my $reference (@references) {
-        print WRITE "$reference\n";
-    }
-}
-
-foreach my $storePath (keys %narFiles) {
-    my $narFileList = $narFiles{$storePath};
-    foreach my $narFile (@{$narFileList}) {
-        writeRegistration $storePath, $narFile;
-    }
-}
-
-foreach my $storePath (keys %localPaths) {
-    my $localPathList = $localPaths{$storePath};
-    foreach my $localPath (@{$localPathList}) {
-        writeRegistration $storePath, $localPath;
-    }
-}
-
-close WRITE or die "nix-store failed: $?";