Simplify "Store dir" superclass#13764
Merged
Ericson2314 merged 1 commit intoNixOS:masterfrom Aug 15, 2025
Merged
Conversation
github-actions
bot
added
the
store
Ericson2314
force-pushed
the
simplify-store-dir
branch
from
54290ff to
7167bbb
Compare
We can cut out some gratuitous inhertence as follows: - `MixStoreDirMethods` -> `StoreDirConfig` - `StoreDirConfig` deleted because no longer needed. It is just folded into `StoreConfig`. - `StoreDirConfigBase` -> `StoreConfigBase` same trick still needed, but now is for `StoreConfig` not `StoreDirConfig` Here's how we got here: 1. I once factored out `StoreDirConfig` in NixOS#6236. 2. I factored out `MixStoreDirMethods` in NixOS#13154. But, I didn't realize at point (2) that we didn't need `StoreDirConfig` anymore, all uses of `StoreDirConfig` could instead be uses of `MixStoreDirMethods`. Now I am doing that, and renaming `MixStoreDirMethods` to just `StoreDirConfig` to reduce churn.
Ericson2314
force-pushed
the
simplify-store-dir
branch
from
7167bbb to
64c2ee3
Compare
xokdvium
approved these changes
Aug 15, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Motivation
We can cut out some gratuitous inhertence as follows:
MixStoreDirMethods->StoreDirStoreDirConfigdeleted because no longer needed. It is just folded intoStoreConfig.StoreDirConfigBase->StoreConfigBasesame trick still needed, but now is forStoreConfignotStoreDirConfigContext
Here's how we got here:
I once factored out
StoreDirConfigin Factor outStoreDirConfig#6236.I factored out
MixStoreDirMethodsin Stores no longer inherit from their configs #13154.But, I didn't realize at point (2) that we didn't need
StoreDirConfiganymore, all uses ofStoreDirConfigcould instead be uses ofMixStoreDirMethods. Now I am doing that, and renamingMixStoreDirMethodsto justStoreDirConfigto reduce churn.Add 👍 to pull requests you find important.
The Nix maintainer team uses a GitHub project board to schedule and track reviews.