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

Factor out resolveStoreConfig

Browse source 
Leverage #10766 to show how we can now resolve a store configuration
without actually opening the store for that resolved configuration.

Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
This commit is contained in:
John Ericson 2025-05-14 18:21:39 -04:00
parent 12b7132209
commit d7481b4b63
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 { 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 * @return a Store object to access the Nix store denoted by
* ‘uri’ (slight misnomer...). * ‘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) 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; auto & params = storeURI.params;
@ -58,10 +65,7 @@ ref<Store> openStore(StoreReference && storeURI)
experimentalFeatureSettings.require(storeConfig->experimentalFeature()); experimentalFeatureSettings.require(storeConfig->experimentalFeature());
storeConfig->warnUnknownSettings(); storeConfig->warnUnknownSettings();
auto store = storeConfig->openStore(); return storeConfig;
store->init();
return store;
} }
std::list<ref<Store>> getDefaultSubstituters() std::list<ref<Store>> getDefaultSubstituters()