Unverified Commit 4e7b3f2e authored by Fabián Heredia Montiel's avatar Fabián Heredia Montiel Committed by GitHub
Browse files

Merge pull request #294937 from SuperSandro2000/pinentry-tty 

pinentry: add tty variant, fix gnome variant
parents c59aeecf 64f21439

pkgs/tools/security/pinentry/default.nix

+3 −2
Original line number Diff line number Diff line
@@ -112,9 +112,10 @@ let 
in

{

  pinentry-curses = buildPinentry "curses" [ "curses" "tty" ];

  pinentry-gtk2 = buildPinentry "gtk2" [ "gtk2" "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-emacs = buildPinentry "emacs" [ "emacs" "curses" "tty" ];

  pinentry-tty = buildPinentry "tty" [ "tty" ];

  pinentry-all = buildPinentry "all" [ "curses" "tty" "gtk2" "gnome3" "qt" "emacs" ];

}

pkgs/top-level/aliases.nix

+4 −3
Original line number Diff line number Diff line
@@ -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;

    emacs = pinentry-emacs;

    gnome3 = pinentry-gnome3;

    gtk2 = pinentry-gtk2;

    gnome2 = pinentry-gnome3;

    qt = pinentry-qt;

    emacs = pinentry-emacs;

    flavors = [ "curses" "gtk2" "gnome2" "qt" "emacs" ];

    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

pkgs/top-level/all-packages.nix

+1 −0
Original line number Diff line number Diff line
@@ -11990,6 +11990,7 @@ with pkgs; 
    pinentry-gtk2

    pinentry-gnome3

    pinentry-qt

    pinentry-tty

    pinentry-all;















  pinentry_mac = callPackage ../tools/security/pinentry/mac.nix {