diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index dd66a3848192..61002917eb0d 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -112,9 +112,10 @@ let in { pinentry-curses = buildPinentry "curses" [ "curses" "tty" ]; - pinentry-gtk2 = buildPinentry "gtk2" [ "gtk2" "curses" "tty" ]; - pinentry-gnome3 = buildPinentry "gnome3" [ "gnome3" "curses" "tty" ]; - pinentry-qt = buildPinentry "qt" [ "qt" "curses" "tty" ]; pinentry-emacs = buildPinentry "emacs" [ "emacs" "curses" "tty" ]; + pinentry-gnome3 = buildPinentry "gnome3" [ "gnome3" "curses" "tty" ]; + pinentry-gtk2 = buildPinentry "gtk2" [ "gtk2" "curses" "tty" ]; + pinentry-qt = buildPinentry "qt" [ "qt" "curses" "tty" ]; + pinentry-tty = buildPinentry "tty" [ "tty" ]; pinentry-all = buildPinentry "all" [ "curses" "tty" "gtk2" "gnome3" "qt" "emacs" ]; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5bc9ed301321..f180500be6d5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -911,11 +911,12 @@ mapAliases ({ # soon: throw "'pinentry' has been removed. Pick an appropriate variant like 'pinentry-curses' or 'pinentry-gnome3'"; pinentry = pinentry-all // { curses = pinentry-curses; - gtk2 = pinentry-gtk2; - gnome2 = pinentry-gnome3; - qt = pinentry-qt; emacs = pinentry-emacs; - flavors = [ "curses" "gtk2" "gnome2" "qt" "emacs" ]; + gnome3 = pinentry-gnome3; + gtk2 = pinentry-gtk2; + qt = pinentry-qt; + tty = pinentry-tty; + flavors = [ "curses" "emacs" "gnome3" "gtk2" "qt" "tty" ]; }; # added 2024-01-15 pinentry_curses = throw "'pinentry_curses' has been renamed to/replaced by 'pinentry-curses'"; # Converted to throw 2023-09-10 pinentry_emacs = throw "'pinentry_emacs' has been renamed to/replaced by 'pinentry-emacs'"; # Converted to throw 2023-09-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e4fc2b95807..c3badc6dd0d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11990,6 +11990,7 @@ with pkgs; pinentry-gtk2 pinentry-gnome3 pinentry-qt + pinentry-tty pinentry-all; pinentry_mac = callPackage ../tools/security/pinentry/mac.nix {