From c6046943cadd9f54fc5df46450c7235f3b2c0ff6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 1 Oct 2022 03:44:32 +0200 Subject: [PATCH] Copy aarch64-linux ISO images unconditionally --- mirror-nixos-branch.pl | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/mirror-nixos-branch.pl b/mirror-nixos-branch.pl index 5784f98..c3f8942 100755 --- a/mirror-nixos-branch.pl +++ b/mirror-nixos-branch.pl @@ -210,27 +210,23 @@ if ($bucketReleases && $bucketReleases->head_key("$releasePrefix")) { } if ($channelName =~ /nixos/) { - my $arch = "x86_64-linux"; - if ($channelName =~ /-aarch64/) { - $arch = "aarch64-linux"; - } - downloadFile("nixos.channel", "nixexprs.tar.xz"); - downloadFile("nixos.iso_minimal.$arch"); downloadFile("nixpkgs.tarball", "packages.json.br", "json-br"); + downloadFile("nixos.options", "options.json.br", "json-br"); - # Only built on the main channel (x86_64-linux) - if ($arch eq "x86_64-linux") { - downloadFile("nixos.options", "options.json.br", "json-br"); - } + downloadFile("nixos.iso_minimal.aarch64-linux"); + downloadFile("nixos.iso_minimal.x86_64-linux"); - # All of these paths are x86-specific only and are not in small channels - if ($arch eq "x86_64-linux" and $channelName !~ /-small/) { - downloadFile("nixos.iso_plasma5.$arch"); - downloadFile("nixos.iso_gnome.$arch"); + # All of these jobs are not present in small channels + if ($channelName !~ /-small/) { + downloadFile("nixos.iso_plasma5.aarch64-linux"); + downloadFile("nixos.iso_plasma5.x86_64-linux"); + + downloadFile("nixos.iso_gnome.aarch64-linux"); + downloadFile("nixos.iso_gnome.x86_64-linux"); downloadFile("nixos.iso_minimal.i686-linux"); - downloadFile("nixos.ova.$arch"); + downloadFile("nixos.ova.x86-64-linux"); } } else {