Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9c88a4162ac0
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 782cc919c8cd
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Feb 23, 2019

  1. nixos/gnupg: set SSH_AUTH_SOCK in non-interactive settings 

    `SSH_AUTH_SOCK` is useful in some non-interactive settings, for instance
daemonized Emacs. Fixes #55733.
    @shosti
    shosti committed Feb 23, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ddabdc0 View commit details

Commits on Mar 8, 2019

  1. Merge pull request #56254 from shosti/gnupg-ssh-austh-sock 

    nixos/gnupg: set SSH_AUTH_SOCK in non-interactive settings
    @infinisil
    infinisil authored Mar 8, 2019
    Copy the full SHA
    782cc91 View commit details
Showing with 3 additions and 1 deletion.
  1. +3 −1 nixos/modules/programs/gnupg.nix
4 changes: 3 additions & 1 deletion nixos/modules/programs/gnupg.nix
View file
Original file line number Diff line number Diff line change
@@ -85,11 +85,13 @@ in
# SSH agent protocol doesn't support changing TTYs, so bind the agent
# to every new TTY.
${pkgs.gnupg}/bin/gpg-connect-agent --quiet updatestartuptty /bye > /dev/null
'');

environment.extraInit = mkIf cfg.agent.enableSSHSupport ''
if [ -z "$SSH_AUTH_SOCK" ]; then
export SSH_AUTH_SOCK=$(${pkgs.gnupg}/bin/gpgconf --list-dirs agent-ssh-socket)
fi
'');
'';

assertions = [
{ assertion = cfg.agent.enableSSHSupport -> !config.programs.ssh.startAgent;