Skip to content

Restore ServeProto::Command::ImportPaths#14263

Merged
Ericson2314 merged 1 commit intomasterfrom
hydra-import-paths
Oct 15, 2025
Merged

Restore ServeProto::Command::ImportPaths#14263
Ericson2314 merged 1 commit intomasterfrom
hydra-import-paths

Conversation

@xokdvium
Copy link
Contributor

@xokdvium xokdvium commented Oct 15, 2025

Motivation

This partially reverts commit 5e46df9, partially reversing changes made to 8c789db.

Context

We do this because Hydra, while using the newer version of the protocol, still uses this command, even though Nix (as a client) doesn't use it. On that basis, we don't want to remove it (or consider it only part of the older versions of the protocol) until Hydra no longer uses the Legacy SSH Protocol.

This is still used by hydra NixOS/hydra#1531.


Add 👍 to pull requests you find important.

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

@xokdvium xokdvium requested a review from Ericson2314 as a code owner October 15, 2025 20:48
Ericson2314

This comment was marked as resolved.

@xokdvium xokdvium requested a review from edolstra as a code owner October 15, 2025 20:57
@github-actions github-actions bot added new-cli Relating to the "nix" command store Issues and pull requests concerning the Nix store labels Oct 15, 2025
@xokdvium xokdvium changed the title Revert "Remove WorkerProto::Op::ImportPaths" Revert "Merge pull request #13957 from NixOS/drop-old-serve-protocol" Oct 15, 2025
@xokdvium xokdvium marked this pull request as draft October 15, 2025 21:09
@Ericson2314 Ericson2314 changed the title Revert "Merge pull request #13957 from NixOS/drop-old-serve-protocol" Restore ServeProto::Command::ImportPaths Oct 15, 2025
@Ericson2314 Ericson2314 force-pushed the hydra-import-paths branch 3 times, most recently from e268146 to b703aa1 Compare October 15, 2025 22:18
This partially reverts commit 5e46df9,
partially reversing changes made to
8c789db.

We do this because Hydra, while using the newer version of the protocol,
still uses this command, even though Nix (as a client) doesn't use it.
On that basis, we don't want to remove it (or consider it only part of
the older versions of the protocol) until Hydra no longer uses the
Legacy SSH Protocol.
@Ericson2314 Ericson2314 marked this pull request as ready for review October 15, 2025 22:19
@Ericson2314 Ericson2314 added the backport 2.32-maintenance Automatically creates a PR against the branch label Oct 15, 2025
@Ericson2314 Ericson2314 enabled auto-merge October 15, 2025 22:29
Copy link
Member

@Ericson2314 Ericson2314 left a comment

Choose a reason for hiding this comment

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

I have tested a local build of Hydra with this backported to Nix 2.32. So I know that this builds, and I am pretty confident that it works because Hydra's tests should exercise the code.

@Ericson2314 Ericson2314 added this pull request to the merge queue Oct 15, 2025
Merged via the queue into master with commit 721f557 Oct 15, 2025
21 checks passed
@Ericson2314 Ericson2314 deleted the hydra-import-paths branch October 15, 2025 23:38
@internal-nix-ci
Copy link

Successfully created backport PR for 2.32-maintenance:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport 2.32-maintenance Automatically creates a PR against the branch new-cli Relating to the "nix" command store Issues and pull requests concerning the Nix store

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants