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

fetchgitPrivate: put our custom ssh on PATH #31356

Merged
merged 1 commit into from Nov 10, 2017
Merged

fetchgitPrivate: put our custom ssh on PATH #31356

merged 1 commit into from Nov 10, 2017

Conversation

FRidh
Copy link
Member

@FRidh FRidh commented Nov 7, 2017 •
edited

Currently we wrap ssh so it can find the config file passed in by
. If one however uses ProxyCommand ssh, then ssh that
is on PATH is taken (which is also unavailable when using nix-shell
--pure), which is the plain ${openssh}/bin/ssh.

This commit makes sure our wrapped ssh is available on PATH.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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/)
  • Fits CONTRIBUTING.md.

@FRidh
fetchgitPrivate: put our custom ssh on PATH
f8eed5f 
Currently we wrap ssh so it can find the config file passed in by
<ssh-config-file>. If one however uses ProxyCommand ssh, then ssh that
is on PATH is taken (which is also unavailable when using nix-shell
--pure), which is the plain ${openssh}/bin/ssh.

This commit makes sure our wrapped ssh is available on PATH.
@FRidh
Copy link
Member Author

FRidh commented Nov 7, 2017

It would be good if someone else tests this as well.

@FRidh
Copy link
Member Author

FRidh commented Nov 7, 2017

Note that I haven't been able to use fetchgitPrivate without sandbox. I thought that on NixOS we don't use restricted eval and that therefore it should be able to reach a ssh config at say /etc/nixos/ssh/config.

@FRidh FRidh merged commit 4508a17 into NixOS:master Nov 10, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
1 participant
@FRidh