ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-24 14:18:13 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #294937 from SuperSandro2000/pinentry-tty

Browse Source 
pinentry: add tty variant, fix gnome variant
This commit is contained in:
Fabián Heredia Montiel 2024-03-12 14:47:00 -06:00 committed by GitHub
commit 4e7b3f2e6b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/tools/security/pinentry/default.nix
View File

@ -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" ];
}

9
pkgs/top-level/aliases.nix
View File

@ -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

1
pkgs/top-level/all-packages.nix
View File

@ -11990,6 +11990,7 @@ with pkgs;
pinentry-gtk2
pinentry-gnome3
pinentry-qt
pinentry-tty
pinentry-all;
pinentry_mac = callPackage ../tools/security/pinentry/mac.nix {