Split pinentry flavors and enable udisks2 on install media again#71095
Merged
worldofpeace merged 6 commits intoNixOS:masterfrom Oct 17, 2019
Merged
Split pinentry flavors and enable udisks2 on install media again#71095worldofpeace merged 6 commits intoNixOS:masterfrom
worldofpeace merged 6 commits intoNixOS:masterfrom
Conversation
flokli
requested review from
fpletz,
jtojnar,
lheckemann,
samueldr and
worldofpeace
9 tasks
ofborg
bot
added
6.topic: GNOME
flokli
force-pushed
the
pinentry-cleanup
branch
from
d2ab150 to
2d6cbc3
Compare
jtojnar
requested changes
Oct 13, 2019
Member
jtojnar
left a comment
jtojnar
left a comment
There was a problem hiding this comment.
Could you also address the change requests from the original PR?
Member
Author
|
Adressed the comments from @jtojnar and @infinisil on the original PR, and @jtojnar's latest comments. |
flokli
force-pushed
the
pinentry-cleanup
branch
from
2d6cbc3 to
9d5a580
Compare
ofborg
bot
removed
the
6.topic: GNOME
flokli
force-pushed
the
pinentry-cleanup
branch
from
9d5a580 to
9fc3ffb
Compare
jtojnar
requested changes
Oct 13, 2019
Contributor
worldofpeace
left a comment
worldofpeace
left a comment
There was a problem hiding this comment.
Can we change pinentryFlavour and defaultPinentryFlavour to use the spelling flavor?
It's chiefly British.
flokli
force-pushed
the
pinentry-cleanup
branch
2 times, most recently
from
40486a7 to
5a7b19e
Compare
jtojnar
reviewed
Oct 13, 2019
flokli
force-pushed
the
pinentry-cleanup
branch
from
5a7b19e to
a812993
Compare
jtojnar
reviewed
Oct 13, 2019
flokli
force-pushed
the
pinentry-cleanup
branch
from
a812993 to
215bb50
Compare
Member
Author
|
Adressed a lot of suggestions, thanks so far! |
flokli
force-pushed
the
pinentry-cleanup
branch
from
215bb50 to
541e4ef
Compare
Co-authored-by: Florian Klink <[email protected]>
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. Co-authored-by: Florian Klink <[email protected]>
This reverts commit 571fb74. The dependency on gtk2 was removed. Co-authored-by: Florian Klink <[email protected]>
worldofpeace
force-pushed
the
pinentry-cleanup
branch
from
c9c6431 to
e397b94
Compare
worldofpeace
approved these changes
Oct 16, 2019
Contributor
worldofpeace
left a comment
worldofpeace
left a comment
There was a problem hiding this comment.
Tested on my local system, migrating from home-manager's gpg-agent to nixos gpg.agent without issues.
And this was using gnome3`s pinentry.
Also tested in a VM with a Gnome config.
Contributor
|
Ok, reverted that on master because of the rebuilds it should go to staging (I think). Nice working on this together @flokli 🌸 |
jtojnar
added a commit
to jtojnar/nixfiles
that referenced
this pull request
Nov 5, 2019
Since we stopped shipping graphical frontend with gnupg in NixOS/nixpkgs#71095, we use service overrides to pass the frontend set in NixOS module, offering customizable front-ends without needing to rebuid gnupg. Unfortunately, when GNUPGHOME environment variable is set, gpg-agent uses a different socket directory, so the socket activation fails and gnupg starts the agent manually, without our overrides. NixOS/nixpkgs#72597 (comment) Until GNUPG's non-compliance with XDG basedir specification is fixed upstream, we will need to override the socket directory for the systemd socket activation, so that the properly overridden agent can be run. Unfortunately, with global overrides this is only possible to do when there is only one user using gpg, since the socket directory is based on a hash of the gnupg homedir. For multi-user systems solving it at user level with something like home-manager is necessary.
3 tasks
jD91mZM2
added a commit
to jD91mZM2/home-manager
that referenced
this pull request
Dec 30, 2019
jD91mZM2
added a commit
to jD91mZM2/home-manager
that referenced
this pull request
Dec 30, 2019
jD91mZM2
added a commit
to jD91mZM2/home-manager
that referenced
this pull request
Dec 30, 2019
jD91mZM2
added a commit
to jD91mZM2/home-manager
that referenced
this pull request
Dec 30, 2019
jD91mZM2
added a commit
to jD91mZM2/home-manager
that referenced
this pull request
Dec 31, 2019
rycee
pushed a commit
to nix-community/home-manager
that referenced
this pull request
Jan 1, 2020
jorsn
pushed a commit
to jorsn/home-manager
that referenced
this pull request
Apr 25, 2020
13 tasks
11 tasks
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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
Follow-up of #49270, rebased to latest master and with qt4 removed.
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nix-review --run "nix-review wip"./result/bin/)nix path-info -Sbefore and after)