wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-24 22:11:15 +02:00
Code Activity

Merge pull request #13192 from NixOS/store-open-reg-header

Browse source 
Factor out `resolveStoreConfig`
This commit is contained in:
John Ericson 2025-05-14 19:20:05 -04:00 • committed by GitHub
commit 1b22f0252d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/libstore/include/nix/store/store-open.hh
View file

@ -15,6 +15,11 @@
namespace nix {
/**
* @return The store config denoted by `storeURI` (slight misnomer...).
*/
ref<StoreConfig> resolveStoreConfig(StoreReference && storeURI);
/**
* @return a Store object to access the Nix store denoted by
* ‘uri’ (slight misnomer...).

12
src/libstore/store-registration.cc
View file

@ -11,6 +11,13 @@ ref<Store> openStore(const std::string & uri, const Store::Config::Params & extr
}
ref<Store> openStore(StoreReference && storeURI)
{
auto store = resolveStoreConfig(std::move(storeURI))->openStore();
store->init();
return store;
}
ref<StoreConfig> resolveStoreConfig(StoreReference && storeURI)
{
auto & params = storeURI.params;
@ -58,10 +65,7 @@ ref<Store> openStore(StoreReference && storeURI)
experimentalFeatureSettings.require(storeConfig->experimentalFeature());
storeConfig->warnUnknownSettings();
auto store = storeConfig->openStore();
store->init();
return store;
return storeConfig;
}
std::list<ref<Store>> getDefaultSubstituters()