diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2023-05-30 11:49:59 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2023-05-30 11:49:59 +0200 |
| commit | f3a88857b46199a44c4389f6e39b59fb9bef70d0 (patch) | |
| tree | c019fc2be2a0dc6dfa4a1e107eee4e60bc1b2673 | |
| parent | 61ddfa154bcfa522819781d23e40e984f38dfdeb (diff) | |
maintainers/upload-release.pl: Don't update nix-fallback-paths.nix
| -rwxr-xr-x | maintainers/upload-release.pl | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/maintainers/upload-release.pl b/maintainers/upload-release.pl index 77469148a..07b19c13f 100755 --- a/maintainers/upload-release.pl +++ b/maintainers/upload-release.pl @@ -15,7 +15,6 @@ my $evalId = $ARGV[0] or die "Usage: $0 EVAL-ID\n"; my $releasesBucketName = "nix-releases"; my $channelsBucketName = "nix-channels"; -my $nixpkgsDir = "/home/eelco/Dev/nixpkgs-pristine"; my $TMPDIR = $ENV{'TMPDIR'} // "/tmp"; @@ -200,26 +199,22 @@ for my $fn (glob "$tmpDir/*") { } } -# Update nix-fallback-paths.nix. +# Print new nix-fallback-paths.nix. if ($isLatest) { - system("cd $nixpkgsDir && git pull") == 0 or die; - sub getStorePath { my ($jobName) = @_; my $buildInfo = decode_json(fetch("$evalUrl/job/$jobName", 'application/json')); return $buildInfo->{buildoutputs}->{out}->{path} or die "cannot get store path for '$jobName'"; } - write_file("$nixpkgsDir/nixos/modules/installer/tools/nix-fallback-paths.nix", + print STDERR "nixos/modules/installer/tools/nix-fallback-paths.nix:\n" . "{\n" . " x86_64-linux = \"" . getStorePath("build.x86_64-linux") . "\";\n" . " i686-linux = \"" . getStorePath("build.i686-linux") . "\";\n" . " aarch64-linux = \"" . getStorePath("build.aarch64-linux") . "\";\n" . " x86_64-darwin = \"" . getStorePath("build.x86_64-darwin") . "\";\n" . " aarch64-darwin = \"" . getStorePath("build.aarch64-darwin") . "\";\n" . - "}\n"); - - system("cd $nixpkgsDir && git commit -a -m 'nix-fallback-paths.nix: Update to $version'") == 0 or die; + "}\n"; } # Update the "latest" symlink. |