Skip to content

Merge master into nix-next#1637

Merged
Ericson2314 merged 4 commits intonix-nextfrom
master
Apr 1, 2026
Merged

Merge master into nix-next#1637
Ericson2314 merged 4 commits intonix-nextfrom
master

Conversation

@github-actions
Copy link
Copy Markdown

Automated PR to keep nix-next in sync with master.

artemist and others added 4 commits March 31, 2026 13:53
It would be best to make these a single transaction, as they're linked

Move them into a single statement
queue-runner: merge alloc_build_step and insert_build_step
The proto file already had `message StorePath { string path = 1; }`
but it was only used as a top-level RPC argument. Fields like
`BuildMessage.drv`, `LogChunk.drv`, and `FetchRequisitesRequest.path`
were plain `string` even though they always contain store paths.

This commit changes those fields to use the `StorePath` message type,
making the schema self-documenting and paving the way for type-safe
gRPC code on the Rust side.

On the Rust side, a `ProtoStorePath` newtype in the `shared` crate
wraps `harmonia_store_core::store_path::StorePath` and implements
`prost::Message` to match the proto wire format. prost-build's
`extern_path` maps the proto `StorePath` message to this newtype,
so generated code uses `ProtoStorePath` directly — eliminating the
manual `parse_store_path` calls that were scattered across the gRPC
handlers.
Use `StorePath` message type in proto for store-path fields
@Ericson2314 Ericson2314 merged commit 8737dad into nix-next Apr 1, 2026
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants