mirror of
https://github.com/privatevoid-net/nix-super.git
synced 2024-11-22 22:16:16 +02:00
* Bug fix in nix-push.
This commit is contained in:
parent
078e20885e
commit
a3ca74a1c3
1 changed files with 19 additions and 19 deletions
|
@ -10,15 +10,11 @@ until mkdir $tmpdir, 0777;
|
||||||
my $nixfile = "$tmpdir/create-nars.nix";
|
my $nixfile = "$tmpdir/create-nars.nix";
|
||||||
my $manifest = "$tmpdir/MANIFEST";
|
my $manifest = "$tmpdir/MANIFEST";
|
||||||
|
|
||||||
END { unlink $manifest; unlink $fixfile; rmdir $tmpdir; }
|
END { unlink $manifest; unlink $nixfile; rmdir $tmpdir; }
|
||||||
|
|
||||||
open NIX, ">$nixfile";
|
|
||||||
print NIX "[";
|
|
||||||
|
|
||||||
my @paths;
|
my @paths;
|
||||||
|
|
||||||
foreach my $id (@ARGV) {
|
foreach my $id (@ARGV) {
|
||||||
|
|
||||||
die unless $id =~ /^\//;
|
die unless $id =~ /^\//;
|
||||||
|
|
||||||
# Get all paths referenced by the normalisation of the given
|
# Get all paths referenced by the normalisation of the given
|
||||||
|
@ -33,10 +29,14 @@ foreach my $id (@ARGV) {
|
||||||
push @paths, $_;
|
push @paths, $_;
|
||||||
}
|
}
|
||||||
close PATHS;
|
close PATHS;
|
||||||
|
}
|
||||||
|
|
||||||
# For each path, create a Nix expression that turns the path into
|
# For each path, create a Nix expression that turns the path into
|
||||||
# a Nix archive.
|
# a Nix archive.
|
||||||
foreach my $path (@paths) {
|
open NIX, ">$nixfile";
|
||||||
|
print NIX "[";
|
||||||
|
|
||||||
|
foreach my $path (@paths) {
|
||||||
|
|
||||||
die unless ($path =~ /\/[0-9a-z]{32}.*$/);
|
die unless ($path =~ /\/[0-9a-z]{32}.*$/);
|
||||||
print "$path\n";
|
print "$path\n";
|
||||||
|
@ -48,7 +48,6 @@ foreach my $id (@ARGV) {
|
||||||
"{path = \"$path\"; system = \"@system@\"}) ";
|
"{path = \"$path\"; system = \"@system@\"}) ";
|
||||||
|
|
||||||
print NIX $nixexpr;
|
print NIX $nixexpr;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
print NIX "]";
|
print NIX "]";
|
||||||
|
@ -63,6 +62,7 @@ while (<NIDS>) {
|
||||||
chomp;
|
chomp;
|
||||||
die unless /^\//;
|
die unless /^\//;
|
||||||
push @nids, $_;
|
push @nids, $_;
|
||||||
|
print "$_\n";
|
||||||
}
|
}
|
||||||
close NIDS;
|
close NIDS;
|
||||||
|
|
||||||
|
@ -70,7 +70,7 @@ close NIDS;
|
||||||
# Realise the store expression.
|
# Realise the store expression.
|
||||||
print STDERR "creating archives...\n";
|
print STDERR "creating archives...\n";
|
||||||
system "nix-store --realise -v @nids > /dev/null";
|
system "nix-store --realise -v @nids > /dev/null";
|
||||||
if ($?) { die "`nix --realise' failed"; }
|
if ($?) { die "`nix-store --realise' failed"; }
|
||||||
|
|
||||||
my @narpaths;
|
my @narpaths;
|
||||||
open NIDS, "nix-store --query --list @nids |" or die "cannot run nix";
|
open NIDS, "nix-store --query --list @nids |" or die "cannot run nix";
|
||||||
|
|
Loading…
Reference in a new issue