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

Separate fetchgitPrivate into a separate file

Browse Source
This commit is contained in:
Shea Levy 2014-07-16 18:05:56 -04:00
parent f12633c628
commit b969e9340b
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/build-support/fetchgit/private.nix Normal file
View File

@ -0,0 +1,19 @@
{ fetchgit, writeScript, openssh, stdenv }: args: derivation ((fetchgit args).drvAttrs // {
SSH_AUTH_SOCK = if (builtins.tryEval <ssh-auth-sock>).success
then builtins.toString <ssh-auth-sock>
else null;
GIT_SSH = writeScript "fetchgit-ssh" ''
#! ${stdenv.shell}
exec -a ssh ${openssh}/bin/ssh -F ${let
sshConfigFile = if (builtins.tryEval <ssh-config-file>).success
then <ssh-config-file>
else builtins.trace ''
Please set your nix-path such that ssh-config-file points to a file that will allow ssh to access private repositories. The builder will not be able to see any running ssh agent sessions unless ssh-auth-sock is also set in the nix-path.
Note that the config file and any keys it points to must be readable by the build user, which depending on your nix configuration means making it readable by the build-users-group, the user of the running nix-daemon, or the user calling the nix command which started the build. Similarly, if using an ssh agent ssh-auth-sock must point to a socket the build user can access.
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";
in builtins.toString sshConfigFile} "$@"
'';
})

22
pkgs/top-level/all-packages.nix
View File

@ -305,25 +305,9 @@ let
inherit stdenv git cacert; inherit stdenv git cacert;
}; };
fetchgitPrivate = args: derivation ((fetchgit args).drvAttrs // { fetchgitPrivate = import ../build-support/fetchgit/private.nix {
SSH_AUTH_SOCK = if (builtins.tryEval <ssh-auth-sock>).success inherit fetchgit writeScript openssh stdenv;
then builtins.toString <ssh-auth-sock> };
else null;
GIT_SSH = pkgs.writeScript "fetchgit-ssh" ''
#! ${pkgs.stdenv.shell}
exec -a ssh ${pkgs.openssh}/bin/ssh -F ${let
sshConfigFile = if (builtins.tryEval <ssh-config-file>).success
then <ssh-config-file>
else builtins.trace ''
Please set your nix-path such that ssh-config-file points to a file that will allow ssh to access private repositories. The builder will not be able to see any running ssh agent sessions unless ssh-auth-sock is also set in the nix-path.
Note that the config file and any keys it points to must be readable by the build user, which depending on your nix configuration means making it readable by the build-users-group, the user of the running nix-daemon, or the user calling the nix command which started the build. Similarly, if using an ssh agent ssh-auth-sock must point to a socket the build user can access.
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";
in builtins.toString sshConfigFile} "$@"
'';
});
fetchgitrevision = import ../build-support/fetchgitrevision runCommand git; fetchgitrevision = import ../build-support/fetchgitrevision runCommand git;