Skip to content

services.gpg-agent: darwin compatibility#3840

Closed
elohmeier wants to merge 1 commit intonix-community:masterfrom
elohmeier:gpg-agent-darwin
Closed

services.gpg-agent: darwin compatibility#3840
elohmeier wants to merge 1 commit intonix-community:masterfrom
elohmeier:gpg-agent-darwin

Conversation

@elohmeier
Copy link
Copy Markdown

Description

Added compatibility for Darwin to services.gpg-agent.

Checklist

  • Change is backwards compatible.

  • Code formatted with ./format.

  • Code tested through nix-shell --pure tests -A run.all.

  • Test cases updated/added. See example.

  • Commit messages are formatted like

    {component}: {description}
    
    {long description}
    

    See CONTRIBUTING for more information and recent commit messages for examples.

  • If this PR adds a new module

    • Added myself as module maintainer. See example.

    • Added myself and the module files to .github/CODEOWNERS.

@elohmeier elohmeier requested a review from rycee as a code owner April 3, 2023 19:22
'') cfg.sshKeys;
})

(mkIf (pkgs.stdenv.isDarwin && cfg.enableSshSupport) {
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Since #2915, there's no need for the platform conditions any more.

Comment on lines +277 to 280
(mkIf pkgs.stdenv.isLinux {
assertions = [
(hm.assertions.assertPlatform "services.gpg-agent" pkgs platforms.linux)
];
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

We should remove this assertion as well.

@cmacrae
Copy link
Copy Markdown
Contributor

cmacrae commented Apr 7, 2023

@elohmeier Thanks for raising this! Great timing, I was just about to open a PR myself, so was delighted to see this.

Not sure how much testing you did on various systems, but with your changes, it doesn't work on macOS Ventura. There are some slight nuances with this module's original intention only being for Linux.

I have an updated version of this that is fully working, also with ssh-agent support working. I also addressed @ncfavier's comments.

If you'd be interested in these contributions, how would you like me to submit them? A PR to your branch?

EDIT: I've also just seen #2964 which addresses nicely some of the nuances I mentioned. It's close to what I have, but admittedly some things handled better :)

@stale
Copy link
Copy Markdown

stale bot commented Jul 9, 2023

Thank you for your contribution! I marked this pull request as stale due to inactivity. Please read the relevant sections below before commenting.

If you are the original author of the PR

  • GitHub sometimes doesn't notify people who commented / reviewed a PR previously when you (force) push commits. If you have addressed the reviews you can officially ask for a review from those who commented to you or anyone else.
  • If it is unfinished but you plan to finish it, please mark it as a draft.
  • If you don't expect to work on it any time soon, please consider closing it with a short comment encouraging someone else to pick up your work.
  • To get things rolling again, rebase the PR against the target branch and address valid comments.

If you are not the original author of the PR

  • If you want to pick up the work on this PR, please create a new PR and indicate that it supercedes and closes this PR.

@stale stale bot added the status: stale label Jul 9, 2023
@elohmeier
Copy link
Copy Markdown
Author

Closing in favor of #2964

@elohmeier elohmeier closed this Jun 5, 2024
@stale stale bot removed the status: stale label Jun 5, 2024
@elohmeier elohmeier deleted the gpg-agent-darwin branch June 5, 2024 04:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants