From 9e44eb5dee82238b2da01b7df6c63eec836d94e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 11 Mar 2024 11:09:15 +0100 Subject: [PATCH 1/2] pinentry: add tty variant Closes #294698 --- pkgs/tools/security/pinentry/default.nix | 7 ++++--- pkgs/top-level/aliases.nix | 9 +++++---- pkgs/top-level/all-packages.nix | 1 + 3 files changed, 10 insertions(+), 7 deletions(-) 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 e9ac017bf1b5..aa63c5a82232 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -906,11 +906,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" ]; + gnome2 = pinentry-gnome3; + gtk2 = pinentry-gtk2; + qt = pinentry-qt; + tty = pinentry-tty; + flavors = [ "curses" "emacs" "gnome2" "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 5b688c8bcf2c..8882949fdcb8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11988,6 +11988,7 @@ with pkgs; pinentry-gtk2 pinentry-gnome3 pinentry-qt + pinentry-tty pinentry-all; pinentry_mac = callPackage ../tools/security/pinentry/mac.nix { From 64f214390177bf575ef930316c4bd5ba744613e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 11 Mar 2024 14:02:40 +0100 Subject: [PATCH 2/2] pinentry: rename gnome2 alias to gnome3 --- pkgs/top-level/aliases.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index aa63c5a82232..391d540a46d1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -907,11 +907,11 @@ mapAliases ({ pinentry = pinentry-all // { curses = pinentry-curses; emacs = pinentry-emacs; - gnome2 = pinentry-gnome3; + gnome3 = pinentry-gnome3; gtk2 = pinentry-gtk2; qt = pinentry-qt; tty = pinentry-tty; - flavors = [ "curses" "emacs" "gnome2" "gtk2" "qt" "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