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
base: fa7d7eb95bf1
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: db502b034f42
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 14, 2019

  1. ssh-agent: add agentPKCS11Whitelist option 

    If you want to be able to use OpenSC with ssh-agent, you need to be able
to add it to the ssh-agent whitelist.  This adds an option,
agentPKCS11Whitelist, that exposes the option.

Note that I currently work around this by injecting the parameter into
the agentTimeout option:

    programs.ssh.agentTimeout = "1h -P ${pkgs.opensc}/lib/opensc-pkcs11.so";

but I feel that a proper option would be better :)
    @philandstuff
    philandstuff committed Oct 14, 2019
    Copy the full SHA
    8120184 View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2019

  1. Merge pull request #71139 from philandstuff/ssh-agent-pkcs11-whitelist 

    ssh-agent: add agentPKCS11Whitelist option
    @globin
    globin committed Nov 4, 2019
    Copy the full SHA
    db502b0 View commit details
    Browse the repository at this point in the history