about summary refs log tree commit diff
path: root/pkgs/top-level/aliases.nix
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2024-03-09 23:57:27 +0100
committerGitHub <noreply@github.com>2024-03-09 23:57:27 +0100
commitc86e8fd7a02aec59bd732bbf01f94a22a34e4594 (patch)
tree6bb0e97d07fba7e449d35b89805cd52c156be49f /pkgs/top-level/aliases.nix
parent7a2f43739c7e0f6746e683651a3dc239e23b2785 (diff)
parenta270c43ea1a8211e01fc9923ef2482c36dfa1966 (diff)
downloadnixlib-c86e8fd7a02aec59bd732bbf01f94a22a34e4594.tar
nixlib-c86e8fd7a02aec59bd732bbf01f94a22a34e4594.tar.gz
nixlib-c86e8fd7a02aec59bd732bbf01f94a22a34e4594.tar.bz2
nixlib-c86e8fd7a02aec59bd732bbf01f94a22a34e4594.tar.lz
nixlib-c86e8fd7a02aec59bd732bbf01f94a22a34e4594.tar.xz
nixlib-c86e8fd7a02aec59bd732bbf01f94a22a34e4594.tar.zst
nixlib-c86e8fd7a02aec59bd732bbf01f94a22a34e4594.zip
Merge pull request #133542 from fpletz/refactor/pinentry-remove-multiple-outputs
pinentry: remove multiple outputs
Diffstat (limited to 'pkgs/top-level/aliases.nix')
-rw-r--r--pkgs/top-level/aliases.nix11
1 files changed, 11 insertions, 0 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6971d3479f9a..eef412e566c2 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -902,12 +902,23 @@ mapAliases ({
   timescaledb = postgresqlPackages.timescaledb;
   tsearch_extras = postgresqlPackages.tsearch_extras;
 
+  # pinentry was using multiple outputs, this emulates the old interface for i.e. home-manager
+  # 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" ];
+  }; # 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
   pinentry_gnome = throw "'pinentry_gnome' has been renamed to/replaced by 'pinentry-gnome'"; # Converted to throw 2023-09-10
   pinentry_gtk2 = throw "'pinentry_gtk2' has been renamed to/replaced by 'pinentry-gtk2'"; # Converted to throw 2023-09-10
   pinentry_qt = throw "'pinentry_qt' has been renamed to/replaced by 'pinentry-qt'"; # Converted to throw 2023-09-10
   pinentry_qt5 = pinentry-qt; # Added 2020-02-11
+
   PlistCpp = plistcpp; # Added 2024-01-05
   pocket-updater-utility = pupdate; # Added 2024-01-25
   poetry2nix = throw "poetry2nix is now maintained out-of-tree. Please use https://github.com/nix-community/poetry2nix/"; # Added 2023-10-26