wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-06 05:01:48 +02:00
Code Activity

binary-cache-public-keys -> trusted-public-keys

Browse source 
The name had become a misnomer since it's not only for substitution
from binary caches, but when adding/copying any
(non-content-addressed) path to a store.
This commit is contained in:
Eelco Dolstra 2017-11-20 17:29:54 +01:00
parent ea94a87493
commit 7a2b64e55c
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
5 changed files with 20 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/crypto.cc
View file

@ -105,7 +105,7 @@ PublicKeys getDefaultPublicKeys()
// FIXME: filter duplicates
for (auto s : settings.binaryCachePublicKeys.get()) {
for (auto s : settings.trustedPublicKeys.get()) {
PublicKey key(s);
publicKeys.emplace(key.name, key);
}

7
src/libstore/globals.hh
View file

@ -259,10 +259,11 @@ public:
Setting<bool> enforceDeterminism{this, true, "enforce-determinism",
"Whether to fail if repeated builds produce different output."};
Setting<Strings> binaryCachePublicKeys{this,
Setting<Strings> trustedPublicKeys{this,
{"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="},
"binary-cache-public-keys",
"Trusted public keys for secure substitution."};
"trusted-public-keys",
"Trusted public keys for secure substitution.",
{"binary-cache-public-keys"}};
Setting<Strings> secretKeyFiles{this, {}, "secret-key-files",
"Secret keys with which to sign local builds."};