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: 402b97fa1eca
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7e9b1564e661
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 24, 2020

  1. nixos/gnupg: actually use the configured gpg package 

    Previously, this would ignore the `package` option if `pinentryFlavor`
was set.
    @edef1c
    edef1c committed Jan 24, 2020
    Copy the full SHA
    bfe1c69 View commit details

  2. Merge pull request #78423 from edef1c/gnupg-package 

    nixos/gnupg: actually use the configured gpg package
    @worldofpeace
    worldofpeace authored Jan 24, 2020
    Copy the full SHA
    7e9b156 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 nixos/modules/programs/gnupg.nix
2 changes: 1 addition & 1 deletion nixos/modules/programs/gnupg.nix
View file
Original file line number Diff line number Diff line change
@@ -96,7 +96,7 @@ in
# This overrides the systemd user unit shipped with the gnupg package
systemd.user.services.gpg-agent = mkIf (cfg.agent.pinentryFlavor != null) {
serviceConfig.ExecStart = [ "" ''
${pkgs.gnupg}/bin/gpg-agent --supervised \
${cfg.package}/bin/gpg-agent --supervised \
--pinentry-program ${pkgs.pinentry.${cfg.agent.pinentryFlavor}}/bin/pinentry
'' ];
};