From 7055ed76a11aa1bfe33bf7532af0ef3fd15f7cd0 Mon Sep 17 00:00:00 2001 From: Sergei Zimmerman Date: Thu, 1 Jan 2026 22:21:15 +0300 Subject: [PATCH] upload-release.pl: Fix up nix-channels bucket location, use awscli2 I messed up and accidentally configured the S3 client to use the same host as the nix-releases bucket, but nix-channels is us-east-1 and nix-releases is eu-west-1. (cherry picked from commit 0900638f1d2660bf06a3e640bba607e0a529dffe) --- maintainers/upload-release.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/maintainers/upload-release.pl b/maintainers/upload-release.pl index 2bd99ded8..f7678b7d1 100755 --- a/maintainers/upload-release.pl +++ b/maintainers/upload-release.pl @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i perl -p awscli perl perlPackages.LWPUserAgent perlPackages.LWPProtocolHttps perlPackages.FileSlurp perlPackages.NetAmazonS3 perlPackages.GetoptLongDescriptive gnupg1 +#! nix-shell -i perl -p awscli2 perl perlPackages.LWPUserAgent perlPackages.LWPProtocolHttps perlPackages.FileSlurp perlPackages.NetAmazonS3 perlPackages.GetoptLongDescriptive gnupg1 use strict; use Getopt::Long::Descriptive; @@ -112,8 +112,8 @@ unless ($opt->skip_s3) { aws_secret_access_key => $aws_secret_access_key, $aws_session_token ? (aws_session_token => $aws_session_token) : (), retry => 1, - host => $opt->s3_host, - secure => ($opt->s3_endpoint && $opt->s3_endpoint =~ /^http:/) ? 0 : 1, + $opt->s3_endpoint ? (host => $opt->s3_host) : (), + $opt->s3_endpoint ? (secure => ($opt->s3_endpoint =~ /^http:/) ? 0 : 1) : (), }); $channelsBucket = $s3_channels->bucket($channelsBucketName) or die;