summaryrefslogtreecommitdiffstats
path: root/maintainers
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2020-06-03 14:57:24 +0200
committerEelco Dolstra <edolstra@gmail.com>2020-06-15 10:28:59 +0200
commit340d0b055afb02ec7292d6cd9dd1661640158210 (patch)
tree729c9a4eabb02e399e9d850e719b35e9f9bd44f0 /maintainers
parent2853ba4ab26c254d564aee9e75fe8f9f664b94fc (diff)
upload-release.pl: Fix nix-fallback-paths.nix generation
Diffstat (limited to 'maintainers')
-rwxr-xr-xmaintainers/upload-release.pl8
1 files changed, 6 insertions, 2 deletions
diff --git a/maintainers/upload-release.pl b/maintainers/upload-release.pl
index cb584d427..baefe0f12 100755
--- a/maintainers/upload-release.pl
+++ b/maintainers/upload-release.pl
@@ -142,8 +142,12 @@ $oldName =~ s/"//g;
sub getStorePath {
my ($jobName) = @_;
my $buildInfo = decode_json(fetch("$evalUrl/job/$jobName", 'application/json'));
- die unless $buildInfo->{buildproducts}->{1}->{type} eq "nix-build";
- return $buildInfo->{buildproducts}->{1}->{path};
+ for my $product (values %{$buildInfo->{buildproducts}}) {
+ next unless $product->{type} eq "nix-build";
+ next if $product->{path} =~ /[a-z]+$/;
+ return $product->{path};
+ }
+ die;
}
write_file("$nixpkgsDir/nixos/modules/installer/tools/nix-fallback-paths.nix",