Skip to content

Add ssh for nix commands that need ssh e.g. nix-copy-closure #150

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

Open
irisjae wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add ssh for nix commands that need ssh e.g. nix-copy-closure #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ The following environment variables are optional and can be used to override the
```txt
NP_DEBUG (1 = debug msgs; 2 = 'set -x' for nix-portable)
NP_GIT specify path to the git executable
NP_SSH (0 = don't install ssh; 1 = install ssh)
NP_LOCATION where to put the `.nix-portable` dir. (defaults to `$HOME`)
NP_RUNTIME which runtime to use (must be one of: nix, bwrap, proot)
NP_NIX specify the path to the static nix executable to use in case nix is selected as runtime
Expand Down
44 changes: 43 additions & 1 deletion default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,12 @@ let
# create a directory to hold executable symlinks for overriding
mkdir -p "\$dir/tmpbin"

# placeholder ssh binary
echo '#!/bin/sh' > \$dir/tmpbin/ssh
echo 'echo Enable SSH with NP_SSH=1 >&2' >> \$dir/tmpbin/ssh
echo 'exit 1' >> \$dir/tmpbin/ssh
chmod +x \$dir/tmpbin/ssh

# create minimal drv file for nix to spawn a nix shell
echo 'builtins.derivation {name="foo"; builder="/bin/sh"; args = ["-c" "echo hello \> \\\$out"]; system=builtins.currentSystem;}' > "\$dir/mini-drv.nix"

Expand Down Expand Up @@ -313,6 +319,9 @@ let
if test -s /bin/sh && [[ "\$(realpath /bin/sh)" == /nix/store/* ]]; then
toBind="\$toBind \$dir/busybox/bin /bin"
fi

# add ssh wrapper to /bin
toBind="\$toBind \$dir/tmpbin/ssh /bin/ssh"
}


Expand Down Expand Up @@ -535,7 +544,7 @@ let
# restore original PATH and append busybox
export PATH="\$PATH_OLD:\$dir/busybox/bin"
# apply overriding executable paths in \$dir/tmpbin/
export PATH="\$dir/tmpbin:\$PATH"
export PATH="\$dir/tmpbin:\$PATH:/bin"



Expand All @@ -549,12 +558,45 @@ let
debug "git already installed or manually specified"
fi

# add ssh if the command needs ssh, or user requests
# - nix-copy-closure
# TODO: handle nix copy
addSsh=false
if [ "\$NP_RUNTIME" != "nix" ]; then
if [ -z "\$NP_SSH" ] && [ "\$(basename "\$bin")" == "nix-copy-closure" ]; then
addSsh=true
elif [ -n "\$NP_SSH" ] && [ "\$NP_SSH" != "0" ]; then
addSsh=true
else
debug 'Not installing ssh, not needed for command'
fi
else
debug 'Not installing ssh, using runtime "nix"'
fi

### override the possibly existing git in the environment with the installed one
# excluding the case NP_GIT is set.
if \$doInstallGit; then
export PATH="${git.out}/bin:\$PATH"
fi

if \$addSsh; then
echo "Installing ssh"
\$run \$store${lib.removePrefix "/nix/store" nix}/bin/nix build --impure -o "\$dir/tmpbin/openssh" --expr "
(import ${nixpkgsSrc} {}).openssh.out
"
sshBin="\$(readlink -f "\$dir/tmpbin/openssh/bin")"
rm "\$dir/tmpbin/openssh"

# wrapper to set a valid \$SHELL in the environment
# (important for nix-copy-closure, which uses -o LocalCommand)
echo '#!/bin/sh' > \$dir/tmpbin/ssh
echo 'export SHELL=/bin/sh' >> \$dir/tmpbin/ssh
echo "exec \$sshBin/ssh "'"\$@"' >> \$dir/tmpbin/ssh
chmod +x \$dir/tmpbin/ssh
fi



### print elapsed time
end=\$(date +%s%N) # end time in nanoseconds
Expand Down