Skip to content
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

Ensure all store types support "real" URIs #9850

Merged
merged 1 commit into from
May 21, 2024

Conversation

Ericson2314
Copy link
Member

Motivation

In particular local://<path> and unix:// (without any path) now work, and mean the same things as local and daemon, respectively. We thus now have the opportunity to desguar local and daemon early.

Context

This will allow me to make a change to #9839 requested during review to desugar those earlier.

Priorities and Process

Add 👍 to pull requests you find important.

The Nix maintainer team uses a GitHub project board to schedule and track reviews.

@github-actions github-actions bot added the store Issues and pull requests concerning the Nix store label Jan 25, 2024
@github-actions github-actions bot added the with-tests Issues related to testing. PRs with tests have some priority label Jan 25, 2024
Copy link
Member

@thufschmitt thufschmitt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice :)

I'm not really convinced by the switch to an std::optional for the authority parameter (we nearly always convert it straight away to an empty string, so we just end-up with std::optional{""} == std::nullopt), but the extra consistency for the rest is very nice

src/libstore/dummy-store.cc Outdated Show resolved Hide resolved
src/libstore/local-store.cc Outdated Show resolved Hide resolved
@Ericson2314
Copy link
Member Author

Got rid of the std::optional as requested.

In particular `local://<path>` and `unix://` (without any path) now
work, and mean the same things as `local` and `daemon`, respectively. We
thus now have the opportunity to desguar `local` and `daemon` early.

This will allow me to make a change to
NixOS#9839 requested during review to
desugar those earlier.

Co-authored-by: Théophane Hufschmitt <[email protected]>
@Ericson2314 Ericson2314 merged commit 5f7673c into NixOS:master May 21, 2024
11 of 17 checks passed
@Ericson2314 Ericson2314 deleted the missing-store-urls branch May 21, 2024 17:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
store Issues and pull requests concerning the Nix store with-tests Issues related to testing. PRs with tests have some priority
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants