Skip to content

nixos/yubikey-agent: add missing mkIf#93892

Merged
Ma27 merged 1 commit intoNixOS:masterfrom
flokli:yubikey-agent-mod-fix
Jul 26, 2020
Merged

nixos/yubikey-agent: add missing mkIf#93892
Ma27 merged 1 commit intoNixOS:masterfrom
flokli:yubikey-agent-mod-fix

Conversation

@flokli
Copy link
Member

@flokli flokli commented Jul 26, 2020

This accidentially added pkgs.yubikey-agent to
environment.systemPackages unconditionally.

Add the missing mkIf cfg.enable to only do when the module is enabled.

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@flokli
nixos/yubikey-agent: add missing mkIf
ebfae82 
This accidentially added pkgs.yubikey-agent to
environment.systemPackages unconditionally.
@flokli flokli requested review from philandstuff and vcunat July 26, 2020 07:36
@flokli flokli mentioned this pull request Jul 26, 2020
Merged
10 tasks
@philandstuff
Copy link
Contributor

philandstuff commented Jul 26, 2020

Thank you! ❤️

@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: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Jul 26, 2020
@Ma27 Ma27 merged commit ef672a4 into NixOS:master Jul 26, 2020
@flokli flokli deleted the yubikey-agent-mod-fix branch July 26, 2020 07:54
vcunat
vcunat approved these changes Jul 26, 2020
View reviewed changes
Copy link
Member

@vcunat vcunat left a comment

Choose a reason for hiding this comment

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

Yes, thanks.

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

Reviewers

@vcunat vcunat vcunat approved these changes

+1 more reviewer

@philandstuff philandstuff philandstuff approved these changes

Reviewers whose approvals may not affect merge requirements

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 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@flokli @philandstuff @vcunat @Ma27