wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-27 04:21:16 +02:00
Code Activity

Convert Settings to the new config system

Browse source 
This makes all config options self-documenting.

Unknown or unparseable config settings and --option flags now cause a
warning.
This commit is contained in:
Eelco Dolstra 2017-04-13 20:53:23 +02:00
parent 6bd9576aeb
commit ba9ad29fdb
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
18 changed files with 348 additions and 546 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/libstore/store-api.cc
View file

@ -719,7 +719,7 @@ ref<Store> openStore(const std::string & uri, const Store::Params & params)
for (auto fun : *RegisterStoreImplementation::implementations) {
auto store = fun(uri, params);
if (store) {
store->warnUnused();
store->warnUnknownSettings();
return ref<Store>(store);
}
}
@ -782,13 +782,10 @@ std::list<ref<Store>> getDefaultSubstituters()
state->stores.push_back(openStore(uri));
};
for (auto uri : settings.substituters)
for (auto uri : settings.substituters.get())
addStore(uri);
for (auto uri : settings.binaryCaches)
addStore(uri);
for (auto uri : settings.extraBinaryCaches)
for (auto uri : settings.extraSubstituters.get())
addStore(uri);
state->done = true;