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.

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

fix: bad age.identityPaths default value on darwin, bump to macOS-latest in CI #307

Merged
merged 5 commits into from
Jan 15, 2025

Conversation

codgician
Copy link
Contributor

@codgician codgician commented Jan 12, 2025

Since LnL7/nix-darwin#1172, services.openssh.enable is introduced for Darwin with default value being null instead of a boolean. services.openssh.hostKeys is still not available on Darwin.

The default value of age.IdentityPaths assumes services.openssh.enable being a boolean, causing evaluation failure on Darwin if not explicitly defined.

This PR attempts to:

  • Fix above issue.
  • Ensures services.openssh.hostKeys could be picked up for Darwin if it is implemented in the future.
  • Bumps macOS-12 to macOS-15 in CI because it is deprecated by GitHub.

@codgician codgician force-pushed the fix-darwin-module branch 2 times, most recently from d5e66fb to ac1dd99 Compare January 12, 2025 14:17
@codgician codgician changed the title age: fix default value of identityPaths on darwin fix: bad age.identityPaths default value on darwin Jan 12, 2025
@codgician codgician changed the title fix: bad age.identityPaths default value on darwin fix: bad age.identityPaths default value on darwin, bump to macOS-15 in CI Jan 12, 2025
@codgician codgician marked this pull request as draft January 12, 2025 14:25
@codgician codgician marked this pull request as ready for review January 12, 2025 14:28
@n8henrie
Copy link
Collaborator

Thanks for working on this!

Ensures services.openssh.hostKeys could be picked up for Darwin if it is implemented in the future.

Personally I would recommend against this. I don't see any in-progress work towards adding this, if it never manifests then we've made the code a little more confusing and complex without good reason.

A few other thoughts incoming!

@codgician
Copy link
Contributor Author

codgician commented Jan 13, 2025

Thank you @n8henrie for the insights. It make sense to simplify the logic if services.openssh.hostKeys is not going to be supported in near future. I have made suggested changes in the latest iteration, feel free to review.

@codgician codgician changed the title fix: bad age.identityPaths default value on darwin, bump to macOS-15 in CI fix: bad age.identityPaths default value on darwin, bump to macOS-latest in CI Jan 13, 2025
Copy link
Collaborator

@n8henrie n8henrie left a comment

Choose a reason for hiding this comment

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

Thanks!

@n8henrie n8henrie merged commit e600439 into ryantm:main Jan 15, 2025
4 checks passed
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.

2 participants