Commit d19ab9f1 authored by David McFarland's avatar David McFarland
Browse files

nixos/gnupg: fix pinentryFlavor documentation and add release note

parent 3d4f3068

nixos/doc/manual/release-notes/rl-2311.section.md

+2 −0
Original line number Diff line number Diff line
@@ -84,6 +84,8 @@ 


- `services.prometheus.exporters` has a new [exporter](https://github.com/hipages/php-fpm_exporter) to monitor PHP-FPM processes, see [#240394](https://github.com/NixOS/nixpkgs/pull/240394) for more details.



- `programs.gnupg.agent.pinentryFlavor` is now set in `/etc/gnupg/gpg-agent.conf`, and will no longer take precedence over a `pinentry-program` set in `~/.gnupg/gpg-agent.conf`.



## Nixpkgs internals {#sec-release-23.11-nixpkgs-internals}



- The `qemu-vm.nix` module by default now identifies block devices via

nixos/modules/programs/gnupg.nix

+1 −3
Original line number Diff line number Diff line
@@ -75,9 +75,7 @@ in 
      defaultText = literalMD ''matching the configured desktop environment'';

      description = lib.mdDoc ''

        Which pinentry interface to use. If not null, the path to the

        pinentry binary will be passed to gpg-agent via commandline and

        thus overrides the pinentry option in gpg-agent.conf in the user's

        home directory.

        pinentry binary will be set in /etc/gnupg/gpg-agent.conf.

        If not set at all, it'll pick an appropriate flavor depending on the

        system configuration (qt flavor for lxqt and plasma5, gtk2 for xfce

        4.12, gnome3 on all other systems with X enabled, ncurses otherwise).