diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-05-10 00:11:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-10 00:11:58 +0000 |
| commit | 5b55bccfe26c0f9dde7b4cad4a2bc4b90d1d00b6 (patch) | |
| tree | 64e73ff56b64903d708862cd10699fcea908992e /maintainers | |
| parent | 9d300310141c824fe68b6905b7b3921ce05e0b7c (diff) | |
| parent | af7e39841a8e12b75d427cb496e413f8152023ce (diff) | |
Merge master into haskell-updates
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 30 | ||||
| -rwxr-xr-x | maintainers/scripts/copy-tarballs.pl | 23 |
2 files changed, 43 insertions, 10 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c922403cf5ec0..1639ab70c8fb0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -579,6 +579,12 @@ githubId = 20405311; name = "Aksh Gupta"; }; + alanpearce = { + email = "alan@alanpearce.eu"; + github = "alanpearce"; + githubId = 850317; + name = "Alan Pearce"; + }; alapshin = { email = "alapshin@fastmail.com"; github = "alapshin"; @@ -6786,6 +6792,15 @@ githubId = 54999; name = "Ariel Nunez"; }; + Intuinewin = { + email = "antoinelabarussias@gmail.com"; + github = "Intuinewin"; + githubId = 13691729; + name = "Antoine Labarussias"; + keys = [{ + fingerprint = "5CB5 9AA0 D180 1997 2FB3 E0EC 943A 1DE9 372E BE4E"; + }]; + }; ionutnechita = { email = "ionut_n2001@yahoo.com"; github = "ionutnechita"; @@ -7899,6 +7914,12 @@ githubId = 2469618; name = "Junji Hashimoto"; }; + jurraca = { + email = "julienu@pm.me"; + github = "jurraca"; + githubId = 5124422; + name = "Julien Urraca"; + }; justinas = { email = "justinas@justinas.org"; github = "justinas"; @@ -15573,6 +15594,15 @@ githubId = 57180880; name = "Ansh Tyagi"; }; + therealr5 = { + email = "rouven@rfive.de"; + github = "therealr5"; + githubId = 72568063; + name = "Rouven Seifert"; + keys = [{ + fingerprint = "1169 87A8 DD3F 78FF 8601 BF4D B95E 8FE6 B11C 4D09"; + }]; + }; therishidesai = { email = "desai.rishi1@gmail.com"; github = "therishidesai"; diff --git a/maintainers/scripts/copy-tarballs.pl b/maintainers/scripts/copy-tarballs.pl index c81b49bfb5993..2f8d250fd5291 100755 --- a/maintainers/scripts/copy-tarballs.pl +++ b/maintainers/scripts/copy-tarballs.pl @@ -50,19 +50,22 @@ while (@ARGV) { } } +my $bucket; -# S3 setup. -my $aws_access_key_id = $ENV{'AWS_ACCESS_KEY_ID'} or die "AWS_ACCESS_KEY_ID not set\n"; -my $aws_secret_access_key = $ENV{'AWS_SECRET_ACCESS_KEY'} or die "AWS_SECRET_ACCESS_KEY not set\n"; +if (not defined $ENV{DEBUG}) { + # S3 setup. + my $aws_access_key_id = $ENV{'AWS_ACCESS_KEY_ID'} or die "AWS_ACCESS_KEY_ID not set\n"; + my $aws_secret_access_key = $ENV{'AWS_SECRET_ACCESS_KEY'} or die "AWS_SECRET_ACCESS_KEY not set\n"; -my $s3 = Net::Amazon::S3->new( - { aws_access_key_id => $aws_access_key_id, - aws_secret_access_key => $aws_secret_access_key, - retry => 1, - host => "s3-eu-west-1.amazonaws.com", - }); + my $s3 = Net::Amazon::S3->new( + { aws_access_key_id => $aws_access_key_id, + aws_secret_access_key => $aws_secret_access_key, + retry => 1, + host => "s3-eu-west-1.amazonaws.com", + }); -my $bucket = $s3->bucket("nixpkgs-tarballs") or die; + $bucket = $s3->bucket("nixpkgs-tarballs") or die; +} my $doWrite = 0; my $cacheFile = ($ENV{"HOME"} or die "\$HOME is not set") . "/.cache/nix/copy-tarballs"; |