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

programs.gnupg: Support setting the gnupg program #57782

Merged
merged 1 commit into from
Apr 5, 2019
Merged

programs.gnupg: Support setting the gnupg program #57782

merged 1 commit into from
Apr 5, 2019
+12 −3

Conversation

bkchr
Copy link
Contributor

@bkchr bkchr commented Mar 17, 2019 •
edited
Loading

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Sorry, something went wrong.

@bkchr bkchr requested a review from infinisil as a code owner March 17, 2019 08:50
@GrahamcOfBorg GrahamcOfBorg 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: 1-10 labels Mar 17, 2019
@bkchr
Copy link
Contributor Author

bkchr commented Mar 27, 2019

@infinisil ping.

@bkchr
Copy link
Contributor Author

bkchr commented Mar 27, 2019

@peti @fpletz as you are maintainers of gpg22

peti
peti requested changes Mar 27, 2019
View reviewed changes
nixos/modules/programs/gnupg.nix Outdated
@@ -11,6 +11,14 @@ in
{

options.programs.gnupg = {
program = mkOption {
Copy link
Member

Choose a reason for hiding this comment

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

I believe it's customary to call these kind of attributes package.

@bkchr
Copy link
Contributor Author

bkchr commented Apr 1, 2019

@peti Addressed your comment.

infinisil
infinisil requested changes Apr 1, 2019
View reviewed changes
nixos/modules/programs/gnupg.nix Outdated
@@ -11,6 +11,14 @@ in
{

options.programs.gnupg = {
package = mkOption {
type = types.path;
Copy link
Member

Choose a reason for hiding this comment

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

Type should be types.package

nixos/modules/programs/gnupg.nix
@@ -11,6 +11,14 @@ in
{

options.programs.gnupg = {
package = mkOption {
type = types.path;
default = pkgs.gnupg;
Copy link
Member

Choose a reason for hiding this comment

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

You need to add defaultText = "pkgs.gnupg";

@bkchr
Copy link
Contributor Author

bkchr commented Apr 5, 2019

@infinisil fixed.

@infinisil infinisil merged commit cddafbc into NixOS:master Apr 5, 2019
@nixos-discourse
Copy link

This pull request has been mentioned on Nix community. There might be relevant details there:

https://discourse.nixos.org/t/gpg-version-warning-when-using-gpg-agent-from-nixos-but-gnupg-from-user/2740/4

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

@peti peti

@infinisil infinisil

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: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@bkchr @nixos-discourse @peti @infinisil @GrahamcOfBorg