New store settings system

src/build-remote/build-remote.cc

@@ -16,7 +16,7 @@
 #include "globals.hh"
 #include "serialise.hh"
 #include "build-result.hh"
-#include "store-api.hh"
+#include "store-open.hh"
 #include "strings.hh"
 #include "derivations.hh"
 #include "local-store.hh"
@@ -44,7 +44,7 @@ static AutoCloseFD openSlotLock(const Machine & m, uint64_t slot)
 
 static bool allSupportedLocally(Store & store, const std::set<std::string>& requiredFeatures) {
     for (auto & feature : requiredFeatures)
-        if (!store.systemFeatures.get().count(feature)) return false;
+        if (!store.config.systemFeatures.get().count(feature)) return false;
     return true;
 }
 
@@ -85,7 +85,7 @@ static int main_build_remote(int argc, char * * argv)
            that gets cleared on reboot, but it wouldn't work on macOS. */
         auto currentLoadName = "/current-load";
         if (auto localStore = store.dynamic_pointer_cast<LocalFSStore>())
-            currentLoad = std::string { localStore->stateDir } + currentLoadName;
+            currentLoad = std::string { localStore->config.stateDir } + currentLoadName;
         else
             currentLoad = settings.nixStateDir + currentLoadName;
 

src/libcmd/command.cc

@@ -2,7 +2,7 @@
 
 #include "command.hh"
 #include "markdown.hh"
-#include "store-api.hh"
+#include "store-open.hh"
 #include "local-fs-store.hh"
 #include "derivations.hh"
 #include "nixexpr.hh"

src/libcmd/common-eval-args.cc

@@ -9,7 +9,7 @@
 #include "registry.hh"
 #include "flake/flakeref.hh"
 #include "flake/settings.hh"
-#include "store-api.hh"
+#include "store-open.hh"
 #include "command.hh"
 #include "tarball.hh"
 #include "fetch-to-store.hh"

src/libcmd/repl.cc

@@ -11,7 +11,7 @@
 #include "eval-settings.hh"
 #include "attr-path.hh"
 #include "signals.hh"
-#include "store-api.hh"
+#include "store-open.hh"
 #include "log-store.hh"
 #include "common-eval-args.hh"
 #include "get-drvs.hh"

src/libexpr/primops/fetchClosure.cc

@@ -1,5 +1,5 @@
 #include "primops.hh"
-#include "store-api.hh"
+#include "store-open.hh"
 #include "realisation.hh"
 #include "make-content-addressed.hh"
 #include "url.hh"

src/libstore-c/nix_api_store.cc

@@ -5,6 +5,7 @@
 
 #include "path.hh"
 #include "store-api.hh"
+#include "store-open.hh"
 #include "build-result.hh"
 
 #include "globals.hh"
@@ -42,7 +43,7 @@ Store * nix_store_open(nix_c_context * context, const char * uri, const char ***
         if (!params)
             return new Store{nix::openStore(uri_str)};
 
-        nix::Store::Params params_map;
+        nix::StoreReference::Params params_map;
         for (size_t i = 0; params[i] != nullptr; i++) {
             params_map[params[i][0]] = params[i][1];
         }

src/libstore/binary-cache-store.cc

@@ -13,6 +13,7 @@
 #include "callback.hh"
 #include "signals.hh"
 #include "archive.hh"
+#include "config-parse-impl.hh"
 
 #include <chrono>
 #include <future>
@@ -24,17 +25,91 @@
 
 namespace nix {
 
-BinaryCacheStore::BinaryCacheStore(const Params & params)
-    : BinaryCacheStoreConfig(params)
-    , Store(params)
+static const BinaryCacheStoreConfigT<config::SettingInfo> binaryCacheStoreConfigDescriptions = {
+    .compression = {
+        .name = "compression",
+        .description = "NAR compression method (`xz`, `bzip2`, `gzip`, `zstd`, or `none`).",
+    },
+    .writeNARListing = {
+        .name = "write-nar-listing",
+        .description = "Whether to write a JSON file that lists the files in each NAR.",
+    },
+    .writeDebugInfo = {
+        .name = "index-debug-info",
+        .description = R"(
+          Whether to index DWARF debug info files by build ID. This allows [`dwarffs`](https://github.com/edolstra/dwarffs) to
+          fetch debug info on demand
+        )",
+    },
+    .secretKeyFile{
+        .name = "secret-key",
+        .description = "Path to the secret key used to sign the binary cache.",
+    },
+    .localNarCache{
+        .name = "local-nar-cache",
+        .description = "Path to a local cache of NARs fetched from this binary cache, used by commands such as `nix store cat`.",
+    },
+    .parallelCompression{
+        .name = "parallel-compression",
+        .description = "Enable multi-threaded compression of NARs. This is currently only available for `xz` and `zstd`.",
+    },
+    .compressionLevel{
+        .name = "compression-level",
+        .description = R"(
+          The *preset level* to be used when compressing NARs.
+          The meaning and accepted values depend on the compression method selected.
+          `-1` specifies that the default compression level should be used.
+        )",
+    },
+};
+
+#define BINARY_CACHE_STORE_CONFIG_FIELDS(X) \
+    X(compression), \
+    X(writeNARListing), \
+    X(writeDebugInfo), \
+    X(secretKeyFile), \
+    X(localNarCache), \
+    X(parallelCompression), \
+    X(compressionLevel),
+
+MAKE_PARSE(BinaryCacheStoreConfig, binaryCacheStoreConfig, BINARY_CACHE_STORE_CONFIG_FIELDS)
+
+static BinaryCacheStoreConfigT<config::JustValue> binaryCacheStoreConfigDefaults()
 {
-    if (secretKeyFile != "")
+    return {
+        .compression = {"xz"},
+        .writeNARListing = {false},
+        .writeDebugInfo = {false},
+        .secretKeyFile = {""},
+        .localNarCache = {""},
+        .parallelCompression = {false},
+        .compressionLevel = {-1},
+    };
+}
+
+MAKE_APPLY_PARSE(BinaryCacheStoreConfig, binaryCacheStoreConfig, BINARY_CACHE_STORE_CONFIG_FIELDS)
+
+BinaryCacheStore::Config::BinaryCacheStoreConfig(
+    const Store::Config & storeConfig,
+    const StoreReference::Params & params)
+    : BinaryCacheStoreConfigT<config::JustValue>{binaryCacheStoreConfigApplyParse(params)}
+    , storeConfig{storeConfig}
+{
+}
+
+BinaryCacheStore::BinaryCacheStore(const Config & config)
+    : Store{config.storeConfig}
+    , config{config}
+{
+    if (config.secretKeyFile != "")
         signer = std::make_unique<LocalSigner>(
-            SecretKey { readFile(secretKeyFile) });
+            SecretKey { readFile(config.secretKeyFile) });
 
     StringSink sink;
     sink << narVersionMagic1;
     narMagic = sink.s;
+
+    init();
 }
 
 void BinaryCacheStore::init()
@@ -55,9 +130,11 @@ void BinaryCacheStore::init()
                     throw Error("binary cache '%s' is for Nix stores with prefix '%s', not '%s'",
                         getUri(), value, storeDir);
             } else if (name == "WantMassQuery") {
-                wantMassQuery.setDefault(value == "1");
+                resolvedSubstConfig.wantMassQuery.value =
+                    config.storeConfig.wantMassQuery.optValue.value_or(value == "1");
             } else if (name == "Priority") {
-                priority.setDefault(std::stoi(value));
+                resolvedSubstConfig.priority.value =
+                    config.storeConfig.priority.optValue.value_or(std::stoi(value));
             }
         }
     }
@@ -144,7 +221,11 @@ ref<const ValidPathInfo> BinaryCacheStore::addToStoreCommon(
     {
     FdSink fileSink(fdTemp.get());
     TeeSink teeSinkCompressed { fileSink, fileHashSink };
-    auto compressionSink = makeCompressionSink(compression, teeSinkCompressed, parallelCompression, compressionLevel);
+    auto compressionSink = makeCompressionSink(
+        config.compression,
+        teeSinkCompressed,
+        config.parallelCompression,
+        config.compressionLevel);
     TeeSink teeSinkUncompressed { *compressionSink, narHashSink };
     TeeSource teeSource { narSource, teeSinkUncompressed };
     narAccessor = makeNarAccessor(teeSource);
@@ -156,17 +237,17 @@ ref<const ValidPathInfo> BinaryCacheStore::addToStoreCommon(
 
     auto info = mkInfo(narHashSink.finish());
     auto narInfo = make_ref<NarInfo>(info);
-    narInfo->compression = compression;
+    narInfo->compression = config.compression;
     auto [fileHash, fileSize] = fileHashSink.finish();
     narInfo->fileHash = fileHash;
     narInfo->fileSize = fileSize;
     narInfo->url = "nar/" + narInfo->fileHash->to_string(HashFormat::Nix32, false) + ".nar"
-                   + (compression == "xz" ? ".xz" :
-           compression == "bzip2" ? ".bz2" :
-           compression == "zstd" ? ".zst" :
-           compression == "lzip" ? ".lzip" :
-           compression == "lz4" ? ".lz4" :
-           compression == "br" ? ".br" :
+                   + (config.compression == "xz" ? ".xz" :
+           config.compression == "bzip2" ? ".bz2" :
+           config.compression == "zstd" ? ".zst" :
+           config.compression == "lzip" ? ".lzip" :
+           config.compression == "lz4" ? ".lz4" :
+           config.compression == "br" ? ".br" :
            "");
 
     auto duration = std::chrono::duration_cast<std::chrono::milliseconds>(now2 - now1).count();
@@ -188,7 +269,7 @@ ref<const ValidPathInfo> BinaryCacheStore::addToStoreCommon(
 
     /* Optionally write a JSON file containing a listing of the
        contents of the NAR. */
-    if (writeNARListing) {
+    if (config.writeNARListing) {
         nlohmann::json j = {
             {"version", 1},
             {"root", listNar(ref<SourceAccessor>(narAccessor), CanonPath::root, true)},
@@ -200,7 +281,7 @@ ref<const ValidPathInfo> BinaryCacheStore::addToStoreCommon(
     /* Optionally maintain an index of DWARF debug info files
        consisting of JSON files named 'debuginfo/<build-id>' that
        specify the NAR file and member containing the debug info. */
-    if (writeDebugInfo) {
+    if (config.writeDebugInfo) {
 
         CanonPath buildIdDir("lib/debug/.build-id");
 
@@ -512,7 +593,7 @@ void BinaryCacheStore::registerDrvOutput(const Realisation& info) {
 
 ref<SourceAccessor> BinaryCacheStore::getFSAccessor(bool requireValidPath)
 {
-    return make_ref<RemoteFSAccessor>(ref<Store>(shared_from_this()), requireValidPath, localNarCache);
+    return make_ref<RemoteFSAccessor>(ref<Store>(shared_from_this()), requireValidPath, config.localNarCache);
 }
 
 void BinaryCacheStore::addSignatures(const StorePath & storePath, const StringSet & sigs)

src/libstore/binary-cache-store.hh

@@ -13,48 +13,39 @@ namespace nix {
 
 struct NarInfo;
 
-struct BinaryCacheStoreConfig : virtual StoreConfig
+template<template<typename> class F>
+struct BinaryCacheStoreConfigT
 {
-    using StoreConfig::StoreConfig;
-
-    const Setting<std::string> compression{this, "xz", "compression",
-        "NAR compression method (`xz`, `bzip2`, `gzip`, `zstd`, or `none`)."};
-
-    const Setting<bool> writeNARListing{this, false, "write-nar-listing",
-        "Whether to write a JSON file that lists the files in each NAR."};
-
-    const Setting<bool> writeDebugInfo{this, false, "index-debug-info",
-        R"(
-          Whether to index DWARF debug info files by build ID. This allows [`dwarffs`](https://github.com/edolstra/dwarffs) to
-          fetch debug info on demand
-        )"};
-
-    const Setting<Path> secretKeyFile{this, "", "secret-key",
-        "Path to the secret key used to sign the binary cache."};
+    F<std::string> compression;
+    F<bool> writeNARListing;
+    F<bool> writeDebugInfo;
+    F<Path> secretKeyFile;
+    F<Path> localNarCache;
+    F<bool> parallelCompression;
+    F<int> compressionLevel;
+};
 
-    const Setting<Path> localNarCache{this, "", "local-nar-cache",
-        "Path to a local cache of NARs fetched from this binary cache, used by commands such as `nix store cat`."};
+struct BinaryCacheStoreConfig :
+    BinaryCacheStoreConfigT<config::JustValue>
+{
+    static config::SettingDescriptionMap descriptions();
 
-    const Setting<bool> parallelCompression{this, false, "parallel-compression",
-        "Enable multi-threaded compression of NARs. This is currently only available for `xz` and `zstd`."};
+    const Store::Config & storeConfig;
 
-    const Setting<int> compressionLevel{this, -1, "compression-level",
-        R"(
-          The *preset level* to be used when compressing NARs.
-          The meaning and accepted values depend on the compression method selected.
-          `-1` specifies that the default compression level should be used.
-        )"};
+    BinaryCacheStoreConfig(const Store::Config &, const StoreReference::Params &);
 };
 
-
 /**
  * @note subclasses must implement at least one of the two
  * virtual getFile() methods.
  */
-class BinaryCacheStore : public virtual BinaryCacheStoreConfig,
-    public virtual Store,
-    public virtual LogStore
+struct BinaryCacheStore :
+    virtual Store,
+    virtual LogStore
 {
+    using Config = BinaryCacheStoreConfig;
+
+    const Config & config;
 
 private:
     std::unique_ptr<Signer> signer;
@@ -64,7 +55,7 @@ protected:
     // The prefix under which realisation infos will be stored
     const std::string realisationsPrefix = "realisations";
 
-    BinaryCacheStore(const Params & params);
+    BinaryCacheStore(const Config &);
 
 public:
 
@@ -96,7 +87,11 @@ public:
 
 public:
 
-    virtual void init() override;
+    /**
+     * Perform any necessary effectful operation to make the store up and
+     * running
+     */
+    virtual void init();
 
 private:
 

src/libstore/build/derivation-goal.cc

@@ -1261,7 +1261,7 @@ Path DerivationGoal::openLogFile()
     /* Create a log file. */
     Path logDir;
     if (auto localStore = dynamic_cast<LocalStore *>(&worker.store))
-        logDir = localStore->logDir;
+        logDir = localStore->config->logDir;
     else
         logDir = settings.nixLogDir;
     Path dir = fmt("%s/%s/%s/", logDir, LocalFSStore::drvsLogDir, baseName.substr(0, 2));

src/libstore/build/drv-output-substitution-goal.cc

@@ -3,6 +3,7 @@
 #include "worker.hh"
 #include "substitution-goal.hh"
 #include "callback.hh"
+#include "store-open.hh"
 
 namespace nix {
 

src/libstore/build/substitution-goal.cc

@@ -1,4 +1,5 @@
 #include "worker.hh"
+#include "store-open.hh"
 #include "substitution-goal.hh"
 #include "nar-info.hh"
 #include "finally.hh"
@@ -121,7 +122,7 @@ Goal::Co PathSubstitutionGoal::init()
         /* Bail out early if this substituter lacks a valid
            signature. LocalStore::addToStore() also checks for this, but
            only after we've downloaded the path. */
-        if (!sub->isTrusted && worker.store.pathInfoIsUntrusted(*info))
+        if (!sub->config.isTrusted && worker.store.pathInfoIsUntrusted(*info))
         {
             warn("ignoring substitute for '%s' from '%s', as it's not signed by any of the keys in 'trusted-public-keys'",
                 worker.store.printStorePath(storePath), sub->getUri());
@@ -210,7 +211,7 @@ Goal::Co PathSubstitutionGoal::tryToRun(StorePath subPath, nix::ref<Store> sub,
             PushActivity pact(act.id);
 
             copyStorePath(*sub, worker.store,
-                subPath, repair, sub->isTrusted ? NoCheckSigs : CheckSigs);
+                subPath, repair, sub->config.isTrusted ? NoCheckSigs : CheckSigs);
 
             promise.set_value();
         } catch (...) {