-
-
Notifications
You must be signed in to change notification settings - Fork 1.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
New store settings system #11139
base: master
Are you sure you want to change the base?
New store settings system #11139
Conversation
Following what is outlined in NixOS#10766 refactor the uds-remote-store such that the member variables (state) don't live in the store itself but in the config object. Additionally, the config object includes a new necessary constructor that takes a scheme & authority. Minor: * code formatting * cleanup of getting default path * added some comments
Co-authored-by: John Ericson <git@JohnEricson.me>
Revert back to basic constructor in store-api.cc Co-authored-by: John Ericson <git@JohnEricson.me>
Hopefully this fixes the macOS link error. It's also good for compilation time.
Not having these causes some issues with the new unit tests.
It is a property of the configuration of a store --- how a store URL is parsed into a store config, not a store itself. Progress towards NixOS#10766
This reverts commit c4c148f.
@L-as I think I need to UBSAN, because the store unit tests are failing for what looks like a random variable corruption. |
We should just enable it by default, but it causes some weird test failures. |
I don't really get the motivation for this change (another massive refactoring PR, which I assume will be followed by an even bigger change when this gets applied to the main settings). #10766 doesn't really give a motivation other than "we always go directly from a StoreReference to the Store data type directly" which is apparently a bad thing. #11106 mentions support for structured settings, but I don't see why that requires completely replacing the current This PR scatters the settings mechanism for a class like I don't really like types like:
We should really keep the template metaprogramming to a minimum! Again for readability, this is not great since looking at this code, the reader has no idea what |
I believe it's quite valuable in this situation, and not all that confusing when documented properly. For this we can make use of the language server. (not using one is cruel anyway) Example: diff --git a/src/libstore/binary-cache-store.hh b/src/libstore/binary-cache-store.hh
index af649aaab..a638248c5 100644
--- a/src/libstore/binary-cache-store.hh
+++ b/src/libstore/binary-cache-store.hh
@@ -13,6 +13,7 @@ namespace nix {
struct NarInfo;
+/** @param T Either 'nix::config::JustValue' or `nix::config::SettingInfo` */
template<template<typename> class F>
struct BinaryCacheStoreConfigT
{
diff --git a/src/libutil/config-abstract.hh b/src/libutil/config-abstract.hh
index 2c34ff50b..e7f71e700 100644
--- a/src/libutil/config-abstract.hh
+++ b/src/libutil/config-abstract.hh
@@ -5,6 +5,9 @@
namespace nix::config {
+/**
+ * Just a value, no metadata. explain explain
+ */
template<typename T>
struct JustValue
{ With docs in these positions, readers can easily navigate to the explanations in the two relevant types that instantiate the fields. Note also that when hovering over a |
Motivation
See the linked issues for details.
The most notable user-relevant bits are:
This cleans up the
MountedSSHStore
: decomposed into its orthogonal partsThis brings us pretty close to being able to then implement a JSON-based config.
Also behind the scenes have these benefits:
Context
Do not review by commits
Depends on #11033
Part of #11106
Part of #10766
Priorities and Process
Add 👍 to pull requests you find important.
The Nix maintainer team uses a GitHub project board to schedule and track reviews.