* Use `--query --requisites' and include successors when pushing. Don't

  use `--query --generators' anymore.

1 files changed, 8 insertions, 8 deletions

diff --git a/scripts/nix-push.in b/scripts/nix-push.in
index 4a6426fe0aed..10efc48be158 100644
--- a/scripts/nix-push.in
+++ b/scripts/nix-push.in
@@ -13,7 +13,7 @@ foreach my $id (@ARGV) {
 
     my @paths;
 
-    open PATHS, "nix --query --refs $id 2> /dev/null |" or die "nix -qr";
+    open PATHS, "nix --query --requisites --include-successors $id 2> /dev/null |" or die "nix -qr";
     while (<PATHS>) {
         chomp;
         die "bad: $_" unless /^\//;
@@ -22,13 +22,13 @@ foreach my $id (@ARGV) {
     close PATHS;
 
     # Also add all normal forms that are contained in these paths.
-    open PATHS, "nix --query --generators --path @paths |" or die "nix -qg";
-    while (<PATHS>) {
-	chomp;
-        die "bad: $_" unless /^\//;
-	push @paths, $_;
-    }
-    close PATHS;
+#    open PATHS, "nix --query --generators --path @paths |" or die "nix -qg";
+#    while (<PATHS>) {
+#	chomp;
+#        die "bad: $_" unless /^\//;
+#	push @paths, $_;
+#    }
+#    close PATHS;
 
     # For each path, create a Fix expression that turns the path into
     # a Nix archive.