mirror: Convert all system
use to run*
This commit is contained in:
parent
877e989376
commit
13154f8e86
|
@ -159,7 +159,7 @@ if ($bucketReleases && $bucketReleases->head_key("$releasePrefix")) {
|
||||||
if (! -e $dstFile) {
|
if (! -e $dstFile) {
|
||||||
print STDERR "downloading $srcFile to $dstFile...\n";
|
print STDERR "downloading $srcFile to $dstFile...\n";
|
||||||
write_file("$dstFile.sha256", "$sha256_expected $dstName");
|
write_file("$dstFile.sha256", "$sha256_expected $dstName");
|
||||||
system("NIX_REMOTE=https://cache.nixos.org/ nix --experimental-features nix-command cat-store '$srcFile' > '$dstFile.tmp'") == 0
|
runAllowFailure("NIX_REMOTE=https://cache.nixos.org/ nix --experimental-features nix-command cat-store '$srcFile' > '$dstFile.tmp'") == 0
|
||||||
or die "unable to fetch $srcFile\n";
|
or die "unable to fetch $srcFile\n";
|
||||||
rename("$dstFile.tmp", $dstFile) or die;
|
rename("$dstFile.tmp", $dstFile) or die;
|
||||||
}
|
}
|
||||||
|
@ -201,18 +201,18 @@ if ($bucketReleases && $bucketReleases->head_key("$releasePrefix")) {
|
||||||
# https://cache.nixos.org/debuginfo.
|
# https://cache.nixos.org/debuginfo.
|
||||||
if ($channelName =~ /nixos/ && -e "$tmpDir/store-paths") {
|
if ($channelName =~ /nixos/ && -e "$tmpDir/store-paths") {
|
||||||
File::Path::make_path("$tmpDir/unpack");
|
File::Path::make_path("$tmpDir/unpack");
|
||||||
system("tar", "xfJ", "$tmpDir/nixexprs.tar.xz", "-C", "$tmpDir/unpack") == 0 or die;
|
run("tar", "xfJ", "$tmpDir/nixexprs.tar.xz", "-C", "$tmpDir/unpack");
|
||||||
my $exprDir = glob("$tmpDir/unpack/*");
|
my $exprDir = glob("$tmpDir/unpack/*");
|
||||||
system("generate-programs-index $filesCache $exprDir/programs.sqlite http://nix-cache.s3.amazonaws.com/ $tmpDir/store-paths $exprDir/nixpkgs") == 0 or die;
|
run("generate-programs-index $filesCache $exprDir/programs.sqlite http://nix-cache.s3.amazonaws.com/ $tmpDir/store-paths $exprDir/nixpkgs");
|
||||||
system("index-debuginfo $filesCache s3://nix-cache $tmpDir/store-paths") == 0 or die;
|
run("index-debuginfo $filesCache s3://nix-cache $tmpDir/store-paths");
|
||||||
system("rm -f $tmpDir/nixexprs.tar.xz $exprDir/programs.sqlite-journal") == 0 or die;
|
run("rm -f $tmpDir/nixexprs.tar.xz $exprDir/programs.sqlite-journal");
|
||||||
unlink("$tmpDir/nixexprs.tar.xz.sha256");
|
unlink("$tmpDir/nixexprs.tar.xz.sha256");
|
||||||
system("tar", "cfJ", "$tmpDir/nixexprs.tar.xz", "-C", "$tmpDir/unpack", basename($exprDir)) == 0 or die;
|
run("tar", "cfJ", "$tmpDir/nixexprs.tar.xz", "-C", "$tmpDir/unpack", basename($exprDir));
|
||||||
system("rm -rf $tmpDir/unpack") == 0 or die;
|
run("rm -rf $tmpDir/unpack");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (-e "$tmpDir/store-paths") {
|
if (-e "$tmpDir/store-paths") {
|
||||||
system("xz", "$tmpDir/store-paths") == 0 or die;
|
run("xz", "$tmpDir/store-paths");
|
||||||
}
|
}
|
||||||
|
|
||||||
my $now = strftime("%F %T", localtime);
|
my $now = strftime("%F %T", localtime);
|
||||||
|
@ -268,9 +268,9 @@ if ($dryRun) {
|
||||||
|
|
||||||
# Update the nixos-* branch in the nixpkgs repo. Also update the
|
# Update the nixos-* branch in the nixpkgs repo. Also update the
|
||||||
# nixpkgs-channels repo for compatibility.
|
# nixpkgs-channels repo for compatibility.
|
||||||
system("git remote update origin >&2") == 0 or die;
|
run("git remote update origin >&2");
|
||||||
system("git push origin $rev:refs/heads/$channelName >&2") == 0 or die;
|
run("git push origin $rev:refs/heads/$channelName >&2");
|
||||||
system("git push channels $rev:refs/heads/$channelName >&2") == 0 or die;
|
run("git push channels $rev:refs/heads/$channelName >&2");
|
||||||
|
|
||||||
sub redirect {
|
sub redirect {
|
||||||
my ($from, $to) = @_;
|
my ($from, $to) = @_;
|
||||||
|
|
Loading…
Reference in a new issue