Merge pull request #52 from helsinki-systems/aarch64-support

mirror-nixos-branch: Add aarch64 support
This commit is contained in:
Graham Christensen 2021-11-22 07:31:53 -05:00 committed by GitHub
commit af3570760b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -210,27 +210,35 @@ if ($bucketReleases && $bucketReleases->head_key("$releasePrefix")) {
} }
if ($channelName =~ /nixos/) { if ($channelName =~ /nixos/) {
my $arch = "x86_64-linux";
if ($channelName =~ /-aarch64/) {
$arch = "aarch64-linux";
}
downloadFile("nixos.channel", "nixexprs.tar.xz"); downloadFile("nixos.channel", "nixexprs.tar.xz");
downloadFile("nixos.iso_minimal.x86_64-linux"); downloadFile("nixos.iso_minimal.$arch");
downloadFile("nixpkgs.tarball", "packages.json.br", "json-br"); downloadFile("nixpkgs.tarball", "packages.json.br", "json-br");
downloadFile("nixos.options", "options.json.br", "json-br");
if ($channelName !~ /-small/) { # Only built on the main channel (x86_64-linux)
downloadFile("nixos.iso_minimal.i686-linux"); if ($arch eq "x86_64-linux") {
downloadFile("nixos.options", "options.json.br", "json-br");
}
# All of these paths are x86-specific only and are not in small channels
if ($arch eq "x86_64-linux" and $channelName !~ /-small/) {
# Renamed iso_graphcial to iso_plasma5 in 20.03 # Renamed iso_graphcial to iso_plasma5 in 20.03
if ($releaseName !~ /-19./) { if ($releaseName !~ /-19./) {
downloadFile("nixos.iso_plasma5.x86_64-linux"); downloadFile("nixos.iso_plasma5.$arch");
} else { } else {
downloadFile("nixos.iso_graphical.x86_64-linux"); downloadFile("nixos.iso_graphical.$arch");
} }
if ($releaseName !~ /-19./ && $releaseName !~ /-20.03/) { if ($releaseName !~ /-19./ && $releaseName !~ /-20.03/) {
downloadFile("nixos.iso_gnome.x86_64-linux"); downloadFile("nixos.iso_gnome.$arch");
} }
downloadFile("nixos.ova.x86_64-linux"); downloadFile("nixos.iso_minimal.i686-linux");
#downloadFile("nixos.ova.i686-linux"); downloadFile("nixos.ova.$arch");
} }
} else { } else {