From 340d0b055afb02ec7292d6cd9dd1661640158210 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 3 Jun 2020 14:57:24 +0200
Subject: [PATCH] upload-release.pl: Fix nix-fallback-paths.nix generation
---
maintainers/upload-release.pl | 8 ++++++--
1 file 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",
--
GitLab