-
-
Notifications
You must be signed in to change notification settings - Fork 12.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
nixos/gnupg: drop references to gtk2; pinentry-*: build dependent variant with an override instead of choosing the output #277221
Conversation
Just wanted to mention again, that all the other pinentry flavors don't handle both tty and graphical prompts as well as gtk2. It's either or with them, so I don't think it should be dropped as a pinentry flavor. |
I am not sure how gtk2 is realted to tty/curses.
It is only dropped as a default entry. You can still configure it to use it. |
The |
The GTK2 variant has been removed [1]. I may revise this in the future if [2] is merged (I'd like to try `pinentry-rofi` [3]). [1]: NixOS/nixpkgs#270266 [2]: NixOS/nixpkgs#277221 [3]: https://github.com/plattfot/pinentry-rofi
1a80033
to
927f8ae
Compare
pkgs/top-level/all-packages.nix
Outdated
pinentry-emacs = pinentry.override { enabledFlavors = [ "emacs" ]; }; | ||
pinentry-gtk2 = pinentry.override { enabledFlavors = [ "gtk2" ]; }; | ||
pinentry-qt = pinentry.override { enabledFlavors = [ "qt" ]; }; | ||
pinentry-gnome3 = pinentry.override { enabledFlavors = [ "gnome3" ]; }; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I vaguely recall that curses was supposed to be a fallback, if gui could not be started. But now the only reference I found is #71095 (comment), which is not very informative.
927f8ae
to
3cdf170
Compare
3cdf170
to
78ef9f0
Compare
…ing the output We don't want to depend on the *enabled* flavors of pinentry but on all *possible* ones.
… definitely enabled
This avoids evaluating all the desktop environments at this place.
78ef9f0
to
daa53d2
Compare
I cannot test all the changes myself - I think they they are correct but I would appreciate it, if other people could help to verify that. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Changes LGTM. Since I'm also using pinentry both graphically and with curses I'm gonna test and merge later today if nobody beats me to it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do not merge for now since only setting one enabledFlavor
probably does not provide a proper fallback.
Based on this I am not sure that is even working. |
I'm using this functionality daily and others have also noted they are using this in other PRs regarding the breakage of pinentry-gtk2. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me. I like that DEs set the flavour they need, instead of having gnupg handling it for each and every one.
Some of the useful changes here have been carried over to #133542. Since this PR effectively breaks pinentry's fallback feature, we'll continue in the other PR. |
yeah, gtk2 but we don't really know that for the other flavors and I kinda remember that jan some time said, that this might not work. |
Description of changes
This PR basically cleans up all #270266
see #270266 (comment)
Closes #276143
Closes #133156
Things done
nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)Add a 👍 reaction to pull requests you find important.