Skip to content
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.

Sign up for GitHub

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

Jump to bottom

nixos/gnupg: add dbus dependencies for gnome3 pinentry #72391

Merged
merged 1 commit into from
Nov 1, 2019
Merged

nixos/gnupg: add dbus dependencies for gnome3 pinentry #72391

merged 1 commit into from
Nov 1, 2019
+2 −0

Conversation

urkud
Copy link
Contributor

@urkud urkud commented Oct 31, 2019

Motivation for this change

pinentry.gnome3 doesn't work without gcr in dbus.packages.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS,
  • Built on platform(s)
    • NixOS
  • Tested that pinentry works after this change.
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @globin

Sorry, something went wrong.

@ofborg ofborg bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Oct 31, 2019
@worldofpeace
Copy link
Contributor

@jtojnar I guess this was the dbus issue @fpletz noticed. I wonder if we should be adding this in other modules.

@jtojnar
Copy link
Member

jtojnar commented Oct 31, 2019

Possible. What other modules do you have in mind?

@worldofpeace
Copy link
Contributor

I'm thinking gnome-keyring and services.gnome3.core-os-services. Basically wherever something depended on gcr somehow pulling this in.

@jtojnar
Copy link
Member

jtojnar commented Oct 31, 2019

@worldofpeace it is already being done in gnome-keyring module.

@worldofpeace
Copy link
Contributor

Ah right, it is

nixpkgs/nixos/modules/services/desktops/gnome3/gnome-keyring.nix

Line 36 in 2f92bef

services.dbus.packages = [ pkgs.gnome3.gnome-keyring pkgs.gcr ];

But should that be promoted to core-os-services as well? as someone could disable gnome-keyring but still need gcr dbus services.

worldofpeace
worldofpeace suggested changes Nov 1, 2019
View reviewed changes
Copy link
Contributor

@worldofpeace worldofpeace left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please squash your commits together and have the commit title be

nixos/gnupg: add dbus dependencies for gnome3 pinentry

@urkud
nixos/gnupg: add dbus dependencies for gnome3 pinentry

Verified

This commit was signed with the committer’s verified signature. The key has expired.
marsam Mario Rodas
GPG key ID: 4C4BEFD7B18DC5E8
Expired
Verified
Learn about vigilant mode
7240566
@urkud urkud force-pushed the gnupg-pinentry-gnome3 branch from c616dec to 7240566 Compare November 1, 2019 12:59
@urkud
Copy link
Contributor Author

urkud commented Nov 1, 2019

@worldofpeace done

@worldofpeace worldofpeace changed the title nixos/gnupg: fix dbus dependencies nixos/gnupg: add dbus dependencies for gnome3 pinentry Nov 1, 2019
@worldofpeace worldofpeace merged commit a0b037b into NixOS:master Nov 1, 2019
@worldofpeace
Copy link
Contributor

Thanks for fixing this @urkud 🌠

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@worldofpeace worldofpeace

Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@urkud @worldofpeace @jtojnar