wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 06:31:14 +02:00
Code Activity

Restore cache.nixos.org as the default substituter

Browse source 
Fixes #1283.
This commit is contained in:
Eelco Dolstra 2017-03-21 15:06:46 +01:00
parent 7347daba8c
commit 4bb38591e5
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
3 changed files with 4 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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