public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #31356 from FRidh/fetchgitPrivate

Browse Source 
fetchgitPrivate: put our custom ssh on PATH
This commit is contained in:
Frederik Rietdijk 2017-11-10 10:57:50 +01:00 committed by GitHub
commit 4508a17da7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/build-support/fetchgit/private.nix
View File

@ -1,10 +1,10 @@
{ fetchgit, writeScript, openssh, stdenv }: args: derivation ((fetchgit args).drvAttrs // { { fetchgit, runCommand, makeWrapper, openssh, stdenv }: args: derivation ((fetchgit args).drvAttrs // {
SSH_AUTH_SOCK = if (builtins.tryEval <ssh-auth-sock>).success SSH_AUTH_SOCK = if (builtins.tryEval <ssh-auth-sock>).success
then builtins.toString <ssh-auth-sock> then builtins.toString <ssh-auth-sock>
else null; else null;
GIT_SSH = writeScript "fetchgit-ssh" ''
#! ${stdenv.shell} GIT_SSH = let
exec -a ssh ${openssh}/bin/ssh -F ${let config = ''${let
sshConfigFile = if (builtins.tryEval <ssh-config-file>).success sshConfigFile = if (builtins.tryEval <ssh-config-file>).success
then <ssh-config-file> then <ssh-config-file>
else builtins.trace '' else builtins.trace ''
@ -14,6 +14,13 @@
You may need StrictHostKeyChecking=no in the config file. Since ssh will refuse to use a group-readable private key, if using build-users you will likely want to use something like IdentityFile /some/directory/%u/key and have a directory for each build user accessible to that user. You may need StrictHostKeyChecking=no in the config file. Since ssh will refuse to use a group-readable private key, if using build-users you will likely want to use something like IdentityFile /some/directory/%u/key and have a directory for each build user accessible to that user.
'' "/var/lib/empty/config"; '' "/var/lib/empty/config";
in builtins.toString sshConfigFile} "$@" in builtins.toString sshConfigFile}'';
ssh-wrapped = runCommand "fetchgit-ssh" {
buildInputs = [ makeWrapper ];
} ''
mkdir -p $out/bin
makeWrapper ${openssh}/bin/ssh $out/bin/ssh --prefix PATH : "$out/bin" --add-flags "-F ${config}" "$@"
''; '';
in "${ssh-wrapped}/bin/ssh";
}) })