* Show more progress.

This commit is contained in:
Eelco Dolstra 2006-11-18 19:03:45 +00:00
parent 0541ddc7e3
commit d941186289

View file

@ -81,7 +81,7 @@ sub update {
# Pull cache manifests. # Pull cache manifests.
foreach my $url (@channels) { foreach my $url (@channels) {
print "pulling cache manifest from `$url'\n"; #print "pulling cache manifest from `$url'\n";
system("@bindir@/nix-pull", "--skip-wrong-store", "$url/MANIFEST") == 0 system("@bindir@/nix-pull", "--skip-wrong-store", "$url/MANIFEST") == 0
or die "cannot pull cache manifest from `$url'"; or die "cannot pull cache manifest from `$url'";
} }
@ -92,6 +92,7 @@ sub update {
my $nixExpr = "["; my $nixExpr = "[";
foreach my $url (@channels) { foreach my $url (@channels) {
my $fullURL = "$url/nixexprs.tar.bz2"; my $fullURL = "$url/nixexprs.tar.bz2";
print "downloading Nix expressions from `$fullURL'...\n";
$ENV{"PRINT_PATH"} = 1; $ENV{"PRINT_PATH"} = 1;
my ($hash, $path) = `@bindir@/nix-prefetch-url '$fullURL' 2> /dev/null`; my ($hash, $path) = `@bindir@/nix-prefetch-url '$fullURL' 2> /dev/null`;
die "cannot fetch `$fullURL'" if $? != 0; die "cannot fetch `$fullURL'" if $? != 0;
@ -111,6 +112,7 @@ sub update {
my $rootFile = "$rootsDir/$userName"; my $rootFile = "$rootsDir/$userName";
# Instantiate the Nix expression. # Instantiate the Nix expression.
print "unpacking channel Nix expressions...\n";
my $storeExpr = `echo '$nixExpr' | @bindir@/nix-instantiate --add-root '$rootFile'.tmp -` my $storeExpr = `echo '$nixExpr' | @bindir@/nix-instantiate --add-root '$rootFile'.tmp -`
or die "cannot instantiate Nix expression"; or die "cannot instantiate Nix expression";
chomp $storeExpr; chomp $storeExpr;