mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Include the cache.nixos.org signing key by default

Browse source
This commit is contained in:
Eelco Dolstra 2015-06-01 17:14:03 +02:00
parent bc51175dc0
commit b8b571cfc1
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
perl/lib/Nix/Config.pm.in
View file

@ -23,6 +23,8 @@ $useBindings = "@perlbindings@" eq "yes";
%binaryCachePublicKeys = (); %binaryCachePublicKeys = ();
$defaultPublicKeys = "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=";
sub readConfig { sub readConfig {
if (defined $ENV{'_NIX_OPTIONS'}) { if (defined $ENV{'_NIX_OPTIONS'}) {
foreach my $s (split '\n', $ENV{'_NIX_OPTIONS'}) { foreach my $s (split '\n', $ENV{'_NIX_OPTIONS'}) {
@ -41,7 +43,7 @@ sub readConfig {
close CONFIG; close CONFIG;
} }
foreach my $s (split(/ /, $config{"binary-cache-public-keys"} // "")) { foreach my $s (split(/ /, $config{"binary-cache-public-keys"} // $defaultPublicKeys)) {
my ($keyName, $publicKey) = split ":", $s; my ($keyName, $publicKey) = split ":", $s;
next unless defined $keyName && defined $publicKey; next unless defined $keyName && defined $publicKey;
$binaryCachePublicKeys{$keyName} = decode_base64($publicKey); $binaryCachePublicKeys{$keyName} = decode_base64($publicKey);