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.

Sign up for GitHub

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

Jump to bottom

nix-daemon service: Ensure ssh is on PATH. Fixes #46038. #46041

Merged
merged 1 commit into from Oct 11, 2018
Merged

nix-daemon service: Ensure ssh is on PATH. Fixes #46038. #46041

merged 1 commit into from Oct 11, 2018

Conversation

nh2
Copy link
Contributor

@nh2 nh2 commented Sep 4, 2018

This fixes a regression introduced in commit
700e21d

nix needs ssh on path for the SSH substituter functionality,
not only the distributed builds functionality.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

@nh2
nix-daemon service: Ensure ssh is on PATH. Fixes NixOS#46038.
31919bc 
This fixes a regression introduced in commit
  700e21d

nix needs ssh on path for the SSH substituter functionality,
not only the distributed builds functionality.

Signed-off-by: Niklas Hambüchen <mail@nh2.me>
@nh2 nh2 mentioned this pull request Sep 4, 2018
Closed
@nh2
Copy link
Contributor Author

nh2 commented Sep 4, 2018

If merged, I think this should be backported to 18.09.

@Mic92 Mic92 added this to the 18.09 milestone Sep 4, 2018
@oxij
Copy link
Member

oxij commented Sep 5, 2018 via email

@FRidh FRidh added the 9.needs: port to stable A PR needs a backport to the stable release. label Sep 6, 2018
matthewbauer
matthewbauer approved these changes Oct 4, 2018
View reviewed changes
Copy link
Member

@matthewbauer matthewbauer left a comment

Choose a reason for hiding this comment

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

Looks okay to me. I'll give @edolstra a chance to respond if this doesn't look right. I know there has been some confusion in the past as what to include for Nix's dependencies.

@samueldr samueldr requested a review from edolstra October 6, 2018 03:54
@edolstra
Copy link
Member

edolstra commented Oct 7, 2018

Ideally this would be conditional on whether distributed builds are enabled or there are any ssh:// substituters.

@nh2
Copy link
Contributor Author

nh2 commented Oct 7, 2018

Ideally this would be conditional on whether distributed builds are enabled or there are any ssh:// substituters.

@edolstra I don't think this can be done since you don't necessarily have to have these in your config, you can also give them on the command line. Or am I wrong?

@infinisil infinisil merged commit c81ca54 into NixOS:master Oct 11, 2018
@infinisil infinisil mentioned this pull request Oct 11, 2018
Merged
9 tasks
@samueldr samueldr removed the 9.needs: port to stable A PR needs a backport to the stable release. label Apr 17, 2019
@aaronjanse
Copy link
Member

Should the wiki be updated to reflect the merged status of this PR?
https://nixos.wiki/wiki/Distributed_build#Note

Because of bug #46038, you need to set nix.distributedBuilds = true; in configuration.nix even if you are triggering a distributed build via the command line.

@nh2
Copy link
Contributor Author

nh2 commented Aug 13, 2019

@aaronjanse I think so.

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

@matthewbauer matthewbauer matthewbauer approved these changes

@edolstra edolstra Awaiting requested review from edolstra

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
18.09
Development

Successfully merging this pull request may close these issues.

None yet
10 participants
@nh2 @oxij @edolstra @aaronjanse @matthewbauer @Mic92 @samueldr @FRidh @infinisil @GrahamcOfBorg