Split pinentry flavours and enable udisks2 on install media again #49270
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fpletz
requested review from
samueldr,
flokli,
lheckemann,
dezgeg,
jtojnar and
vcunat
fpletz
changed the title
GrahamcOfBorg
added
6.topic: GNOME
|
Success on aarch64-linux (full log) Attempted: gnupg, pinentry Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Attempted: gnupg, pinentry Partial log (click to expand)
|
|
Success on x86_64-darwin (full log) Attempted: gnupg The following builds were skipped because they don't evaluate on x86_64-darwin: pinentry Partial log (click to expand)
|
flokli
reviewed
Oct 27, 2018
flokli
requested changes
Oct 27, 2018
This solves the dependency cycle in gcr alternatively so there won't be two gnupg store paths in a standard NixOS system which has udisks2 enabled by default. NixOS users are expected to use the gpg-agent user service to pull in the appropriate pinentry flavour or install it on their systemPackages and set it in their local gnupg agent config instead.
This reverts commit 571fb74. The dependencay on gtk2 was removed.
fpletz
force-pushed
the
pinentry-cleanup
branch
from
8c2b1c4
to
f6d6ba5
Compare
|
Success on x86_64-darwin (full log) Attempted: gnupg The following builds were skipped because they don't evaluate on x86_64-darwin: pinentry Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Attempted: gnupg, pinentry Partial log (click to expand)
|
|
Is there an use case for having udisks2 in the installer anyway? The only user available is root and even if it weren't you'd have to use sudo anyway to run Pinentry closure size drop is of course nice regardless. |
|
Success on aarch64-linux (full log) Attempted: gnupg, pinentry Partial log (click to expand)
|
jtojnar
reviewed
Oct 27, 2018
| info = flavourInfo.${f}; | ||
| inputs = info.buildInputs or []; | ||
| flag = flavourInfo.${f}.flag or null; | ||
| inputsSatifsfied = inputs == [] || all (f: !(isNull f)) inputs; |
There was a problem hiding this comment.
Suggested change
| inputsSatifsfied = inputs == [] || all (f: !(isNull f)) inputs; | |
| inputsSatisfied = all (f: !(isNull f)) inputs; |
There was a problem hiding this comment.
And !(isNull f) == ! isNull f
jtojnar
reviewed
Oct 27, 2018
jtojnar
reviewed
Oct 27, 2018
| , libgpgerror, libassuan | ||
| , ncurses, gtk2, qt | ||
| , libcap ? null, libsecret ? null, gcr ? null | ||
| , flavours ? [ "curses" "tty" "gtk2" "qt" "gnome3" "emacs" ] |
There was a problem hiding this comment.
Maybe use enabledFlavours or something?
jtojnar
reviewed
Oct 27, 2018
| ''; | ||
| nativeBuildInputs = [ pkgconfig ]; | ||
| buildInputs = [ libgpgerror libassuan libcap libsecret ] | ||
| ++ flatten (flip map flavours (f: flavourInfo.${f}.buildInputs or [])); |
There was a problem hiding this comment.
Why not just
Suggested change
| ++ flatten (flip map flavours (f: flavourInfo.${f}.buildInputs or [])); | |
| ++ concatMap (f: flavourInfo.${f}.buildInputs or []) flavours; |
Hopefully, there will not be multiple levels of nested lists.
jtojnar
reviewed
Oct 27, 2018
| ln -sf ${outputVar}/bin/${binary} ${outputVar}/bin/pinentry | ||
| '')) | ||
| + '' | ||
| ln -sf ${head flavours}/bin/pinentry-${flavourInfo.${head flavours}.bin} $out/bin/pinentry |
There was a problem hiding this comment.
Should not this be
Suggested change
| ln -sf ${head flavours}/bin/pinentry-${flavourInfo.${head flavours}.bin} $out/bin/pinentry | |
| ln -sf ${"$" + head flavours}/bin/pinentry-${flavourInfo.${head flavours}.bin} $out/bin/pinentry |
There was a problem hiding this comment.
Maybe we could even use placeholder now.
jtojnar
reviewed
Oct 27, 2018
| pinentry binary will be passed to gpg-agent via commandline and | ||
| thus overrides the pinentry option in gpg-agent.conf in the user's | ||
| home directory. | ||
| ''; |
There was a problem hiding this comment.
Maybe also mention the default behaviour.
According to @edolstra in #41723 (comment)
|
9 tasks
jtojnar
reviewed
Jan 16, 2019
| }; | ||
|
|
||
| pinentry_gnome = self.pinentry.override { | ||
| qt = qt5.qtbase; | ||
| gcr = gnome3.gcr; |
There was a problem hiding this comment.
gcr is now part of top-level attribute set, this can be removed.
jtojnar
reviewed
Jan 16, 2019
|
|
||
| pinentry_qt5 = self.pinentry.override { | ||
| qt = qt5.qtbase; | ||
| pinentry_qt4 = pinentry.override { |
There was a problem hiding this comment.
We do not need QT4 variant. #33248
10 tasks
|
Ooh I like this feature, and definitely want this for 20.03. |
This was referenced Oct 11, 2019
|
Superseded by #71095. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Due to the udisks2 update in #41723 its closure size exploded and was subsequently disabled on installation media. This PR refactors the pinentry derivation to be able to split out the different flavours and adds a NixOS option to select the desired flavour with a sensible fallback depending on the configured desktop environment.
Also this disables GUI support in GnuPG by default to resolve the dependency cycle in gcr. This way we won't have two versions of GnuPG in all systems closures that include gcr (i.e. due to udisks2).
Finally, we can enable udisks2 on install mediums again.
Everything except the breaking GnuPG change can and should be backported to 18.03 imho.
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)